You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:43 UTC

[38/51] [partial] cxf git commit: Remove all trailing whitespaces

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/MessageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index 5bcfe23..1e89239 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -37,7 +37,7 @@ public final class MessageUtils {
 
     /**
      * Determine if message is outbound.
-     * 
+     *
      * @param message the current Message
      * @return true if the message direction is outbound
      */
@@ -53,7 +53,7 @@ public final class MessageUtils {
 
     /**
      * Determine if message is fault.
-     * 
+     *
      * @param message the current Message
      * @return true if the message is a fault
      */
@@ -63,11 +63,11 @@ public final class MessageUtils {
                && (message == message.getExchange().getInFaultMessage() || message == message.getExchange()
                    .getOutFaultMessage());
     }
-    
+
     /**
-     * Determine the fault mode for the underlying (fault) message 
+     * Determine the fault mode for the underlying (fault) message
      * (for use on server side only).
-     * 
+     *
      * @param message the fault message
      * @return the FaultMode
      */
@@ -82,12 +82,12 @@ public final class MessageUtils {
                 return FaultMode.RUNTIME_FAULT;
             }
         }
-        return null;    
+        return null;
     }
 
     /**
      * Determine if current messaging role is that of requestor.
-     * 
+     *
      * @param message the current Message
      * @return true if the current messaging role is that of requestor
      */
@@ -98,21 +98,21 @@ public final class MessageUtils {
         }
         return false;
     }
-    
+
     /**
      * Determine if the current message is a partial response.
-     * 
+     *
      * @param message the current message
      * @return true if the current messags is a partial response
      */
     public static boolean isPartialResponse(Message message) {
         return message != null && Boolean.TRUE.equals(message.get(Message.PARTIAL_RESPONSE_MESSAGE));
     }
-    
+
     /**
      * Determines if the current message is an empty partial response, which
      * is a partial response with an empty content.
-     * 
+     *
      * @param message the current message
      * @return true if the current messags is a partial empty response
      */
@@ -129,7 +129,7 @@ public final class MessageUtils {
         // TODO - consider deprecation as this really belongs in PropertyUtils
         return PropertyUtils.isTrue(value);
     }
