svn commit: r477477 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/endpoint/ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/core/src/main/java/org/apache/cxf/transport/

[ni...@apache.org]

Author: ningjiang
Date: Mon Nov 20 18:43:44 2006
New Revision: 477477

URL: http://svn.apache.org/viewvc?view=rev&rev=477477
Log:
[JIRA CXF-242] Add fault observer setters to EndpointImpl 
Applied the William Tam's patchs of 240,241,242.
For more information, please see my comments in 
http://issues.apache.org/jira/browse/CXF-242 

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java?view=diff&rev=477477&r1=477476&r2=477477
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java Mon Nov 20 18:43:44 2006
@@ -48,6 +48,10 @@
     
     MessageObserver getOutFaultObserver();
     
+    void setInFaultObserver(MessageObserver observer);
+    
+    void setOutFaultObserver(MessageObserver observer);
+    
     boolean getEnableSchemaValidation();
     
     void setEnableSchemaValidation(boolean value);

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=477477&r1=477476&r2=477477
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Mon Nov 20 18:43:44 2006
@@ -60,11 +60,11 @@
     
     private static final Logger LOG = LogUtils.getL7dLogger(ClientImpl.class);
     
-    private Bus bus;
-    private Endpoint endpoint;
-    private Conduit initedConduit;
-    private ClientOutFaultObserver outFaultObserver; 
-    private int synchronousTimeout = 10000; // default 10 second timeout
+    protected Bus bus;
+    protected Endpoint endpoint;
+    protected Conduit initedConduit;
+    protected ClientOutFaultObserver outFaultObserver; 
+    protected int synchronousTimeout = 10000; // default 10 second timeout
 
     public ClientImpl(Bus b, Endpoint e) {
         this(b, e, null);
@@ -171,7 +171,7 @@
         return null;
     }
 
-    private Exception getException(Exchange exchange) {
+    protected Exception getException(Exchange exchange) {
         if (exchange.getInFaultMessage() != null) {
             return exchange.getInFaultMessage().getContent(Exception.class);
         } else if (exchange.getOutFaultMessage() != null) {

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java?view=diff&rev=477477&r1=477476&r2=477477
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java Mon Nov 20 18:43:44 2006
@@ -34,7 +34,6 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.Configurable;
 import org.apache.cxf.interceptor.AbstractAttributedInterceptorProvider;
-import org.apache.cxf.interceptor.AbstractFaultChainIntiatorObserver;
 import org.apache.cxf.interceptor.InFaultChainInitiatorObserver;
 import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import org.apache.cxf.interceptor.OutFaultChainInitiatorObserver;
@@ -53,8 +52,8 @@
     private EndpointInfo endpointInfo;
     private Executor executor;
     private Bus bus;
-    private AbstractFaultChainIntiatorObserver inFaultObserver;
-    private AbstractFaultChainIntiatorObserver outFaultObserver;
+    private MessageObserver inFaultObserver;
+    private MessageObserver outFaultObserver;
     private boolean schemaValidation;
    
    
@@ -145,5 +144,16 @@
     public boolean getEnableSchemaValidation() {
         return schemaValidation;
     }
+
+    public void setInFaultObserver(MessageObserver observer) {
+        inFaultObserver = observer;        
+    }
+
+    public void setOutFaultObserver(MessageObserver observer) {
+        outFaultObserver = observer;
+        
+    }
+
+   
     
 }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java?view=diff&rev=477477&r1=477476&r2=477477
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Mon Nov 20 18:43:44 2006
@@ -30,8 +30,8 @@
 import org.apache.cxf.service.Service;
 
 public class ChainInitiationObserver implements MessageObserver {
-    Endpoint endpoint;
-    Bus bus;
+    protected Endpoint endpoint;
+    protected Bus bus;
 
     public ChainInitiationObserver(Endpoint endpoint, Bus bus) {
         super();