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 2011/12/23 17:27:40 UTC
svn commit: r1222732 - in /cxf/branches/2.3.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContextAware.java
Author: sergeyb
Date: Fri Dec 23 16:27:39 2011
New Revision: 1222732
URL: http://svn.apache.org/viewvc?rev=1222732&view=rev
Log:
Merged revisions 1221910 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1221910 | dkulp | 2011-12-21 22:20:34 +0000 (Wed, 21 Dec 2011) | 9 lines
Merged revisions 1221315 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1221315 | sergeyb | 2011-12-20 10:23:58 -0500 (Tue, 20 Dec 2011) | 1 line
Fixing the test which proxifies the exception mapper
........
................
Added:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContextAware.java
- copied unchanged from r1221910, cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContextAware.java
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 16:27:39 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1221206,1221210,1221223,1221227,1222654
+/cxf/branches/2.4.x-fixes:1221206,1221210,1221223,1221227,1221910,1222654
/cxf/trunk:1221204,1221208,1221221,1221226,1222652
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java?rev=1222732&r1=1222731&r2=1222732&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java Fri Dec 23 16:27:39 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.systest.jaxrs;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
@@ -28,12 +27,14 @@ import org.apache.cxf.jaxrs.ext.MessageC
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
@Provider
-public class BookExceptionMapper implements ExceptionMapper<BookNotFoundFault> {
-
- @Context
+public class BookExceptionMapper implements ContextAware, ExceptionMapper<BookNotFoundFault> {
private MessageContext mc;
private boolean toHandle;
+ public void setMessageContext(MessageContext context) {
+ mc = context;
+ }
+
public Response toResponse(BookNotFoundFault ex) {
// status is 200 just to simplify the test client code
if (toHandle) {