-    
+
     public static boolean getContextualBoolean(Message m, String key, boolean defaultValue) {
         if (m != null) {
             Object o = m.getContextualProperty(key);
@@ -139,7 +139,7 @@ public final class MessageUtils {
         }
         return defaultValue;
     }
-    
+
     public static Object getContextualProperty(Message m, String propPreferred, String propDefault) {
         Object prop = null;
         if (m != null) {
@@ -150,7 +150,7 @@ public final class MessageUtils {
         }
         return prop;
     }
-    
+
     /**
      * Returns true if the underlying content format is a W3C DOM or a SAAJ message.
      */
@@ -160,7 +160,7 @@ public final class MessageUtils {
         for (Class c : m.getContentFormats()) {
             if (c.equals(Node.class) || c.getName().equals("javax.xml.soap.SOAPMessage")) {
                 return true;
-            }   
+            }
         }
         return false;
         */

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/StringMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/StringMap.java b/core/src/main/java/org/apache/cxf/message/StringMap.java
index 87115fe..ed1dc90 100644
--- a/core/src/main/java/org/apache/cxf/message/StringMap.java
+++ b/core/src/main/java/org/apache/cxf/message/StringMap.java
@@ -22,7 +22,7 @@ package org.apache.cxf.message;
 import java.util.Map;
 
 public interface StringMap extends Map<String, Object> {
-    
+
     /**
      * Convenience method for storing/retrieving typed objects from the map.
      * equivalent to:  (T)get(key.getName());
@@ -30,7 +30,7 @@ public interface StringMap extends Map<String, Object> {
      * @return the value
      */
     <T> T get(Class<T> key);
-    
+
     /**
      * Convenience method for storing/retrieving typed objects from the map.
      * equivalent to:  put(key.getName(), value);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/StringMapImpl.java b/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
index f3acdc1..7916224 100644
--- a/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
@@ -26,10 +26,10 @@ import java.util.Map;
  * A variation on HashMap which allows lookup by Class, via the string
  * returned by {@link Class#getName()}.
  */
-public class StringMapImpl 
-    extends HashMap<String, Object> 
+public class StringMapImpl
+    extends HashMap<String, Object>
     implements StringMap {
-    
+
     private static final long serialVersionUID = -4590903451121887L;
 
     public StringMapImpl() {
@@ -37,7 +37,7 @@ public class StringMapImpl
     public StringMapImpl(Map<String, Object> i) {
         super(i);
     }
-    
+
     @SuppressWarnings("unchecked")
     public <T> T get(Class<T> key) {
         return (T)get(key.getName());

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java b/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
index a6ee001..2a5afc6 100644
--- a/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
@@ -29,10 +29,10 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 
 /**
- * Provides a starting point implementation for a interceptors that 
- * participate in phased message processing. Developers should extend from 
+ * Provides a starting point implementation for a interceptors that
+ * participate in phased message processing. Developers should extend from
  * this class when implementing custom interceptors.
- * Developers need to provide an implementation for handleMessage() and 
+ * Developers need to provide an implementation for handleMessage() and
  * can override the handleFault() implementation. They should not override
  * the other methods.
  */
@@ -43,7 +43,7 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     private final Set<String> after = new SortedArraySet<String>();
 
     /**
-     * Instantiates the interceptor to live in a specified phase. The 
+     * Instantiates the interceptor to live in a specified phase. The
      * interceptor's id will be set to the name of the implementing class.
      *
      * @param phase the interceptor's phase
@@ -63,10 +63,10 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     }
 
     /**
-     * Instantiates the interceptor and specifies if it gets a system 
-     * determined unique id. If <code>uniqueId</code> is set to true the 
-     * interceptor's id will be determined by the runtime. If 
-     * <code>uniqueId</code> is set to false, the implementing class' name 
+     * Instantiates the interceptor and specifies if it gets a system
+     * determined unique id. If <code>uniqueId</code> is set to true the
+     * interceptor's id will be determined by the runtime. If
+     * <code>uniqueId</code> is set to false, the implementing class' name
      * is used as the id.
      *
      * @param phase the interceptor's phase
@@ -77,8 +77,8 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     }
 
     /**
-     * Instantiates the interceptor with a specified id or with a system 
-     * determined unique id. The specified id will be used unless 
+     * Instantiates the interceptor with a specified id or with a system
+     * determined unique id. The specified id will be used unless
      * <code>uniqueId</code> is set to true.
      *
      * @param i the interceptor's id
@@ -95,12 +95,12 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
         id = i;
         phase = p;
     }
-    
+
     /**
-     * Specifies that the current interceptor needs to be added to the 
-     * interceptor chain before the specified collection of interceptors. 
+     * Specifies that the current interceptor needs to be added to the
+     * interceptor chain before the specified collection of interceptors.
      * This method replaces any existing list with the provided list.
-     * 
+     *
      * @param i a collection of interceptor ids
      */
     public void setBefore(Collection<String> i) {
@@ -109,10 +109,10 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     }
 
     /**
-     * Specifies that the current interceptor needs to be added to the 
+     * Specifies that the current interceptor needs to be added to the
      * interceptor chain after the specified collection of interceptors.
      * This method replaces any existing list with the provided list.
-     * 
+     *
      * @param i a collection of interceptor ids
      */
     public void setAfter(Collection<String> i) {
@@ -121,9 +121,9 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     }
 
     /**
-     * Specifies that the current interceptor needs to be added to the 
+     * Specifies that the current interceptor needs to be added to the
      * interceptor chain before the specified collection of interceptors.
-     * 
+     *
      * @param i a collection of interceptor ids
      */
     public void addBefore(Collection<String> i) {
@@ -131,19 +131,19 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     }
 
     /**
-     * Specifies that the current interceptor needs to be added to the 
+     * Specifies that the current interceptor needs to be added to the
      * interceptor chain after the specified collection of interceptors.
-     * 
+     *
      * @param i a collection of interceptor ids
      */
     public void addAfter(Collection<String> i) {
         after.addAll(i);
     }
-    
+
     /**
-     * Specifies that the current interceptor needs to be added to the 
+     * Specifies that the current interceptor needs to be added to the
      * interceptor chain before the specified interceptor.
-     * 
+     *
      * @param i an interceptor id
      */
     public void addBefore(String i) {
@@ -151,9 +151,9 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     }
 
     /**
-     * Specifies that the current interceptor needs to be added to the 
+     * Specifies that the current interceptor needs to be added to the
      * interceptor chain after the specified interceptor.
-     * 
+     *
      * @param i an interceptor id
      */
     public void addAfter(String i) {
@@ -168,7 +168,7 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
     public final Set<String> getBefore() {
         return before;
     }
-    
+
     public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
         return null;
     }
@@ -189,15 +189,15 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
         String method = (String)message.get(Message.HTTP_REQUEST_METHOD);
         return "GET".equals(method) && message.getContent(XMLStreamReader.class) == null;
     }
-    
+
     /**
      * Determine if current messaging role is that of requestor.
-     * 
+     *
      * @param message the current Message
      * @return true if the current messaging role is that of requestor
      */
     protected boolean isRequestor(T message) {
         return MessageUtils.isRequestor(message);
-    }  
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/Phase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/Phase.java b/core/src/main/java/org/apache/cxf/phase/Phase.java
index 089d759..8e18bc7 100644
--- a/core/src/main/java/org/apache/cxf/phase/Phase.java
+++ b/core/src/main/java/org/apache/cxf/phase/Phase.java
@@ -20,9 +20,9 @@
 package org.apache.cxf.phase;
 
 public class Phase implements Comparable<Object> {
-    
+
     // can be removed from once defined as default value in configuration metadata for bus
-  
+
     public static final String SETUP = "setup";
     public static final String SETUP_ENDING = "setup-ending";
     public static final String PRE_LOGICAL = "pre-logical";
@@ -54,7 +54,7 @@ public class Phase implements Comparable<Object> {
     public static final String WRITE_ENDING = "write-ending";
     public static final String SEND = "send";
     public static final String SEND_ENDING = "send-ending";
-   
+
     public static final String RECEIVE = "receive";
     public static final String READ = "read";
     public static final String PROTOCOL = "protocol";
@@ -64,19 +64,19 @@ public class Phase implements Comparable<Object> {
     public static final String PRE_INVOKE = "pre-invoke";
     public static final String INVOKE = "invoke";
     public static final String POST_INVOKE = "post-invoke";
-    
-    
+
+
     private String name;
     private int priority;
-    
+
     public Phase() {
     }
-    
+
     public Phase(String n, int p) {
         this.name = n;
         this.priority = p;
     }
-    
+
     public String getName() {
         return name;
     }
@@ -89,7 +89,7 @@ public class Phase implements Comparable<Object> {
     public void setPriority(int p) {
         this.priority = p;
     }
-    
+
     public int hashCode() {
         return priority;
     }
@@ -98,7 +98,7 @@ public class Phase implements Comparable<Object> {
             return false;
         }
         Phase p = (Phase)o;
-        
+
         return p.priority == priority
             && p.name.equals(name);
     }
@@ -106,15 +106,15 @@ public class Phase implements Comparable<Object> {
     public int compareTo(Object o) {
         if (o instanceof Phase) {
             Phase p = (Phase)o;
-            
+
             if (priority == p.priority) {
-                return name.compareTo(p.name); 
+                return name.compareTo(p.name);
             }
             return priority - p.priority;
         }
         return 1;
     }
-    
+
     public String toString() {
         return "Phase(" + getName() + ")";
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java b/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
index 6c17236..9e65523 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
@@ -33,12 +33,12 @@ import org.apache.cxf.message.Message;
  * The PhaseChainCache provides default interceptor chains for SOAP requests
  * and responses, both from the client and web service side.  The list of
  * phases supplied in the get() methods of this class are defined by default
- * within org.apache.cxf.phase.PhaseManagerImpl.  For an example of this class 
+ * within org.apache.cxf.phase.PhaseManagerImpl.  For an example of this class
  * in use, check the sourcecode of org.apache.cxf.endpoint.ClientImpl.
  */
 public final class PhaseChainCache {
     AtomicReference<ChainHolder> lastData = new AtomicReference<ChainHolder>();
-    
+
     public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
                                      List<Interceptor<? extends Message>> p1) {
         return getChain(lastData, phaseList, p1);
@@ -70,18 +70,18 @@ public final class PhaseChainCache {
                                      List<Interceptor<? extends Message>> p5) {
         return getChain(lastData, phaseList, p1, p2, p3, p4, p5);
     }
-    
+
     @SafeVarargs
     static PhaseInterceptorChain getChain(AtomicReference<ChainHolder> lastData,
                                           SortedSet<Phase> phaseList,
                                          List<Interceptor<? extends Message>> ... providers) {
         ChainHolder last = lastData.get();
-        
-        if (last == null 
+
+        if (last == null
             || !last.matches(providers)) {
-            
+
             PhaseInterceptorChain chain = new PhaseInterceptorChain(phaseList);
-            List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> copy 
+            List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> copy
                 = new ArrayList<ModCountCopyOnWriteArrayList<
                     Interceptor<? extends Message>>>(providers.length);
             for (List<Interceptor<? extends Message>> p : providers) {
@@ -91,21 +91,21 @@ public final class PhaseChainCache {
             last = new ChainHolder(chain, copy);
             lastData.set(last);
         }
-        
-        
+
+
         return last.chain.cloneChain();
     }
-    
+
     private static class ChainHolder {
         List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> lists;
         PhaseInterceptorChain chain;
-        
-        ChainHolder(PhaseInterceptorChain c, 
+
+        ChainHolder(PhaseInterceptorChain c,
                     List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> l) {
             lists = l;
             chain = c;
         }
-        
+
         @SafeVarargs
         final boolean matches(List<Interceptor<? extends Message>> ... providers) {
             if (lists.size() == providers.length) {
@@ -113,7 +113,7 @@ public final class PhaseChainCache {
                     if (lists.get(x).size() != providers[x].size()) {
                         return false;
                     }
-                    
+
                     if (providers[x].getClass() == ModCountCopyOnWriteArrayList.class) {
                         if (((ModCountCopyOnWriteArrayList<?>)providers[x]).getModCount()
                             != lists.get(x).getModCount()) {
@@ -122,7 +122,7 @@ public final class PhaseChainCache {
                     } else {
                         ListIterator<Interceptor<? extends Message>> i1 = lists.get(x).listIterator();
                         ListIterator<Interceptor<? extends Message>> i2 = providers[x].listIterator();
-                        
+
                         while (i1.hasNext()) {
                             if (i1.next() != i2.next()) {
                                 return false;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java b/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
index 2d45385..4b292c9 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
@@ -26,5 +26,5 @@ public class PhaseComparator implements Comparator<Phase> {
     public int compare(Phase o1, Phase o2) {
         return o1.getPriority() - o2.getPriority();
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
index e651ff0..0d4b324 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
@@ -26,11 +26,11 @@ import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Message;
 
 /**
- * A phase interceptor is an intercetor that participates in a 
+ * A phase interceptor is an intercetor that participates in a
  * PhaseInterceptorChain.
  * The phase property controls the phase in which the interceptor is placed.
- * The before and after properties allow for fine grained control over where 
- * the phase the interceptor is placed. They specify the IDs of the 
+ * The before and after properties allow for fine grained control over where
+ * the phase the interceptor is placed. They specify the IDs of the
  * interceptors that must be placed before and after the interceptor.
  *
  * @see org.apache.cxf.phase.PhaseInterceptorChain
@@ -38,18 +38,18 @@ import org.apache.cxf.message.Message;
 public interface PhaseInterceptor<T extends Message> extends Interceptor<T> {
 
     /**
-     * Returns a set containing the IDs of the interceptors that should be 
-     * executed before this interceptor. This interceptor will be placed 
+     * Returns a set containing the IDs of the interceptors that should be
+     * executed before this interceptor. This interceptor will be placed
      * in the chain after the interceptors in the set.
      * @return the IDs of the interceptors
      */
     Set<String> getAfter();
 
     /**
-     * Returns a set containing the IDs of the interceptors that should be 
-     * executed after this interceptor. This interceptor will be placed in 
+     * Returns a set containing the IDs of the interceptors that should be
+     * executed after this interceptor. This interceptor will be placed in
      * the inteceptor chain before the interceptors in the set.
-     * @return the ids of the interceptors 
+     * @return the ids of the interceptors
      */
     Set<String> getBefore();
 
@@ -64,9 +64,9 @@ public interface PhaseInterceptor<T extends Message> extends Interceptor<T> {
      * @return the phase
      */
     String getPhase();
-    
+
     /**
-     * Returns a collection of Interceptors that should be added to the chain 
+     * Returns a collection of Interceptors that should be added to the chain
      * whenever this interceptor is added.   May return null.
      * @return the collection of interceptors
      */

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
index 2ed58d1..85a4d6c 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
@@ -57,19 +57,19 @@ import org.apache.cxf.transport.MessageObserver;
  * A List of phases is supplied to the PhaseInterceptorChain in the constructor.
  * This class is typically instantiated from the PhaseChainCache class in this
  * package. Interceptors that are added to the chain are ordered by phase.
- * Within a phase, interceptors can order themselves. Each PhaseInterceptor 
- * has an ID. PhaseInterceptors can supply a Collection of IDs which they 
+ * Within a phase, interceptors can order themselves. Each PhaseInterceptor
+ * has an ID. PhaseInterceptors can supply a Collection of IDs which they
  * should run before or after, supplying fine grained ordering.
  * <p>
- *  
+ *
  */
 public class PhaseInterceptorChain implements InterceptorChain {
     public static final String PREVIOUS_MESSAGE = PhaseInterceptorChain.class.getName() + ".PREVIOUS_MESSAGE";
-    
-    private static final Logger LOG = LogUtils.getL7dLogger(PhaseInterceptorChain.class); 
+
+    private static final Logger LOG = LogUtils.getL7dLogger(PhaseInterceptorChain.class);
 
     private static final ThreadLocal<Message> CURRENT_MESSAGE = new ThreadLocal<Message>();
-    
+
     private final Map<String, Integer> nameMap;
     private final Phase phases[];
 
@@ -85,37 +85,37 @@ public class PhaseInterceptorChain implements InterceptorChain {
     // interceptors to the end of the list by default.
     private boolean hasAfters[];
 
-    
+
     private State state;
     private Message pausedMessage;
     private MessageObserver faultObserver;
     private PhaseInterceptorIterator iterator;
     private final boolean isFineLogging;
-    
-    // currently one chain for one request/response, use below as signal 
+
+    // currently one chain for one request/response, use below as signal
     // to avoid duplicate fault processing on nested calling of
     // doIntercept(), which will throw same fault multi-times
     private boolean faultOccurred;
     private boolean chainReleased;
-    
-    
+
+
     private PhaseInterceptorChain(PhaseInterceptorChain src) {
         isFineLogging = LOG.isLoggable(Level.FINE);
-        
+
         //only used for clone
         state = State.EXECUTING;
-        
+
         //immutable, just repoint
         nameMap = src.nameMap;
         phases = src.phases;
-        
+
         int length = phases.length;
         hasAfters = new boolean[length];
         System.arraycopy(src.hasAfters, 0, hasAfters, 0, length);
-        
+
         heads = new InterceptorHolder[length];
         tails = new InterceptorHolder[length];
-        
+
         InterceptorHolder last = null;
         for (int x = 0; x < length; x++) {
             InterceptorHolder ih = src.heads[x];
@@ -135,7 +135,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             }
         }
     }
-    
+
     public PhaseInterceptorChain(SortedSet<Phase> ps) {
         state = State.EXECUTING;
         isFineLogging = LOG.isLoggable(Level.FINE);
@@ -147,21 +147,21 @@ public class PhaseInterceptorChain implements InterceptorChain {
         heads = new InterceptorHolder[numPhases];
         tails = new InterceptorHolder[numPhases];
         hasAfters = new boolean[numPhases];
-        
+
         int idx = 0;
         for (Phase phase : ps) {
-            phases[idx] = phase; 
+            phases[idx] = phase;
             nameMap.put(phase.getName(), idx);
             ++idx;
         }
     }
-    
+
     public static Message getCurrentMessage() {
         return CURRENT_MESSAGE.get();
     }
-    
+
     public static boolean setCurrentMessage(PhaseInterceptorChain chain, Message m) {
-        if (getCurrentMessage() == m) { 
+        if (getCurrentMessage() == m) {
             return false;
         }
         if (chain.iterator.hasPrevious()) {
@@ -172,17 +172,17 @@ public class PhaseInterceptorChain implements InterceptorChain {
             } else {
                 String error = "Only ServiceInvokerInterceptor can update the current chain message";
                 LOG.warning(error);
-                throw new IllegalStateException(error);   
+                throw new IllegalStateException(error);
             }
         }
         return false;
-        
+
     }
-    
+
     public synchronized State getState() {
         return state;
     }
-    
+
     public synchronized void releaseAndAcquireChain() {
         while (!chainReleased) {
             try {
@@ -193,16 +193,16 @@ public class PhaseInterceptorChain implements InterceptorChain {
         }
         chainReleased = false;
     }
-    
+
     public synchronized void releaseChain() {
         this.chainReleased = true;
         this.notifyAll();
     }
-    
+
     public PhaseInterceptorChain cloneChain() {
         return new PhaseInterceptorChain(this);
     }
-    
+
     private void updateIterator() {
         if (iterator == null) {
             iterator = new PhaseInterceptorIterator(heads);
@@ -210,7 +210,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             //System.out.println(toString());
         }
     }
-    
+
     public void add(Collection<Interceptor<? extends Message>> newhandlers) {
         add(newhandlers, false);
     }
@@ -228,25 +228,25 @@ public class PhaseInterceptorChain implements InterceptorChain {
     public void add(Interceptor<? extends Message> i) {
         add(i, false);
     }
-    
+
     public void add(Interceptor<? extends Message> i, boolean force) {
         PhaseInterceptor<? extends Message> pi = (PhaseInterceptor<? extends Message>)i;
 
-        String phaseName = pi.getPhase();        
+        String phaseName = pi.getPhase();
         Integer phase = nameMap.get(phaseName);
-        
+
         if (phase == null) {
-            LOG.warning("Skipping interceptor " + i.getClass().getName() 
-                + ((phaseName == null) ? ": Phase declaration is missing." 
+            LOG.warning("Skipping interceptor " + i.getClass().getName()
+                + ((phaseName == null) ? ": Phase declaration is missing."
                 : ": Phase " + phaseName + " specified does not exist."));
-        } else {            
+        } else {
             if (isFineLogging) {
                 LOG.fine("Adding interceptor " + i + " to phase " + phaseName);
             }
 
             insertInterceptor(phase, pi, force);
         }
-        Collection<PhaseInterceptor<? extends Message>> extras 
+        Collection<PhaseInterceptor<? extends Message>> extras
             = pi.getAdditionalInterceptors();
         if (extras != null) {
             for (PhaseInterceptor<? extends Message> p : extras) {
@@ -265,7 +265,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             pausedMessage = null;
         }
     }
-    
+
     public synchronized void suspend() {
         state = State.SUSPENDED;
         pausedMessage = CURRENT_MESSAGE.get();
@@ -282,8 +282,8 @@ public class PhaseInterceptorChain implements InterceptorChain {
 
     /**
      * Intercept a message, invoking each phase's handlers in turn.
-     * 
-     * @param message the message 
+     *
+     * @param message the message
      * @throws Exception
      */
     @SuppressWarnings("unchecked")
@@ -293,7 +293,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
         Message oldMessage = CURRENT_MESSAGE.get();
         try {
             CURRENT_MESSAGE.set(message);
-            if (oldMessage != null 
+            if (oldMessage != null
                 && !message.containsKey(PREVIOUS_MESSAGE)
                 && message != oldMessage
                 && message.getExchange() != oldMessage.getExchange()) {
@@ -311,17 +311,17 @@ public class PhaseInterceptorChain implements InterceptorChain {
                          // throw the exception to make sure thread exit without interrupt
                         throw new SuspendedInvocationException();
                     }
-                    
+
                 } catch (SuspendedInvocationException ex) {
-                    
-                    // Moving the chain iterator to the previous interceptor is needed 
+
+                    // Moving the chain iterator to the previous interceptor is needed
                     // for the invocation to be resumed from the same interceptor which
-                    // suspended the invocation.  
-                    // If "suspend.chain.on.current.interceptor" is set to true then 
-                    // the chain will be resumed from the interceptor which follows 
-                    // the interceptor which suspended the invocation. 
+                    // suspended the invocation.
+                    // If "suspend.chain.on.current.interceptor" is set to true then
+                    // the chain will be resumed from the interceptor which follows
+                    // the interceptor which suspended the invocation.
                     Object suspendProp = message.remove("suspend.chain.on.current.interceptor");
-                    if ((suspendProp == null || PropertyUtils.isFalse(suspendProp)) 
+                    if ((suspendProp == null || PropertyUtils.isFalse(suspendProp))
                         && iterator.hasPrevious()) {
                         iterator.previous();
                     }
@@ -333,7 +333,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
                         wrapExceptionAsFault(message, ex);
                     }
                     state = State.ABORTED;
-                } 
+                }
             }
             if (state == State.EXECUTING) {
                 state = State.COMPLETE;
@@ -346,14 +346,14 @@ public class PhaseInterceptorChain implements InterceptorChain {
 
     private void wrapExceptionAsFault(Message message, RuntimeException ex) {
         String description = getServiceInfo(message);
-        
+
         message.setContent(Exception.class, ex);
         unwind(message);
         Exception ex2 = message.getContent(Exception.class);
         if (ex2 == null) {
             ex2 = ex;
         }
-        
+
         FaultListener flogger = (FaultListener)
                 message.getContextualProperty(FaultListener.class.getName());
         boolean useDefaultLogging = true;
@@ -363,7 +363,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
         if (useDefaultLogging) {
             doDefaultLogging(message, ex2, description);
         }
-        
+
         if (message.getExchange() != null && message.getContent(Exception.class) != null) {
             message.getExchange().put(Exception.class, ex2);
         }
@@ -427,7 +427,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             }
         }
     }
-    
+
     private boolean isOneWay(Message message) {
         return (message.getExchange() != null) ? message.getExchange().isOneWay() && !isRobustOneWay(message) : false;
     }
@@ -439,16 +439,16 @@ public class PhaseInterceptorChain implements InterceptorChain {
     /**
      * Intercept a message, invoking each phase's handlers in turn,
      * starting after the specified interceptor.
-     * 
+     *
      * @param message the message
-     * @param startingAfterInterceptorID the id of the interceptor 
+     * @param startingAfterInterceptorID the id of the interceptor
      * @throws Exception
      */
     public synchronized boolean doInterceptStartingAfter(Message message,
                                                          String startingAfterInterceptorID) {
         updateIterator();
         while (state == State.EXECUTING && iterator.hasNext()) {
-            PhaseInterceptor<? extends Message> currentInterceptor 
+            PhaseInterceptor<? extends Message> currentInterceptor
                 = (PhaseInterceptor<? extends Message>)iterator.next();
             if (currentInterceptor.getId().equals(startingAfterInterceptorID)) {
                 break;
@@ -460,16 +460,16 @@ public class PhaseInterceptorChain implements InterceptorChain {
     /**
      * Intercept a message, invoking each phase's handlers in turn,
      * starting at the specified interceptor.
-     * 
+     *
      * @param message the message
-     * @param startingAtInterceptorID the id of the interceptor 
+     * @param startingAtInterceptorID the id of the interceptor
      * @throws Exception
      */
     public synchronized boolean doInterceptStartingAt(Message message,
                                                          String startingAtInterceptorID) {
         updateIterator();
         while (state == State.EXECUTING && iterator.hasNext()) {
-            PhaseInterceptor<? extends Message> currentInterceptor 
+            PhaseInterceptor<? extends Message> currentInterceptor
                 = (PhaseInterceptor<? extends Message>)iterator.next();
             if (currentInterceptor.getId().equals(startingAtInterceptorID)) {
                 iterator.previous();
@@ -488,7 +488,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             iterator.reset();
         }
     }
-    
+
     @SuppressWarnings("unchecked")
     public void unwind(Message message) {
         while (iterator.hasPrevious()) {
@@ -557,7 +557,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             }
         }
     }
-    
+
     private void insertInterceptor(int phase, PhaseInterceptor<? extends Message> interc, boolean force) {
         InterceptorHolder ih = new InterceptorHolder(interc, phase);
         if (heads[phase] == null) {
@@ -565,7 +565,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             heads[phase] = ih;
             tails[phase] = ih;
             hasAfters[phase] = !interc.getAfter().isEmpty();
-            
+
             int idx = phase - 1;
             while (idx >= 0) {
                 if (tails[idx] != null) {
@@ -590,7 +590,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
                     }
                     ++idx;
                 }
-                
+
                 if (idx != heads.length) {
                     //found something after us
                     ih.next = heads[idx];
@@ -598,13 +598,13 @@ public class PhaseInterceptorChain implements InterceptorChain {
                 }
             }
         } else { // this phase already has interceptors attached
-        
+
             // list of interceptors that the new interceptor should precede
             Set<String> beforeList = interc.getBefore();
 
             // list of interceptors that the new interceptor should be after
             Set<String> afterList = interc.getAfter();
-            
+
             // firstBefore will hold the first interceptor of a given phase
             // that the interceptor to be added must precede
             InterceptorHolder firstBefore = null;
@@ -612,10 +612,10 @@ public class PhaseInterceptorChain implements InterceptorChain {
             // lastAfter will hold the last interceptor of a given phase
             // that the interceptor to be added must come after
             InterceptorHolder lastAfter = null;
-            
+
             String id = interc.getId();
             if (hasAfters[phase] || !beforeList.isEmpty()) {
-            
+
                 InterceptorHolder ih2 = heads[phase];
                 while (ih2 != tails[phase].next) {
                     PhaseInterceptor<? extends Message> cmp = ih2.interceptor;
@@ -624,8 +624,8 @@ public class PhaseInterceptorChain implements InterceptorChain {
                         && (beforeList.contains(cmpId)
                             || cmp.getAfter().contains(id))) {
                         firstBefore = ih2;
-                    } 
-                    if (cmp.getBefore().contains(id) 
+                    }
+                    if (cmp.getBefore().contains(id)
                         || (cmpId != null && afterList.contains(cmpId))) {
                         lastAfter = ih2;
                     }
@@ -649,12 +649,12 @@ public class PhaseInterceptorChain implements InterceptorChain {
                     }
                     ih2 = ih2.next;
                 }
-                
+
                 //System.out.print("Skipped: " + phase.toString());
                 //System.out.println("         " + interc.getId());
             }
             hasAfters[phase] |= !afterList.isEmpty();
-            
+
             if (firstBefore == null
                 && lastAfter == null
                 && !beforeList.isEmpty()
@@ -664,13 +664,13 @@ public class PhaseInterceptorChain implements InterceptorChain {
                 //stick it at the beginning
                 firstBefore = heads[phase];
             }
-            
+
             if (firstBefore == null) {
                 //just add new interceptor at the end
                 ih.prev = tails[phase];
                 ih.next = tails[phase].next;
                 tails[phase].next = ih;
-                
+
                 if (ih.next != null) {
                     ih.next.prev = ih;
                 }
@@ -682,7 +682,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
                 }
                 ih.next = firstBefore;
                 firstBefore.prev = ih;
-                
+
                 if (heads[phase] == firstBefore) {
                     heads[phase] = ih;
                 }
@@ -694,26 +694,26 @@ public class PhaseInterceptorChain implements InterceptorChain {
     }
 
     public String toString() {
-        return toString(""); 
+        return toString("");
     }
     private String toString(String message) {
         StringBuilder chain = new StringBuilder();
-        
+
         chain.append("Chain ")
             .append(super.toString())
             .append(message)
             .append(". Current flow:\n");
-        
+
         for (int x = 0; x < phases.length; x++) {
             if (heads[x] != null) {
                 chain.append("  ");
                 printPhase(x, chain);
-            }            
+            }
         }
         return chain.toString();
     }
     private void printPhase(int ph, StringBuilder chain) {
-        
+
         chain.append(phases[ph].getName())
             .append(" [");
         InterceptorHolder i = heads[ph];
@@ -733,7 +733,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
         }
         chain.append("]\n");
     }
-    
+
     private void outputChainToLog(boolean modified) {
         if (isFineLogging) {
             if (modified) {
@@ -743,30 +743,30 @@ public class PhaseInterceptorChain implements InterceptorChain {
             }
         }
     }
-    
+
     public MessageObserver getFaultObserver() {
         return faultObserver;
     }
-    
+
     public void setFaultObserver(MessageObserver faultObserver) {
         this.faultObserver = faultObserver;
     }
-    
+
     static final class PhaseInterceptorIterator implements ListIterator<Interceptor<? extends Message>> {
         InterceptorHolder heads[];
         InterceptorHolder prev;
         InterceptorHolder first;
-        
+
         PhaseInterceptorIterator(InterceptorHolder h[]) {
             heads = h;
             first = findFirst();
         }
-        
+
         public void reset() {
             prev = null;
             first = findFirst();
         }
-        
+
         private InterceptorHolder findFirst() {
             for (int x = 0; x < heads.length; x++) {
                 if (heads[x] != null) {
@@ -775,8 +775,8 @@ public class PhaseInterceptorChain implements InterceptorChain {
             }
             return null;
         }
-        
-        
+
+
         public boolean hasNext() {
             if (prev == null) {
                 return first != null;
@@ -812,7 +812,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             }
             return prev;
         }
-        
+
         public boolean hasPrevious() {
             return prev != null;
         }
@@ -824,7 +824,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
             prev = prev.prev;
             return tmp.interceptor;
         }
-        
+
         public int nextIndex() {
             throw new UnsupportedOperationException();
         }
@@ -842,13 +842,13 @@ public class PhaseInterceptorChain implements InterceptorChain {
         }
     }
 
-    
+
     static final class InterceptorHolder {
         PhaseInterceptor<? extends Message> interceptor;
         InterceptorHolder next;
         InterceptorHolder prev;
         int phaseIdx;
-        
+
         InterceptorHolder(PhaseInterceptor<? extends Message> i, int p) {
             interceptor = i;
             phaseIdx = p;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java b/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
index 55fa77d..639edc6 100644
--- a/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
+++ b/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
@@ -24,9 +24,9 @@ import org.apache.cxf.message.Message;
 
 public interface PolicyCalculator<T> {
     Class<T> getDataClass();
-    
+
     QName getDataClassName();
-    
+
     T intersect(T policy1, T policy2);
 
     boolean isAsserted(Message message, T policy, T refPolicy);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
index 7f03fe6..2d8c05c 100644
--- a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
@@ -28,16 +28,16 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
 @NoJSR250Annotations
 public class ClassLoaderResolver implements ResourceResolver {
 
-    private final ClassLoader loader; 
+    private final ClassLoader loader;
 
-    public ClassLoaderResolver() { 
+    public ClassLoaderResolver() {
         this(ClassLoaderResolver.class.getClassLoader());
     }
 
-    public ClassLoaderResolver(ClassLoader l) { 
+    public ClassLoaderResolver(ClassLoader l) {
         loader = l;
     }
- 
+
     public <T> T resolve(String resourceName, Class<T> resourceType) {
         if (resourceName == null || resourceType == null) {
             return null;
@@ -47,10 +47,10 @@ public class ClassLoaderResolver implements ResourceResolver {
             return resourceType.cast(url);
         }
         return null;
-    } 
+    }
 
-    public InputStream getAsStream(String name) { 
+    public InputStream getAsStream(String name) {
         return loader.getResourceAsStream(name);
-    } 
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java b/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
index c162ad8..83e4fe0 100644
--- a/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
@@ -31,7 +31,7 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
 @NoJSR250Annotations
 public class ClasspathResolver implements ResourceResolver {
 
-    public <T> T resolve(String resourceName, Class<T> resourceType) { 
+    public <T> T resolve(String resourceName, Class<T> resourceType) {
         if (resourceName == null) {
             return null;
         }
@@ -40,9 +40,9 @@ public class ClasspathResolver implements ResourceResolver {
             return resourceType.cast(url);
         }
         return null;
-    } 
+    }
 
-    public InputStream getAsStream(String name) { 
+    public InputStream getAsStream(String name) {
         return ClassLoader.getSystemResourceAsStream(name);
-    } 
+    }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java b/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
index f29667f..b2b15a8 100644
--- a/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
+++ b/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
@@ -30,67 +30,67 @@ import java.util.logging.Logger;
 import org.apache.cxf.common.logging.LogUtils;
 
 public class DefaultResourceManager implements ResourceManager {
-    
+
     private static final Logger LOG = LogUtils.getL7dLogger(DefaultResourceManager.class);
 
-    protected final List<ResourceResolver> registeredResolvers 
+    protected final List<ResourceResolver> registeredResolvers
         = new CopyOnWriteArrayList<ResourceResolver>();
     protected boolean firstCalled;
 
-    public DefaultResourceManager() { 
-        initializeDefaultResolvers(); 
-    } 
-    
+    public DefaultResourceManager() {
+        initializeDefaultResolvers();
+    }
+
     public DefaultResourceManager(ResourceResolver resolver) {
         addResourceResolver(resolver);
     }
-    
+
     public DefaultResourceManager(List<? extends ResourceResolver> resolvers) {
         addResourceResolvers(resolvers);
     }
-    
+
     protected void onFirstResolve() {
         //nothing
         firstCalled = true;
     }
- 
+
     public final <T> T resolveResource(String name, Class<T> type) {
         return findResource(name, type, false, registeredResolvers);
-    } 
+    }
 
-    public final <T> T resolveResource(String name, Class<T> type, List<ResourceResolver> resolvers) { 
+    public final <T> T resolveResource(String name, Class<T> type, List<ResourceResolver> resolvers) {
         return findResource(name, type, false, resolvers);
-    } 
+    }
 
-    
-    public final InputStream getResourceAsStream(String name) { 
+
+    public final InputStream getResourceAsStream(String name) {
         return findResource(name, InputStream.class, true, registeredResolvers);
-    } 
+    }
 
-    public final void addResourceResolver(ResourceResolver resolver) { 
-        if (!registeredResolvers.contains(resolver)) { 
+    public final void addResourceResolver(ResourceResolver resolver) {
+        if (!registeredResolvers.contains(resolver)) {
             registeredResolvers.add(0, resolver);
         }
-    } 
-    public final void addResourceResolvers(Collection<? extends ResourceResolver> resolvers) { 
+    }
+    public final void addResourceResolvers(Collection<? extends ResourceResolver> resolvers) {
         for (ResourceResolver r : resolvers) {
             addResourceResolver(r);
         }
-    } 
+    }
 
-    public final void removeResourceResolver(ResourceResolver resolver) { 
-        if (registeredResolvers.contains(resolver)) { 
+    public final void removeResourceResolver(ResourceResolver resolver) {
+        if (registeredResolvers.contains(resolver)) {
             registeredResolvers.remove(resolver);
         }
-    } 
+    }
 
 
     public final List<ResourceResolver> getResourceResolvers() {
-        return Collections.unmodifiableList(registeredResolvers); 
+        return Collections.unmodifiableList(registeredResolvers);
     }
 
-    
-    private <T> T findResource(String name, Class<T> type, boolean asStream, 
+
+    private <T> T findResource(String name, Class<T> type, boolean asStream,
                                List<ResourceResolver> resolvers) {
         if (!firstCalled) {
             onFirstResolve();
@@ -98,30 +98,30 @@ public class DefaultResourceManager implements ResourceManager {
         if (resolvers == null) {
             resolvers = registeredResolvers;
         }
-        
-        if (LOG.isLoggable(Level.FINE)) { 
-            LOG.fine("resolving resource <" + name + ">" + (asStream ? " as stream "  
+
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.fine("resolving resource <" + name + ">" + (asStream ? " as stream "
                                                             : " type <" + type + ">"));
         }
 
-        T ret = null; 
-        
-        for (ResourceResolver rr : resolvers) { 
-            if (asStream) { 
+        T ret = null;
+
+        for (ResourceResolver rr : resolvers) {
+            if (asStream) {
                 ret = type.cast(rr.getAsStream(name));
-            } else { 
+            } else {
                 ret = rr.resolve(name, type);
             }
-            if (ret != null) { 
+            if (ret != null) {
                 break;
             }
-        } 
+        }
         return ret;
-    } 
+    }
 
-    private void initializeDefaultResolvers() { 
+    private void initializeDefaultResolvers() {
         addResourceResolver(new ClasspathResolver());
         addResourceResolver(new ClassLoaderResolver(getClass().getClassLoader()));
-    } 
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java b/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
index ffd7964..ae1b0d8 100644
--- a/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
@@ -33,7 +33,7 @@ public class ExtendedURIResolver {
     protected Stack<InputStream> resourceOpened = new Stack<InputStream>();
 
     public ExtendedURIResolver() {
-        currentResolver = new org.apache.cxf.resource.URIResolver();        
+        currentResolver = new org.apache.cxf.resource.URIResolver();
     }
 
     public InputSource resolve(String curUri, String baseUri) {
@@ -67,7 +67,7 @@ public class ExtendedURIResolver {
         return null;
         // return new InputSource(schemaLocation);
     }
-    
+
     public void close() {
         while (!resourceOpened.isEmpty()) {
             try {
@@ -80,7 +80,7 @@ public class ExtendedURIResolver {
             }
         }
     }
-    
+
     public String getLatestImportURI() {
         return this.getURI();
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java b/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
index aa1d207..86480a8 100644
--- a/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
@@ -22,9 +22,9 @@ package org.apache.cxf.resource;
 import java.io.InputStream;
 
 public class ObjectTypeResolver implements ResourceResolver {
-   
+
     private final Object value;
- 
+
     public ObjectTypeResolver(Object v) {
         value = v;
     }
@@ -40,5 +40,5 @@ public class ObjectTypeResolver implements ResourceResolver {
             return resourceType.cast(value);
         }
         return null;
-    }    
+    }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java b/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
index b2d2419..4e6270d 100644
--- a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
@@ -23,9 +23,9 @@ import java.io.InputStream;
 import java.util.Map;
 
 public class PropertiesResolver implements ResourceResolver {
-    
-    private final Map<String, Object> properties; 
-    
+
+    private final Map<String, Object> properties;
+
     public PropertiesResolver(Map<String, Object> p) {
         properties = p;
     }
@@ -43,7 +43,7 @@ public class PropertiesResolver implements ResourceResolver {
             return resourceType.cast(properties.get(resourceName));
         }
         return null;
-        
-        
-    }    
+
+
+    }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ResourceManager.java b/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
index 4b14a22..1fc496e 100644
--- a/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
+++ b/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
@@ -30,22 +30,22 @@ import java.util.List;
  * <code>ResourceResolver</code> to find resources.
  */
 public interface ResourceManager {
-    
+
     /**
      * Resolve a resource.  The ResourceManager will query all of the
      * registered <code>ResourceResovler</code> objects until one
      * manages to resolve the resource
-     * 
+     *
      * @param name name of resource to resolve.
      * @param type type of resource to resolve.
      * @return the resolved resource or null if nothing found.
      */
     <T> T resolveResource(String name, Class<T> type);
 
-    /** 
-     * Resolve a resource with via a specified list of resovlers.  This allows 
+    /**
+     * Resolve a resource with via a specified list of resovlers.  This allows
      * resources to be specified with a locally defined list of resolvers.
-     * 
+     *
      * @param name name of resource to resolve.
      * @param type type of resource to resolve.
      * @param resolvers list of <code>ResourceResolvers</codea> to search.
@@ -54,15 +54,15 @@ public interface ResourceManager {
     <T> T resolveResource(String name, Class<T> type, List<ResourceResolver> resolvers);
 
     /**
-     * Open stream to resource.  
+     * Open stream to resource.
      *
-     * @param name name of resource to resolve. 
+     * @param name name of resource to resolve.
      * @return the InputStream to the resource or null if the resource
      * cannot be found.
      */
     InputStream getResourceAsStream(String name);
 
-    /** 
+    /**
      * Add a <code>ResourceResolver</code>.  The newly added resolver
      * is added at the head of the list so the most recently added
      * will be queried first.
@@ -71,7 +71,7 @@ public interface ResourceManager {
      */
     void addResourceResolver(ResourceResolver resolver);
 
-    /** 
+    /**
      * Remove a <code>ResourceResolver</code>.
      * @param resolver the <code>ResourceResolver</code> to remove.
      * If not previously registered, it is ignored.
@@ -80,8 +80,8 @@ public interface ResourceManager {
 
 
     /**
-     * Get all the currently registered resolvers.  This method should return 
-     * a copy of the list of resolvers so that resolvers added after this method 
+     * Get all the currently registered resolvers.  This method should return
+     * a copy of the list of resolvers so that resolvers added after this method
      * has been called will alter the list returned.
      */
     List<ResourceResolver> getResourceResolvers();

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java b/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
index 01618c6..ad15fdc 100644
--- a/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
  */
 public interface ResourceResolver {
 
-    
+
     /**
      * Resolve a resource given its name and type.
      *

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java b/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
index 1150f5d..e8779f0 100644
--- a/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
@@ -22,10 +22,10 @@ package org.apache.cxf.resource;
 import java.io.InputStream;
 
 public class SinglePropertyResolver implements ResourceResolver {
-   
+
     private final String key;
     private final Object value;
- 
+
     public SinglePropertyResolver(String k, Object v) {
         key = k;
         value = v;
@@ -40,5 +40,5 @@ public class SinglePropertyResolver implements ResourceResolver {
             return resourceType.cast(value);
         }
         return null;
-    }    
+    }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/URIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/URIResolver.java b/core/src/main/java/org/apache/cxf/resource/URIResolver.java
index ed42fd1..966e3fb 100644
--- a/core/src/main/java/org/apache/cxf/resource/URIResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/URIResolver.java
@@ -54,7 +54,7 @@ import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
  */
 public class URIResolver {
     private static final Logger LOG = LogUtils.getLogger(URIResolver.class);
-    
+
     private Map<String, LoadingByteArrayOutputStream> cache
         = new HashMap<String, LoadingByteArrayOutputStream>();
     private File file;
@@ -73,17 +73,17 @@ public class URIResolver {
     public URIResolver(String baseUriStr, String uriStr) throws IOException {
         this(baseUriStr, uriStr, null);
     }
-    
+
     public URIResolver(String baseUriStr, String uriStr, Class<?> calling) throws IOException {
         this.calling = (calling != null) ? calling : getClass();
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
-        } else if (baseUriStr != null 
-            && (baseUriStr.startsWith("jar:") 
+        } else if (baseUriStr != null
+            && (baseUriStr.startsWith("jar:")
                 || baseUriStr.startsWith("zip:")
                 || baseUriStr.startsWith("wsjar:"))) {
             tryArchive(baseUriStr, uriStr);
-        } else if (uriStr.startsWith("jar:") 
+        } else if (uriStr.startsWith("jar:")
             || uriStr.startsWith("zip:")
             || uriStr.startsWith("wsjar:")) {
             tryArchive(uriStr);
@@ -97,7 +97,7 @@ public class URIResolver {
         this.uri = null;
         this.is = null;
     }
-    
+
     public void resolve(String baseUriStr, String uriStr, Class<?> callingCls) throws IOException {
         this.calling = (callingCls != null) ? callingCls : getClass();
         this.file = null;
@@ -107,12 +107,12 @@ public class URIResolver {
 
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
-        } else if (baseUriStr != null 
-            && (baseUriStr.startsWith("jar:") 
+        } else if (baseUriStr != null
+            && (baseUriStr.startsWith("jar:")
                 || baseUriStr.startsWith("zip:")
                 || baseUriStr.startsWith("wsjar:"))) {
             tryArchive(baseUriStr, uriStr);
-        } else if (uriStr.startsWith("jar:") 
+        } else if (uriStr.startsWith("jar:")
             || uriStr.startsWith("zip:")
             || uriStr.startsWith("wsjar:")) {
             tryArchive(uriStr);
@@ -121,20 +121,20 @@ public class URIResolver {
         }
     }
 
-    
-    
+
+
     private void tryFileSystem(String baseUriStr, String uriStr) throws IOException, MalformedURLException {
         try {
             URI relative;
 
             String orig = uriStr;
-            
+
             // It is possible that spaces have been encoded.  We should decode them first.
             uriStr = uriStr.replaceAll("%20", " ");
 
             File uriFile = new File(uriStr);
-            
-            
+
+
             uriFile = new File(uriFile.getAbsolutePath());
             if (!SecurityActions.fileExists(uriFile, CXFPermissions.RESOLVE_URI)) {
                 try {
@@ -154,7 +154,7 @@ public class URIResolver {
             } else {
                 relative = uriFile.getAbsoluteFile().toURI();
             }
-            
+
             if (relative.isAbsolute()) {
                 uri = relative;
                 url = relative.toURL();
@@ -188,7 +188,7 @@ public class URIResolver {
             } else if (!StringUtils.isEmpty(baseUriStr)) {
                 URI base;
                 File baseFile = new File(baseUriStr);
-          
+
                 if (!baseFile.exists() && baseUriStr.startsWith("file:")) {
                     baseFile = new File(getFilePathFromUri(baseUriStr));
                 }
@@ -198,7 +198,7 @@ public class URIResolver {
                 } else {
                     base = new URI(baseUriStr);
                 }
-                
+
                 base = base.resolve(relative);
                 if (base.isAbsolute() && "file".equalsIgnoreCase(base.getScheme())) {
                     try {
@@ -208,19 +208,19 @@ public class URIResolver {
                             is = base.toURL().openStream();
                             uri = base;
                         } else {
-                            tryClasspath(base.toString().startsWith("file:") 
+                            tryClasspath(base.toString().startsWith("file:")
                                          ? base.toString().substring(5) : base.toString());
                         }
                     } catch (Throwable th) {
-                        tryClasspath(base.toString().startsWith("file:") 
+                        tryClasspath(base.toString().startsWith("file:")
                                      ? base.toString().substring(5) : base.toString());
                     }
                 } else {
-                    tryClasspath(base.toString().startsWith("file:") 
+                    tryClasspath(base.toString().startsWith("file:")
                                  ? base.toString().substring(5) : base.toString());
                 }
             } else {
-                tryClasspath(uriStr.startsWith("file:") 
+                tryClasspath(uriStr.startsWith("file:")
                              ? uriStr.substring(5) : uriStr);
             }
         } catch (URISyntaxException e) {
@@ -253,29 +253,29 @@ public class URIResolver {
             tryClasspath(uriStr);
         }
     }
-    
+
     /**
      * Assumption: URI scheme is "file"
      */
-    private String getFilePathFromUri(String uriString) {     
+    private String getFilePathFromUri(String uriString) {
         String path = null;
-        
+
         try {
             path = new URL(uriString).getPath();
         } catch (MalformedURLException e) {
             // ignore
         }
-        
+
         if (path == null) {
             if (uriString.startsWith("file:/")) {
                 path = uriString.substring(6);
             } else if (uriString.startsWith("file:")) {
                 // handle Windows file URI such as "file:C:/foo/bar"
                 path = uriString.substring(5);
-            } 
+            }
         }
-        
-        // decode spaces before returning otherwise File.exists returns false 
+
+        // decode spaces before returning otherwise File.exists returns false
         if (path != null) {
             return path.replace("%20", " ");
         }
@@ -304,10 +304,10 @@ public class URIResolver {
         } catch (URISyntaxException e) {
             // do nothing
         }
-        
+
         tryFileSystem("", uriStr);
     }
-    
+
     private void tryArchive(String uriStr) throws IOException {
         int i = uriStr.indexOf('!');
         if (i == -1) {
@@ -327,7 +327,7 @@ public class URIResolver {
             tryClasspath(uriStr);
         }
     }
-    
+
     private void tryClasspath(String uriStr) throws IOException {
         boolean isClasspathURL = false;
         if (uriStr.startsWith("classpath:")) {
@@ -341,8 +341,8 @@ public class URIResolver {
             try {
                 uri = url.toURI();
             } catch (URISyntaxException e) {
-                // yep, some versions of the JDK can't handle spaces when URL.toURI() is called, 
-                // and lots of people on windows have their maven repositories at 
+                // yep, some versions of the JDK can't handle spaces when URL.toURI() is called,
+                // and lots of people on windows have their maven repositories at
                 // C:/Documents and Settings/<userid>/.m2/repository
                 // re: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6506304
                 if (url.toString().contains(" ")) {
@@ -367,7 +367,7 @@ public class URIResolver {
                         }
                     }
                 }
-                
+
             }
             is = url.openStream();
         }
@@ -419,7 +419,7 @@ public class URIResolver {
     public File getFile() {
         return file;
     }
-    
+
     public boolean isResolved() {
         return is != null;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java b/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
index 964628e..6934ff7 100644
--- a/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
+++ b/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
@@ -25,10 +25,10 @@ import javax.security.auth.Subject;
 
 /**
  * LoginSecurityContext provides additional information about the
- * authenticated principal. 
- * 
+ * authenticated principal.
+ *
  * {@link SecurityContext} implementations which can get the authenticated
- * Subject and/or the list of the user roles may implement this interface. 
+ * Subject and/or the list of the user roles may implement this interface.
  */
 public interface LoginSecurityContext extends SecurityContext {
 
@@ -38,7 +38,7 @@ public interface LoginSecurityContext extends SecurityContext {
      */
     Subject getSubject();
     /**
-     * Returns a set of Principals representing the roles 
+     * Returns a set of Principals representing the roles
      * assigned to the current authenticated user Principal
      * @return the roles
      */

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/SecurityContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/SecurityContext.java b/core/src/main/java/org/apache/cxf/security/SecurityContext.java
index d76481b..cd1034b 100644
--- a/core/src/main/java/org/apache/cxf/security/SecurityContext.java
+++ b/core/src/main/java/org/apache/cxf/security/SecurityContext.java
@@ -26,6 +26,6 @@ import java.security.Principal;
 public interface SecurityContext {
 
     Principal getUserPrincipal();
-    
+
     boolean isUserInRole(String role);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java b/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
index 974a7fc..e0bdab2 100644
--- a/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
+++ b/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
@@ -26,18 +26,18 @@ import java.lang.annotation.Target;
 @Target({ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Claim {
-    
+
     String format() default "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
     String name() default "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role";
     String[] value();
-    
+
     /**
-     * If set to true then all the values of this claim have to be matched 
+     * If set to true then all the values of this claim have to be matched
      */
     boolean matchAll() default false;
     /**
      * If set to ClaimMode.LAX then the match will fail only if the incoming
-     * assertion has the same name and format claim with non-matching values  
+     * assertion has the same name and format claim with non-matching values
      */
     ClaimMode mode() default ClaimMode.STRICT;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
index 34918c7..79a5316 100644
--- a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
+++ b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
@@ -32,7 +32,7 @@ public class TLSSessionInfo {
     private final SSLSession sslSession;
     private final Certificate[] peerCertificates;
     private final String cipherSuite;
-    
+
     /**
      * This constructor has the effect of calling
      * TLSSessionInfo(null, suite)
@@ -42,7 +42,7 @@ public class TLSSessionInfo {
     ) {
         this(suite, null, null);
     }
-    
+
     /**
      * @param       suite
      *              The negotiated cipher suite
@@ -75,7 +75,7 @@ public class TLSSessionInfo {
     public final String getChipherSuite() {
         return cipherSuite;
     }
-    
+
     /**
      * @return      the negotiated cipher suite.  This attribute is
      *              guaranteed to be non-null.

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/Service.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/Service.java b/core/src/main/java/org/apache/cxf/service/Service.java
index 476ab10..799ec08 100644
--- a/core/src/main/java/org/apache/cxf/service/Service.java
+++ b/core/src/main/java/org/apache/cxf/service/Service.java
@@ -33,24 +33,24 @@ import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 
 public interface Service extends Map<String, Object>, InterceptorProvider {
-    
+
     QName getName();
-    
+
     List<ServiceInfo> getServiceInfos();
 
     EndpointInfo getEndpointInfo(QName endpoint);
-    
+
     DataBinding getDataBinding();
 
     void setDataBinding(DataBinding dataBinding);
-    
+
     Executor getExecutor();
 
     void setExecutor(Executor executor);
-    
+
     Invoker getInvoker();
-    
+
     void setInvoker(Invoker invoker);
-    
+
     Map<QName, Endpoint> getEndpoints();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
index d05d2d6..2e31da5 100644
--- a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
+++ b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
@@ -45,23 +45,23 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
     private Executor executor;
     private Invoker invoker;
     private Map<QName, Endpoint> endpoints = new HashMap<QName, Endpoint>();
-    
+
     public ServiceImpl() {
         this((ServiceInfo)null);
     }
-    
+
     public ServiceImpl(ServiceInfo si) {
         serviceInfos = new ArrayList<>();
         if (si != null) {
             serviceInfos.add(si);
         }
-        executor = SynchronousExecutor.getInstance();    
+        executor = SynchronousExecutor.getInstance();
     }
     public ServiceImpl(List<ServiceInfo> si) {
         serviceInfos = si;
-        executor = SynchronousExecutor.getInstance();    
+        executor = SynchronousExecutor.getInstance();
     }
-    
+
     public String getBeanName() {
         return getName().toString();
     }
@@ -73,7 +73,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
     public List<ServiceInfo> getServiceInfos() {
         return serviceInfos;
     }
-    
+
     public EndpointInfo getEndpointInfo(QName endpoint) {
         for (ServiceInfo inf : serviceInfos) {
             EndpointInfo ef = inf.getEndpoint(endpoint);
@@ -83,7 +83,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
         }
         return null;
     }
-    
+
 
     public Executor getExecutor() {
         return executor;
@@ -120,7 +120,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
     public void setProperties(Map<String, Object> properties) {
         this.putAll(properties);
     }
-    
+
     @Override
     public String toString() {
         return "[ServiceImpl " + getName() + "]";

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java b/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
index 38697ca..476ab8a 100644
--- a/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
+++ b/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
@@ -25,10 +25,10 @@ import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 
 /**
- * 
+ *
  */
 public class ServiceModelSchemaValidator extends ServiceModelVisitor {
-    
+
     private SchemaCollection schemaCollection;
     private StringBuilder complaints;
 
@@ -37,7 +37,7 @@ public class ServiceModelSchemaValidator extends ServiceModelVisitor {
         schemaCollection = serviceInfo.getXmlSchemaCollection();
         complaints = new StringBuilder();
     }
-    
+
     public String getComplaints() {
         return complaints.toString();
     }
@@ -53,8 +53,8 @@ public class ServiceModelSchemaValidator extends ServiceModelVisitor {
             }
         } else if (!part.getMessageInfo().getOperation().isUnwrapped()) {
             if (part.getTypeQName() == null) {
-                complaints.append(part.getName() + " of message " 
-                                  + part.getMessageInfo().getName() 
+                complaints.append(part.getName() + " of message "
+                                  + part.getMessageInfo().getName()
                                   + " part type QName null.\n");
             } else {
                 try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java b/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
index 17dd12e..05135b4 100644
--- a/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
+++ b/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
@@ -58,24 +58,24 @@ import org.apache.cxf.service.model.UnwrappedOperationInfo;
  */
 public class ServiceModelVisitor {
     protected ServiceInfo serviceInfo;
-    
+
     public ServiceModelVisitor(ServiceInfo serviceInfo) {
         super();
         this.serviceInfo = serviceInfo;
     }
-    
+
     public void walk() {
         begin(serviceInfo);
         begin(serviceInfo.getInterface());
-        
+
         for (OperationInfo o : serviceInfo.getInterface().getOperations()) {
             begin(o);
-            
+
             visitOperation(o);
-            
+
             end(o);
         }
-        
+
         end(serviceInfo.getInterface());
         for (EndpointInfo endpointInfo : serviceInfo.getEndpoints()) {
             begin(endpointInfo);
@@ -92,38 +92,38 @@ public class ServiceModelVisitor {
         MessageInfo in = o.getInput();
         if (in != null) {
             begin(in);
-            
+
             for (MessagePartInfo part : in.getMessageParts()) {
                 begin(part);
                 end(part);
             }
-            
+
             end(in);
         }
-        
+
         MessageInfo out = o.getOutput();
         if (out != null) {
             begin(out);
-            
+
             for (MessagePartInfo part : out.getMessageParts()) {
                 begin(part);
                 end(part);
             }
-            
+
             end(out);
         }
-        
+
         for (FaultInfo f : o.getFaults()) {
             begin(f);
-            
+
             for (MessagePartInfo part : f.getMessageParts()) {
                 begin(part);
                 end(part);
             }
-            
+
             end(f);
         }
-        
+
         if (o.isUnwrappedCapable()) {
             OperationInfo uop = o.getUnwrappedOperation();
             begin(uop);
@@ -131,7 +131,7 @@ public class ServiceModelVisitor {
             end(uop);
         }
     }
-    
+
     public void begin(ServiceInfo service) {
     }
     public void begin(InterfaceInfo intf) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
index 379a724..31e7050 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
@@ -47,7 +47,7 @@ import org.apache.cxf.staxutils.StaxUtils;
 
 public abstract class AbstractServiceFactoryBean {
     private static final Logger LOG = LogUtils.getL7dLogger(AbstractServiceFactoryBean.class);
-    
+
     protected boolean dataBindingSet;
     protected List<String> schemaLocations;
 
@@ -56,39 +56,39 @@ public abstract class AbstractServiceFactoryBean {
     private Service service;
     private List<FactoryBeanListener> listeners = new ModCountCopyOnWriteArrayList<FactoryBeanListener>();
     private Map<String, Object> sessionState = new HashMap<String, Object>();
-    
+
     public abstract Service create();
-    
+
     /**
-     * Returns a map that is useful for ServiceFactoryBeanListener to store state across 
-     * events during processing.   
+     * Returns a map that is useful for ServiceFactoryBeanListener to store state across
+     * events during processing.
      */
     public Map<String, Object> getSessionState() {
         return sessionState;
     }
-    
+
     public void sendEvent(FactoryBeanListener.Event ev, Object ... args) {
         for (FactoryBeanListener l : listeners) {
             l.handleEvent(ev, this, args);
         }
     }
-    
+
     protected void initializeDefaultInterceptors() {
         service.getInInterceptors().add(new ServiceInvokerInterceptor());
         service.getInInterceptors().add(new OutgoingChainInterceptor());
         service.getInInterceptors().add(new OneWayProcessorInterceptor());
     }
-    
+
     protected void initializeDataBindings() {
         if (getDataBinding() instanceof AbstractDataBinding && schemaLocations != null) {
             fillDataBindingSchemas();
         }
         getDataBinding().initialize(getService());
-        
+
         service.setDataBinding(getDataBinding());
         sendEvent(FactoryBeanListener.Event.DATABINDING_INITIALIZED, dataBinding);
     }
-    
+
     public Bus getBus() {
         return bus;
     }
@@ -126,7 +126,7 @@ public abstract class AbstractServiceFactoryBean {
     protected void setService(Service service) {
         this.service = service;
     }
-    
+
     private void fillDataBindingSchemas() {
         ResourceManager rr = getBus().getExtension(ResourceManager.class);
         List<DOMSource> schemas = new ArrayList<>();
@@ -154,5 +154,5 @@ public abstract class AbstractServiceFactoryBean {
         }
         ((AbstractDataBinding)getDataBinding()).setSchemas(schemas);
     }
- 
+
 }