cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1221910 - in /cxf/branches/2.4.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
Date Wed, 21 Dec 2011 22:20:34 GMT
Author: dkulp
Date: Wed Dec 21 22:20:34 2011
New Revision: 1221910

URL: http://svn.apache.org/viewvc?rev=1221910&view=rev
Log:
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.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContextAware.java
      - copied unchanged from r1221315, cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContextAware.java
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java

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

Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java?rev=1221910&r1=1221909&r2=1221910&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookExceptionMapper.java
Wed Dec 21 22:20:34 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) {



Mime
View raw message