cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r896578 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/logging/ api/src/main/java/org/apache/cxf/phase/ api/src/test/java/org/apache/cxf/phase/
Date Wed, 06 Jan 2010 17:48:21 GMT
Author: dkulp
Date: Wed Jan  6 17:48:20 2010
New Revision: 896578

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

........
  r896561 | dkulp | 2010-01-06 12:37:00 -0500 (Wed, 06 Jan 2010) | 2 lines
  
  Rename to FaultListener to make it sound a bit more flexible in what it
  can do.
........

Added:
    cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/logging/FaultListener.java
      - copied unchanged from r896561, cxf/trunk/api/src/main/java/org/apache/cxf/logging/FaultListener.java
Removed:
    cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/logging/FaultLogger.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
    cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java

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

Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=896578&r1=896577&r2=896578&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Wed Jan  6 17:48:20 2010
@@ -35,7 +35,7 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.logging.FaultLogger;
+import org.apache.cxf.logging.FaultListener;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
@@ -269,11 +269,11 @@
                             }
                         }
 
-                        FaultLogger flogger = (FaultLogger)
-                                message.getContextualProperty(FaultLogger.class.getName());
+                        FaultListener flogger = (FaultListener)
+                                message.getContextualProperty(FaultListener.class.getName());
                         boolean useDefaultLogging = true;
                         if (flogger != null) {
-                            useDefaultLogging = flogger.log(ex, description.toString(), message);
+                            useDefaultLogging = flogger.faultOccurred(ex, description.toString(),
message);
                         }
                         if (useDefaultLogging) {
                             doDefaultLogging(message, ex, description);

Modified: cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java?rev=896578&r1=896577&r2=896578&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
(original)
+++ cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
Wed Jan  6 17:48:20 2010
@@ -30,7 +30,7 @@
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.logging.FaultLogger;
+import org.apache.cxf.logging.FaultListener;
 import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.easymock.classextension.EasyMock;
@@ -448,11 +448,11 @@
                                    boolean expectFault, 
                                    boolean returnFromCustomLogger) {
         if (useCustomLogger) {
-            FaultLogger customLogger = control.createMock(FaultLogger.class);
-            message.getContextualProperty(FaultLogger.class.getName());
+            FaultListener customLogger = control.createMock(FaultListener.class);
+            message.getContextualProperty(FaultListener.class.getName());
             EasyMock.expectLastCall().andReturn(customLogger);
             if (expectFault) {
-                customLogger.log(EasyMock.isA(Exception.class),
+                customLogger.faultOccurred(EasyMock.isA(Exception.class),
                                  EasyMock.isA(String.class), 
                                  EasyMock.isA(Message.class));
                 EasyMock.expectLastCall().andReturn(returnFromCustomLogger);
@@ -464,7 +464,7 @@
                 }
             }
         } else {
-            message.getContextualProperty(FaultLogger.class.getName());
+            message.getContextualProperty(FaultListener.class.getName());
             EasyMock.expectLastCall().andReturn(null);
         }
 



Mime
View raw message