cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r760085 - in /cxf/branches/2.0.x-fixes: ./ rt/management/src/main/java/org/apache/cxf/management/counters/ rt/management/src/main/java/org/apache/cxf/management/interceptor/ rt/management/src/main/java/org/apache/cxf/management/jmx/ rt/mana...
Date Mon, 30 Mar 2009 18:14:47 GMT
Author: dkulp
Date: Mon Mar 30 18:14:46 2009
New Revision: 760085

URL: http://svn.apache.org/viewvc?rev=760085&view=rev
Log:
Merged revisions 760076 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r760076 | dkulp | 2009-03-30 14:05:15 -0400 (Mon, 30 Mar 2009) | 11 lines
  
  Merged revisions 760073 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r760073 | dkulp | 2009-03-30 14:03:08 -0400 (Mon, 30 Mar 2009) | 4 lines
    
    [CXF-2140, CXF-2141] Patches to enhance the mgmt stuff from Cyrille Le Clerc applied.
    Add ability to specify the mbean server directly
    Add fault counting to response time counter stuff
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/MessageHandlingTimeRecorder.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounterMBean.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
    cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
    cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
    cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
    cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 18:14:46 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073
 /incubator/cxf/trunk:434594-651668

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

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/MessageHandlingTimeRecorder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/MessageHandlingTimeRecorder.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/MessageHandlingTimeRecorder.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/MessageHandlingTimeRecorder.java
Mon Mar 30 18:14:46 2009
@@ -20,12 +20,14 @@
 package org.apache.cxf.management.counters;
 
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.FaultMode;
 
 /* recoder the message actually handle begin and end time */ 
 public class MessageHandlingTimeRecorder {
     private Exchange exchange;
     private long beginTime;
     private long endTime;
+    private FaultMode faultMode;
     private boolean oneWay;
     
     public MessageHandlingTimeRecorder(Exchange ex) {
@@ -61,4 +63,11 @@
         return endTime - beginTime;
     }
 
+    public FaultMode getFaultMode() {
+        return faultMode;
+    }
+
+    public void setFaultMode(FaultMode faultMode) {
+        this.faultMode = faultMode;
+    }
 }

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
Mon Mar 30 18:14:46 2009
@@ -23,10 +23,16 @@
 
 import javax.management.ObjectName;
 
+import org.apache.cxf.message.FaultMode;
+
 public class ResponseTimeCounter implements ResponseTimeCounterMBean, Counter {    
     
     private ObjectName objectName;
     private AtomicInteger invocations = new AtomicInteger();
+    private AtomicInteger checkedApplicationFaults = new AtomicInteger();
+    private AtomicInteger unCheckedApplicationFaults = new AtomicInteger();
+    private AtomicInteger runtimeFaults = new AtomicInteger();
+    private AtomicInteger logicalRuntimeFaults = new AtomicInteger();
     private long totalHandlingTime;    
     private long maxHandlingTime;
     private long minHandlingTime = Integer.MAX_VALUE;
@@ -37,6 +43,29 @@
     
     public void  increase(MessageHandlingTimeRecorder mhtr) {
         invocations.getAndIncrement();
+        FaultMode faultMode = mhtr.getFaultMode();
+        if (null == faultMode) {
+            // no exception occured
+        } else {
+            switch (faultMode) {
+            case CHECKED_APPLICATION_FAULT:
+                checkedApplicationFaults.incrementAndGet();
+                break;
+            case LOGICAL_RUNTIME_FAULT:
+                logicalRuntimeFaults.incrementAndGet();
+                break;
+            case RUNTIME_FAULT:
+                runtimeFaults.incrementAndGet();
+                break;
+            case UNCHECKED_APPLICATION_FAULT:
+                unCheckedApplicationFaults.incrementAndGet();
+                break;
+            default:
+                runtimeFaults.incrementAndGet();
+                break;
+            }
+        }
+        
         long handlingTime = 0;
         if (mhtr.isOneWay()) {
             // We can count the response time 
@@ -53,11 +82,9 @@
         }
         if (minHandlingTime > handlingTime) {
             minHandlingTime = handlingTime;
-        }         
+        }
     }
     
