cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r747822 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/interceptor/Fault.java api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
Date Wed, 25 Feb 2009 15:29:15 GMT
Author: dkulp
Date: Wed Feb 25 15:29:13 2009
New Revision: 747822

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

................
  r747463 | dkulp | 2009-02-24 13:00:09 -0500 (Tue, 24 Feb 2009) | 10 lines
  
  Merged revisions 746374 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r746374 | dkulp | 2009-02-20 16:44:25 -0500 (Fri, 20 Feb 2009) | 3 lines
    
    Restore exception logging in PIC. 
    Add utility contructors to Fault to make it easier to use and avoid Message import issues.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java
    cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 15:29:13 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-747462
-/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
+/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-747463
+/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
 /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/api/src/main/java/org/apache/cxf/interceptor/Fault.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java?rev=747822&r1=747821&r2=747822&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java Wed Feb
25 15:29:13 2009
@@ -19,6 +19,9 @@
 
 package org.apache.cxf.interceptor;
 
+import java.util.ResourceBundle;
+import java.util.logging.Logger;
+
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
@@ -51,6 +54,19 @@
         code = FAULT_CODE_SERVER;
     }
 
+    public Fault(String message, Logger log) {
+        this(new Message(message, log));
+    }
+    public Fault(String message, ResourceBundle b) {
+        this(new Message(message, b));
+    }
+    public Fault(String message, Logger log, Throwable t) {
+        this(new Message(message, log), t);
+    }
+    public Fault(String message, ResourceBundle b, Throwable t) {
+        this(new Message(message, b), t);
+    }
+    
     public Fault(Throwable t) {
         super(t);
         if (super.getMessage() != null) {

Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=747822&r1=747821&r2=747822&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Wed Feb 25 15:29:13 2009
@@ -239,23 +239,27 @@
                     FaultMode mode = message.get(FaultMode.class);
                     if (mode == FaultMode.CHECKED_APPLICATION_FAULT) {
                         if (LOG.isLoggable(Level.FINE)) { 
-                            LOG.fine("Application has thrown exception, unwinding now " +
ex.getMessage());
+                            LogUtils.log(LOG, Level.FINE,
+                                         "Application has thrown exception, unwinding now",
ex);
                         } else if (LOG.isLoggable(Level.INFO)) {
                             Throwable t = ex;
                             if (ex instanceof Fault
                                 && ex.getCause() != null) {
                                 t = ex.getCause();
-                            }  
-                                       
-                            LOG.info("Application has thrown exception, unwinding now: "
+                            }                            
+                            
+                            LogUtils.log(LOG, Level.INFO,
+                                         "Application has thrown exception, unwinding now:
"
                                          + t.getClass().getName() 
-                                         + ": " + ex.getMessage());          
+                                         + ": " + ex.getMessage());
                         }
                     } else if (LOG.isLoggable(Level.INFO)) {
                         if (mode == FaultMode.UNCHECKED_APPLICATION_FAULT) {
-                            LOG.info("Application has thrown exception, unwinding now " +
ex.getMessage());
+                            LogUtils.log(LOG, Level.INFO,
+                                         "Application has thrown exception, unwinding now",
ex);
                         } else {
-                            LOG.info("Interceptor has thrown exception, unwinding now " +
ex.getMessage());
+                            LogUtils.log(LOG, Level.INFO,
+                                         "Interceptor has thrown exception, unwinding now",
ex);
                         }
                     }
 

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java?rev=747822&r1=747821&r2=747822&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
Wed Feb 25 15:29:13 2009
@@ -21,7 +21,6 @@
 
 import org.apache.cxf.test.AbstractCXFSpringTest;
 import org.junit.Test;
-import org.springframework.context.support.GenericApplicationContext;
 
 /**
  * 
@@ -34,11 +33,6 @@
     public Cxf1332Test() throws Exception {
     }
 
-    /** {@inheritDoc}*/
-    @Override
-    protected void additionalSpringConfiguration(GenericApplicationContext context) throws
Exception {
-    }
-    
     @Test
     public void tryToSendStringArray() throws Exception {
         Cxf1332 client = getBean(Cxf1332.class, "client");
@@ -52,5 +46,4 @@
     protected String[] getConfigLocations() {
         return new String[] {"classpath:/org/apache/cxf/cxf1332/beans.xml" };
     }
-
 }



Mime
View raw message