svn commit: r832016 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java

[dkulp]

Author: dkulp
Date: Mon Nov  2 18:33:35 2009
New Revision: 832016

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

........
  r832012 | dkulp | 2009-11-02 13:31:48 -0500 (Mon, 02 Nov 2009) | 1 line
  
  [CXF-920] Add some sys props to enable logging
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java

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

Modified: 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java?rev=832016&r1=832015&r2=832016&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
 Mon Nov  2 18:33:35 2009
@@ -22,14 +22,30 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
 
-public class CXFBusImpl extends AbstractBasicInterceptorProvider implements 
Bus {    
+public class CXFBusImpl extends AbstractBasicInterceptorProvider implements 
Bus {
+    static final boolean FORCE_LOGGING;
+    static {
+        boolean b = false;
+        try {
+            b = Boolean.getBoolean("org.apache.cxf.logging.enabled");
+            //treat these all the same
+            b |= 
Boolean.getBoolean("com.sun.xml.ws.transport.local.LocalTransportPipe.dump");
+            b |= 
Boolean.getBoolean("com.sun.xml.ws.util.pipe.StandaloneTubeAssembler.dump");
+            b |= 
Boolean.getBoolean("com.sun.xml.ws.transport.http.HttpAdapter.dump");
+        } catch (Throwable t) {
+            //ignore
+        }
+        FORCE_LOGGING = b;
+    }
     
     protected final Map<Class, Object> extensions;
     private String id;
@@ -53,6 +69,10 @@
         state = BusState.INITIAL;
         
         CXFBusFactory.possiblySetDefaultBus(this);
+        if (FORCE_LOGGING) {
+            features = new CopyOnWriteArrayList<AbstractFeature>();
+            features.add(new LoggingFeature());
+        }
     }
 
     protected void setState(BusState state) {
@@ -143,8 +163,10 @@
     }
 
     public synchronized void setFeatures(Collection<AbstractFeature> features) 
{
-        this.features = features;
-        
+        this.features = new CopyOnWriteArrayList<AbstractFeature>(features);
+        if (FORCE_LOGGING) {
+            this.features.add(new LoggingFeature());
+        }
         if (state == BusState.RUNNING) {
             initializeFeatures();
         }