-    
-    
     public ObjectName getObjectName() {
         return objectName;
     }
@@ -65,7 +92,6 @@
     public Number getAvgResponseTime() {        
         return (int)(totalHandlingTime / invocations.get());
     }
-
     
     public Number getMaxResponseTime() {        
         return maxHandlingTime;
@@ -79,7 +105,24 @@
         return invocations.get();
     }
 
-    public Number getTotalHandlingTime() {
-        return totalHandlingTime;
+    public Number getNumCheckedApplicationFaults() {
+        return checkedApplicationFaults.get();
     }
+
+    public Number getNumLogicalRuntimeFaults() {
+        return logicalRuntimeFaults.get();
+    }
+    
+    public Number getNumRuntimeFaults() {
+        return runtimeFaults.get();
+    }
+    
+    public Number getNumUnCheckedApplicationFaults() {
+        return unCheckedApplicationFaults.get();
+    }
+    
+    public Number getTotalHandlingTime() {        
+        return totalHandlingTime;
+    }  
+
 }

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounterMBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounterMBean.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounterMBean.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounterMBean.java
Mon Mar 30 18:14:46 2009
@@ -20,8 +20,12 @@
 
 public interface ResponseTimeCounterMBean {   
     Number getNumInvocations();
+    Number getNumCheckedApplicationFaults();
+    Number getNumLogicalRuntimeFaults();
+    Number getNumRuntimeFaults();
+    Number getNumUnCheckedApplicationFaults();
     Number getAvgResponseTime();
     Number getMaxResponseTime();
-    Number getMinResponseTime();
-    Number getTotalHandlingTime();    
-}
+    Number getMinResponseTime();   
+    Number getTotalHandlingTime();
+}
\ No newline at end of file

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
Mon Mar 30 18:14:46 2009
@@ -33,6 +33,7 @@
 import org.apache.cxf.management.counters.CounterRepository;
 import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.service.Service;
@@ -41,7 +42,7 @@
 public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPhaseInterceptor<Message>
{
     private static final Logger LOG = LogUtils.getL7dLogger(AbstractMessageResponseTimeInterceptor.class);
     
-    public AbstractMessageResponseTimeInterceptor(String phase) {
+    AbstractMessageResponseTimeInterceptor(String phase) {
         super(phase);
     }
     
@@ -68,7 +69,8 @@
         }
         MessageHandlingTimeRecorder mhtr = ex.get(MessageHandlingTimeRecorder.class);
         if (null != mhtr) {
-            mhtr.endHandling();            
+            mhtr.endHandling();
+            mhtr.setFaultMode(ex.get(FaultMode.class));
             increaseCounter(ex, mhtr);
                         
         } // else can't get the MessageHandling Infor  

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
Mon Mar 30 18:14:46 2009
@@ -21,6 +21,7 @@
 
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 
@@ -38,6 +39,12 @@
         } else {            
             beginHandlingMessage(ex);            
         }
-    }
+    }    
     
