svn commit: r1245306 - in /cxf/trunk: api/src/main/java/org/apache/cxf/interceptor/ rt/core/src/main/java/org/apache/cxf/databinding/stax/ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/

[dkulp]

Author: dkulp
Date: Fri Feb 17 02:58:32 2012
New Revision: 1245306

URL: http://svn.apache.org/viewvc?rev=1245306&view=rev
Log:
Remove an unused interceptor

Removed:
    
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
    
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/WrappedInInterceptorTest.java
Modified:
    
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
    
cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
    
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?rev=1245306&r1=1245305&r2=1245306&view=diff
==============================================================================
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
 (original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
 Fri Feb 17 02:58:32 2012
@@ -56,7 +56,6 @@ public class DocLiteralInInterceptor ext
     public DocLiteralInInterceptor() {
         super(Phase.UNMARSHAL);
         addAfter(URIMappingInterceptor.class.getName());
-        addBefore(WrappedInInterceptor.class.getName());
     }
 
     public void handleMessage(Message message) {

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java?rev=1245306&r1=1245305&r2=1245306&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
 Fri Feb 17 02:58:32 2012
@@ -27,7 +27,6 @@ import org.apache.cxf.feature.AbstractFe
 import org.apache.cxf.interceptor.BareInInterceptor;
 import org.apache.cxf.interceptor.DocLiteralInInterceptor;
 import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.interceptor.WrappedInInterceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptor;
 
@@ -47,7 +46,6 @@ public class StaxDataBindingFeature exte
     private void removeDatabindingInterceptor(List<Interceptor<? extends 
Message>> inInterceptors) {
         removeInterceptor(inInterceptors, 
DocLiteralInInterceptor.class.getName());
         removeInterceptor(inInterceptors, BareInInterceptor.class.getName());
-        removeInterceptor(inInterceptors, 
WrappedInInterceptor.class.getName());
         
 
         inInterceptors.add(new StaxDataBindingInterceptor());

Modified: 
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1245306&r1=1245305&r2=1245306&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
 Fri Feb 17 02:58:32 2012
@@ -50,7 +50,6 @@ import org.apache.cxf.interceptor.BareIn
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.interceptor.WrappedInInterceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
@@ -437,11 +436,7 @@ public class RMSoapInterceptor extends A
         boolean wrappedIn = false;
         while (it.hasNext() && !wrappedIn && !bareIn) {
             PhaseInterceptor<? extends Message> pi = (PhaseInterceptor<? 
extends Message>)it.next();
-            if (WrappedInInterceptor.class.getName().equals(pi.getId())) {
-                wrappedIn = true;
-                it.remove();
-                LOG.fine("Removed WrappedInInterceptor from chain.");
-            } else if (BareInInterceptor.class.getName().equals(pi.getId())) {
+            if (BareInInterceptor.class.getName().equals(pi.getId())) {
                 bareIn = true;
             }