svn commit: r1081349 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java

[sergeyb]

Author: sergeyb
Date: Mon Mar 14 12:25:48 2011
New Revision: 1081349

URL: http://svn.apache.org/viewvc?rev=1081349&view=rev
Log:
Merged revisions 1081348 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1081348 | sergeyb | 2011-03-14 12:23:56 +0000 (Mon, 14 Mar 2011) | 1 line
  
  Printing stack traces for anonymous Exceptions and adding a config option to  
WebAplicationException mapper to print the traces
........

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/impl/WebApplicationExceptionMapper.java
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 12:25:48 2011
@@ -1 +1 @@
-/cxf/trunk:1081299
+/cxf/trunk:1081299,1081348

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/impl/WebApplicationExceptionMapper.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java?rev=1081349&r1=1081348&r2=1081349&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/WebApplicationExceptionMapper.java
 Mon Mar 14 12:25:48 2011
@@ -37,6 +37,8 @@ public class WebApplicationExceptionMapp
     private static final Logger LOG = 
LogUtils.getL7dLogger(WebApplicationExceptionMapper.class);
     private static final ResourceBundle BUNDLE = 
BundleUtils.getBundle(WebApplicationExceptionMapper.class);
     
+    private boolean printStackTrace;
+    
     public Response toResponse(WebApplicationException ex) {
         if (LOG.isLoggable(Level.WARNING)) {
             String message = ex.getCause() == null ? ex.getMessage() : 
ex.getCause().getMessage();
@@ -65,7 +67,17 @@ public class WebApplicationExceptionMapp
             }
             r = 
Response.status(500).type(MediaType.TEXT_PLAIN).entity(message).build();
         }
+        
+        if (printStackTrace) {
+            ex.printStackTrace();
+        }
+        
         return r;
     }
 
+    public void setPrintStackTrace(boolean printStackTrace) {
+        this.printStackTrace = printStackTrace;
+    }
+
+    
 }

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1081349&r1=1081348&r2=1081349&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
 Mon Mar 14 12:25:48 2011
@@ -174,6 +174,7 @@ public class JAXBElementProvider extends
         } catch (WebApplicationException e) {
             throw e;
         } catch (Exception e) {
+            e.printStackTrace();
             throw new WebApplicationException(e);        
         }
         // unreachable
@@ -247,6 +248,7 @@ public class JAXBElementProvider extends
         }  catch (WebApplicationException e) {
             throw e;
         } catch (Exception e) {
+            e.printStackTrace();
             throw new WebApplicationException(e);        
         }
     }