+    @Override
+    public void handleFault(Message message) {
+        Exchange ex = message.getExchange();
+        ex.put(FaultMode.class, message.get(FaultMode.class));
+        endHandlingMessage(ex);
+    }
 }

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
Mon Mar 30 18:14:46 2009
@@ -22,27 +22,35 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.ServiceInvokerInterceptor;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 
 /* When the message get from the server side
  * The exchange.isOneWay() is workable when the message
  * handler by the binging interceptor  
- * */ 
-public class ResponseTimeMessageInvokerInterceptor 
-    extends AbstractMessageResponseTimeInterceptor {
-      
+ * */
+public class ResponseTimeMessageInvokerInterceptor extends AbstractMessageResponseTimeInterceptor
{
+    
     public ResponseTimeMessageInvokerInterceptor() {
         super(Phase.INVOKE);
-        //this interceptor should be add before the serviceInvokerInterceptor
+        // this interceptor should be add before the serviceInvokerInterceptor
         addBefore(ServiceInvokerInterceptor.class.getName());
     }
-
+    
     public void handleMessage(Message message) throws Fault {
         Exchange ex = message.getExchange();
         if (ex.isOneWay()) {
-            setOneWayMessage(ex); 
+            setOneWayMessage(ex);
+        }
+    }
+    
+    @Override
+    public void handleFault(Message message) {
+        Exchange ex = message.getExchange();
+        ex.put(FaultMode.class, message.get(FaultMode.class));
+        if (ex.isOneWay()) {
+            endHandlingMessage(ex);
         }
     }
-
 }

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
Mon Mar 30 18:14:46 2009
@@ -20,6 +20,7 @@
 
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 
@@ -35,10 +36,26 @@
             if (ex.isOneWay()) {
                 setOneWayMessage(ex);
             } else {
-                beginHandlingMessage(ex); 
+                beginHandlingMessage(ex);
             }
         } else { // the message is handled by server
             endHandlingMessage(ex);
         }
     }
+    
+    @Override
+    public void handleFault(Message message) {
+        Exchange ex = message.getExchange();
+        if (ex.isOneWay()) {
+            // do nothing, done by the ResponseTimeInvokerInterceptor
+        } else {
+            FaultMode faultMode = message.get(FaultMode.class);
+            if (faultMode == null) {
+                // client side exceptions don't have FaultMode set un the message properties
(as of 2.1.4)
+                faultMode = FaultMode.RUNTIME_FAULT;
+            }
+            ex.put(FaultMode.class, faultMode);
+            endHandlingMessage(ex);
+        }
+    }
 }

Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
Mon Mar 30 18:14:46 2009
@@ -46,13 +46,13 @@
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.management.InstrumentationManager;
 import org.apache.cxf.management.JMXConnectorPolicyType;
 import org.apache.cxf.management.ManagedComponent;
 import org.apache.cxf.management.ManagementConstants;
 import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
 
-
 /**
  * The manager class for the JMXManagedComponent which hosts the JMXManagedComponents.
  */
@@ -66,6 +66,10 @@
     private Set<ObjectName> busMBeans = new HashSet<ObjectName>();
     private ModelMBeanAssembler assembler;
     private boolean connectFailed;
+    /**
+     * For backward compatibility, {@link #createMBServerConnectorFactory} is <code>true</code>
by default.
+     */
+    private boolean createMBServerConnectorFactory = true;
     private String mbeanServerName = ManagementConstants.DEFAULT_DOMAIN_NAME;
     private boolean usePlatformMBeanServer;
     
@@ -86,6 +90,11 @@
     public void setServerName(String s) {
         mbeanServerName = s;
     }
+    
+    public void setCreateMBServerConnectorFactory(boolean createMBServerConnectorFactory)
{
+        this.createMBServerConnectorFactory = createMBServerConnectorFactory;
+    }
+    
     public void setUsePlatformMBeanServer(Boolean flag) {
         usePlatformMBeanServer = flag;
     }
