svn commit: r465960 - in /incubator/cxf/trunk/rt: bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ core/src/main/java/org/apache/cxf/interceptor/

[dandiep]

Author: dandiep
Date: Thu Oct 19 20:10:20 2006
New Revision: 465960

URL: http://svn.apache.org/viewvc?view=rev&rev=465960
Log:
Fix incoming faults so they actually use incoming phases.

Modified:
    
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java

Modified: 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java?view=diff&rev=465960&r1=465959&r2=465960
==============================================================================
--- 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
 (original)
+++ 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
 Thu Oct 19 20:10:20 2006
@@ -38,7 +38,7 @@
     
     public Soap11FaultInInterceptor() {
         super();
-        setPhase(Phase.MARSHAL);
+        setPhase(Phase.UNMARSHAL);
         addBefore(ClientFaultConverter.class.getName());
     }
 

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java?view=diff&rev=465960&r1=465959&r2=465960
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java
 Thu Oct 19 20:10:20 2006
@@ -19,13 +19,15 @@
 
 package org.apache.cxf.interceptor;
 
+import java.util.List;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.apache.cxf.phase.PhaseManager;
 import org.apache.cxf.transport.MessageObserver;
 
 public abstract class AbstractFaultChainIntiatorObserver implements 
MessageObserver {
@@ -56,13 +58,14 @@
         faultMessage.setContent(Exception.class, f);
         
         // setup chain
-        PhaseInterceptorChain chain = new 
PhaseInterceptorChain(bus.getExtension(PhaseManager.class)
-            .getOutPhases());
+        PhaseInterceptorChain chain = new PhaseInterceptorChain(getPhases());
         initializeInterceptors(faultMessage.getExchange(), chain);
         
         faultMessage.setInterceptorChain(chain);
         chain.doIntercept(faultMessage);
     }
+
+    protected abstract List<Phase> getPhases();
 
     protected void initializeInterceptors(Exchange ex, PhaseInterceptorChain 
chain) {
         

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?view=diff&rev=465960&r1=465959&r2=465960
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
 Thu Oct 19 20:10:20 2006
@@ -45,7 +45,7 @@
     
     public ClientFaultConverter() {
         super();
-        setPhase(Phase.MARSHAL);
+        setPhase(Phase.UNMARSHAL);
     }
 
     public void handleMessage(Message msg) {

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java?view=diff&rev=465960&r1=465959&r2=465960
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
 Thu Oct 19 20:10:20 2006
@@ -18,10 +18,14 @@
  */
 package org.apache.cxf.interceptor;
 
+import java.util.List;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.phase.PhaseManager;
 
 public class InFaultChainInitiatorObserver extends 
AbstractFaultChainIntiatorObserver {
 
@@ -36,5 +40,9 @@
         chain.add(e.getBinding().getInFaultInterceptors());
         chain.add(e.getService().getInFaultInterceptors());
         chain.add(getBus().getInFaultInterceptors());
+    }
+    
+    protected List<Phase> getPhases() {
+        return getBus().getExtension(PhaseManager.class).getInPhases();
     }
 }

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java?view=diff&rev=465960&r1=465959&r2=465960
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
 Thu Oct 19 20:10:20 2006
@@ -18,10 +18,14 @@
  */
 package org.apache.cxf.interceptor;
 
+import java.util.List;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.phase.PhaseManager;
 
 public class OutFaultChainInitiatorObserver extends 
AbstractFaultChainIntiatorObserver {
 
@@ -37,4 +41,9 @@
         chain.add(e.getService().getOutFaultInterceptors());
         chain.add(getBus().getOutFaultInterceptors());
     }
+    
+    protected List<Phase> getPhases() {
+        return getBus().getExtension(PhaseManager.class).getOutPhases();
+    }
+
 }