@@ -105,28 +114,34 @@
     public void init() {    
         if (isEnabled()) {
             
-            // return platform mbean server if the option is specified.
-            if (usePlatformMBeanServer) {
-                mbs = ManagementFactory.getPlatformMBeanServer();
-            } else {
-                List servers = MBeanServerFactory.findMBeanServer(mbeanServerName);
-                if (servers.size() <= 1) {
-                    mbs = MBeanServerFactory.createMBeanServer(mbeanServerName);
+            if (mbs == null) {
+                // return platform mbean server if the option is specified.
+                if (usePlatformMBeanServer) {
+                    mbs = ManagementFactory.getPlatformMBeanServer();
                 } else {
-                    mbs = (MBeanServer)servers.get(0);
+                    List<MBeanServer> servers = CastUtils
+                        .cast(MBeanServerFactory.findMBeanServer(mbeanServerName));
+                    if (servers.size() <= 1) {
+                        mbs = MBeanServerFactory.createMBeanServer(mbeanServerName);
+                    } else {
+                        mbs = (MBeanServer)servers.get(0);
+                    }
+                }
+            }
+            
+            if (createMBServerConnectorFactory) {
+                mcf = MBServerConnectorFactory.getInstance();
+                mcf.setMBeanServer(mbs);
+                mcf.setThreaded(isThreaded());
+                mcf.setDaemon(isDaemon());
+                mcf.setServiceUrl(getJMXServiceURL());
+                try {
+                    mcf.createConnector();
+                } catch (IOException ex) {
+                    connectFailed = true;
+                    LOG.log(Level.SEVERE, "START_CONNECTOR_FAILURE_MSG", new Object[] {ex});
                 }
             }
-            mcf = MBServerConnectorFactory.getInstance();
-            mcf.setMBeanServer(mbs);
-            mcf.setThreaded(isThreaded());
-            mcf.setDaemon(isDaemon());
-            mcf.setServiceUrl(getJMXServiceURL());
-            try {            
-                mcf.createConnector();                
-            } catch (IOException ex) {
-                connectFailed = true;
-                LOG.log(Level.SEVERE, "START_CONNECTOR_FAILURE_MSG", new Object[]{ex});
-            }              
 
             if (!connectFailed && null != bus) {            
                 try {
@@ -191,17 +206,23 @@
     public MBeanServer getMBeanServer() {        
         return mbs;
     }
+
+    public void setServer(MBeanServer server) {
+        this.mbs = server;
+    }
     
     public void shutdown() {
         if (!isEnabled()) {
             return;           
         }
         
-        try {
-            mcf.destroy();
-        } catch (IOException ex) {
-            LOG.log(Level.SEVERE, "STOP_CONNECTOR_FAILURE_MSG", new Object[]{ex});
-        }   
+        if (mcf != null) {
+            try {
+                mcf.destroy();
+            } catch (IOException ex) {
+                LOG.log(Level.SEVERE, "STOP_CONNECTOR_FAILURE_MSG", new Object[] {ex});
+            }
+        }
     }
 
     public void initComplete() {

Modified: cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
Mon Mar 30 18:14:46 2009
@@ -54,7 +54,7 @@
         EasyMock.expect(mhtr.isOneWay()).andReturn(true).anyTimes();
         EasyMock.expect(mhtr.getEndTime()).andReturn((long)100000000).anyTimes();
         EasyMock.expect(mhtr.getHandlingTime()).andReturn((long)1000).anyTimes();
-        
+        EasyMock.expect(mhtr.getFaultMode()).andReturn(null).anyTimes();
         EasyMock.replay(mhtr);
         cr.increaseCounter(serviceCounter, mhtr);
         cr.increaseCounter(operationCounter, mhtr);
@@ -77,6 +77,7 @@
         MessageHandlingTimeRecorder mhtr = EasyMock.createMock(MessageHandlingTimeRecorder.class);
         EasyMock.expect(mhtr.isOneWay()).andReturn(true).anyTimes();
         EasyMock.expect(mhtr.getEndTime()).andReturn((long)0).anyTimes();
+        EasyMock.expect(mhtr.getFaultMode()).andReturn(null).anyTimes();
         EasyMock.replay(mhtr);
         cr.increaseCounter(serviceCounter, mhtr);
         cr.increaseCounter(operationCounter, mhtr);
@@ -98,6 +99,7 @@
         MessageHandlingTimeRecorder mhtr1 = EasyMock.createMock(MessageHandlingTimeRecorder.class);
         EasyMock.expect(mhtr1.isOneWay()).andReturn(false).anyTimes();
         EasyMock.expect(mhtr1.getHandlingTime()).andReturn((long)1000).anyTimes();
+        EasyMock.expect(mhtr1.getFaultMode()).andReturn(null).anyTimes();
         EasyMock.replay(mhtr1);
         cr.createCounter(operationCounter, mhtr1);
         cr.increaseCounter(serviceCounter, mhtr1);
@@ -117,6 +119,7 @@
         MessageHandlingTimeRecorder mhtr2 = EasyMock.createMock(MessageHandlingTimeRecorder.class);
         EasyMock.expect(mhtr2.isOneWay()).andReturn(false).anyTimes();
         EasyMock.expect(mhtr2.getHandlingTime()).andReturn((long)2000).anyTimes();
+        EasyMock.expect(mhtr2.getFaultMode()).andReturn(null).anyTimes();
         EasyMock.replay(mhtr2);
         cr.increaseCounter(serviceCounter, mhtr2);
         cr.increaseCounter(operationCounter, mhtr2);

Modified: cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
Mon Mar 30 18:14:46 2009
@@ -20,6 +20,7 @@
 package org.apache.cxf.management.interceptor;
 
 import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
+import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.easymock.classextension.EasyMock;
@@ -37,9 +38,12 @@
         EasyMock.expect(message.getExchange()).andReturn(exchange);
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE).anyTimes();
         EasyMock.expect(exchange.getOutMessage()).andReturn(message);
+        EasyMock.expect(exchange.get(FaultMode.class)).andReturn(null);
         MessageHandlingTimeRecorder mhtr = EasyMock.createMock(MessageHandlingTimeRecorder.class);
         mhtr.endHandling();
-        EasyMock.expectLastCall();              
+        EasyMock.expectLastCall();        
+        mhtr.setFaultMode(null);
+        EasyMock.expectLastCall();
          
         EasyMock.replay(mhtr);
         EasyMock.expect(exchange.get(MessageHandlingTimeRecorder.class)).andReturn(mhtr);
       
@@ -54,7 +58,58 @@
         EasyMock.verify(cRepository);
         
     }
-    
+
+    @Test
+    public void testClientCheckedApplicationFaultMessageIn() {
+        testClientFaultMessageIn(FaultMode.CHECKED_APPLICATION_FAULT);
+    }
+
+    @Test
+    public void testClientLogicalFaultMessageIn() {
+        testClientFaultMessageIn(FaultMode.LOGICAL_RUNTIME_FAULT);
+    }
+
+    @Test
+    public void testClientRuntimeFaultMessageIn() {
+        testClientFaultMessageIn(FaultMode.RUNTIME_FAULT);
+    }
+
+    @Test
+    public void testClientUncheckedApplicationFaultMessageIn() {
+        testClientFaultMessageIn(FaultMode.UNCHECKED_APPLICATION_FAULT);
+    }
+
+    public void testClientFaultMessageIn(FaultMode faultMode) {
+        // need to increase the counter and is a client
+        setupCounterRepository(true, true);
+        setupExchangeForMessage();
+        EasyMock.expect(message.getExchange()).andReturn(exchange);
+        EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE).anyTimes();
+        EasyMock.expect(message.get(FaultMode.class)).andReturn(faultMode).anyTimes();
+        EasyMock.expect(exchange.getOutMessage()).andReturn(message);
+        exchange.put(FaultMode.class, faultMode);
+        EasyMock.expectLastCall();
+        EasyMock.expect(exchange.get(FaultMode.class)).andReturn(faultMode).anyTimes();
+        MessageHandlingTimeRecorder mhtr = EasyMock.createMock(MessageHandlingTimeRecorder.class);
+        mhtr.endHandling();
+        EasyMock.expectLastCall();        
+        mhtr.setFaultMode(faultMode);
+        EasyMock.expectLastCall();
+         
+        EasyMock.replay(mhtr);
+        EasyMock.expect(exchange.get(MessageHandlingTimeRecorder.class)).andReturn(mhtr);
       
+        EasyMock.replay(exchange);
+        EasyMock.replay(message);
+        
+        rtmii.handleFault(message);
+        EasyMock.verify(message);
+        EasyMock.verify(bus);
+        EasyMock.verify(exchange);
+        EasyMock.verify(mhtr);
+        EasyMock.verify(cRepository);
+        
+    }
+
     
     // it would not fire the counter increase action now
     @Test

Modified: cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java?rev=760085&r1=760084&r2=760085&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
Mon Mar 30 18:14:46 2009
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.management.interceptor;
 import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
+import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.easymock.classextension.EasyMock;
 import org.junit.Test;
@@ -34,7 +35,10 @@
         EasyMock.expect(message.getExchange()).andReturn(exchange);
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.FALSE).anyTimes();
         EasyMock.expect(exchange.getOutMessage()).andReturn(message);
+        EasyMock.expect(exchange.get(FaultMode.class)).andReturn(null);
         MessageHandlingTimeRecorder mhtr = EasyMock.createMock(MessageHandlingTimeRecorder.class);
+        mhtr.setFaultMode(null);
+        EasyMock.expectLastCall();
         mhtr.endHandling();
         EasyMock.expectLastCall();              
          
@@ -51,8 +55,60 @@
         EasyMock.verify(cRepository);
         
     }
+
+    @Test
+    public void testServerCheckedApplicationFaultMessageOut() {
+        testServerFaultMessageOut(FaultMode.CHECKED_APPLICATION_FAULT);
+    }
+
+    @Test
+    public void testServerLogicalRuntimeFaultMessageOut() {
+        testServerFaultMessageOut(FaultMode.LOGICAL_RUNTIME_FAULT);
+    }
+    
+    @Test
+    public void testServerRuntimeFaultMessageOut() {
+        testServerFaultMessageOut(FaultMode.RUNTIME_FAULT);
+    }
     
     @Test
+    public void testServerUncheckedApplicationFaultMessageOut() {
+        testServerFaultMessageOut(FaultMode.UNCHECKED_APPLICATION_FAULT);
+    }
+    
+    public void testServerFaultMessageOut(FaultMode faultMode) {
+        // need to increase the counter and is not a client
+        setupCounterRepository(true, false);
+        setupExchangeForMessage();
+        EasyMock.expect(message.getExchange()).andReturn(exchange);
+        EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.FALSE).anyTimes();
+        EasyMock.expect(message.get(FaultMode.class)).andReturn(faultMode).anyTimes();
+        EasyMock.expect(exchange.getOutMessage()).andReturn(message);
+        exchange.put(FaultMode.class, faultMode);
+        EasyMock.expectLastCall();
+        EasyMock.expect(exchange.isOneWay()).andReturn(false);
+        EasyMock.expect(exchange.get(FaultMode.class)).andReturn(faultMode).anyTimes();
+        MessageHandlingTimeRecorder mhtr = EasyMock.createMock(MessageHandlingTimeRecorder.class);
+        mhtr.setFaultMode(faultMode);
+        EasyMock.expectLastCall();
+        mhtr.endHandling();
+        EasyMock.expectLastCall();              
+        
+        EasyMock.replay(mhtr);
+        EasyMock.expect(exchange.get(MessageHandlingTimeRecorder.class)).andReturn(mhtr);
       
+        EasyMock.replay(exchange);
+        EasyMock.replay(message);
+        
+        rtmoi.handleFault(message);
+        EasyMock.verify(message);
+        EasyMock.verify(bus);
+        EasyMock.verify(exchange);
+        EasyMock.verify(mhtr);
+        EasyMock.verify(cRepository);
+        
+    }
+
+    @Test
     public void testClientOneWayMessageOut() {
         //need to increase the counter and is a client
         setupCounterRepository(true, true);



Mime
View raw message