Author: cschneider
Date: Mon Aug 29 11:37:12 2011
New Revision: 1162751

URL: http://svn.apache.org/viewvc?rev=1162751&view=rev
Log:
Checkstyle fixes

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/BytesSource.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/StringSource.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomProducerServicePoolTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
    
camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/BytesSource.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/BytesSource.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/BytesSource.java 
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/BytesSource.java Mon 
Aug 29 11:37:12 2011
@@ -25,10 +25,10 @@ import java.io.Serializable;
 import javax.xml.transform.stream.StreamSource;
 
 /**
- * A helper class which provides a JAXP {@link javax.xml.transform.Source 
Source} from a byte[]
- * which can be read as many times as required.
- *
- * @version 
+ * A helper class which provides a JAXP {@link javax.xml.transform.Source
+ * Source} from a byte[] which can be read as many times as required.
+ * 
+ * @version
  */
 public class BytesSource extends StreamSource implements Serializable {
     private static final long serialVersionUID = 124123201106542082L;
@@ -37,13 +37,13 @@ public class BytesSource extends StreamS
 
     public BytesSource(byte[] data) {
         if (data == null) {
-                   throw new IllegalArgumentException("data must be 
specified");
-               }
+            throw new IllegalArgumentException("data must be specified");
+        }
         this.data = data;
     }
 
     public BytesSource(byte[] data, String systemId) {
-       this(data);
+        this(data);
         setSystemId(systemId);
     }
 

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/StringSource.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/StringSource.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/StringSource.java 
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/StringSource.java Mon 
Aug 29 11:37:12 2011
@@ -28,13 +28,12 @@ import java.io.UnsupportedEncodingExcept
 
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.camel.util.ObjectHelper;
-
 /**
- * A helper class which provides a JAXP {@link javax.xml.transform.Source 
Source} from a String which can
- * be read as many times as required. Encoding is default UTF-8.
- *
- * @version 
+ * A helper class which provides a JAXP {@link javax.xml.transform.Source
+ * Source} from a String which can be read as many times as required. Encoding
+ * is default UTF-8.
+ * 
+ * @version
  */
 public class StringSource extends StreamSource implements Externalizable {
     private String text;
@@ -45,24 +44,24 @@ public class StringSource extends Stream
 
     public StringSource(String text) {
         if (text == null) {
-                   throw new IllegalArgumentException("text must be 
specified");
-               }
+            throw new IllegalArgumentException("text must be specified");
+        }
         this.text = text;
     }
 
     public StringSource(String text, String systemId) {
         this(text);
         if (systemId == null) {
-                   throw new IllegalArgumentException("systemId must be 
specified");
-               }
+            throw new IllegalArgumentException("systemId must be specified");
+        }
         setSystemId(systemId);
     }
 
     public StringSource(String text, String systemId, String encoding) {
         this(text, systemId);
         if (encoding == null) {
-                   throw new IllegalArgumentException("encoding must be 
specified");
-               }
+            throw new IllegalArgumentException("encoding must be specified");
+        }
         this.encoding = encoding;
     }
 
@@ -91,8 +90,7 @@ public class StringSource extends Stream
     }
 
     public void writeExternal(ObjectOutput out) throws IOException {
-        int b = (text != null ? 0x01 : 0x00) + (encoding != null ? 0x02 : 0x00)
-                + (getPublicId() != null ? 0x04 : 0x00) + (getSystemId() != 
null ? 0x08 : 0x00);
+        int b = (text != null ? 0x01 : 0x00) + (encoding != null ? 0x02 : 
0x00) + (getPublicId() != null ? 0x04 : 0x00) + (getSystemId() != null ? 0x08 : 
0x00);
         out.writeByte(b);
         if ((b & 0x01) != 0) {
             out.writeUTF(text);

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java 
Mon Aug 29 11:37:12 2011
@@ -36,12 +36,15 @@ import org.apache.camel.util.URISupport;
 /**
  * A default endpoint useful for implementation inheritance.
  * <p/>
- * Components which leverages <a 
href="http://camel.apache.org/asynchronous-routing-engine.html";>asynchronous 
processing model</a>
- * should check the {@link #isSynchronous()} to determine if asynchronous 
processing is allowed.
- * The <tt>synchronous</tt> option on the endpoint allows Camel end users to 
dictate whether they want the asynchronous model or not.
- * The option is default <tt>false</tt> which means asynchronous processing is 
allowed.
- *
- * @version 
+ * Components which leverages <a
+ * href="http://camel.apache.org/asynchronous-routing-engine.html";>asynchronous
+ * processing model</a> should check the {@link #isSynchronous()} to determine
+ * if asynchronous processing is allowed. The <tt>synchronous</tt> option on 
the
+ * endpoint allows Camel end users to dictate whether they want the 
asynchronous
+ * model or not. The option is default <tt>false</tt> which means asynchronous
+ * processing is allowed.
+ * 
+ * @version
  */
 public abstract class DefaultEndpoint extends ServiceSupport implements 
Endpoint, HasId, CamelContextAware {
 
@@ -49,7 +52,8 @@ public abstract class DefaultEndpoint ex
     private CamelContext camelContext;
     private Component component;
     private ExchangePattern exchangePattern = ExchangePattern.InOnly;
-    // option to allow end user to dictate whether async processing should be 
used or not (if possible)
+    // option to allow end user to dictate whether async processing should be
+    // used or not (if possible)
     private boolean synchronous;
     private final String id = EndpointHelper.createEndpointId();
 
@@ -57,7 +61,7 @@ public abstract class DefaultEndpoint ex
      * Constructs a fully-initialized DefaultEndpoint instance. This is the
      * preferred method of constructing an object from Java code (as opposed to
      * Spring beans, etc.).
-     *
+     * 
      * @param endpointUri the full URI used to create this endpoint
      * @param component the component that created this endpoint
      */
@@ -68,10 +72,12 @@ public abstract class DefaultEndpoint ex
     }
 
     /**
-     * Constructs a DefaultEndpoint instance which has <b>not</b> been created 
using a {@link Component}.
+     * Constructs a DefaultEndpoint instance which has <b>not</b> been created
+     * using a {@link Component}.
      * <p/>
-     * <b>Note:</b> It is preferred to create endpoints using the associated 
component.
-     *
+     * <b>Note:</b> It is preferred to create endpoints using the associated
+     * component.
+     * 
      * @param endpointUri the full URI used to create this endpoint
      * @param camelContext the Camel Context in which this endpoint is 
operating
      */
@@ -84,8 +90,9 @@ public abstract class DefaultEndpoint ex
     /**
      * Constructs a partially-initialized DefaultEndpoint instance.
      * <p/>
-     * <b>Note:</b> It is preferred to create endpoints using the associated 
component.
-     *
+     * <b>Note:</b> It is preferred to create endpoints using the associated
+     * component.
+     * 
      * @param endpointUri the full URI used to create this endpoint
      */
     @Deprecated
@@ -94,13 +101,14 @@ public abstract class DefaultEndpoint ex
     }
 
     /**
-     * Constructs a partially-initialized DefaultEndpoint instance.
-     * Useful when creating endpoints manually (e.g., as beans in Spring).
+     * Constructs a partially-initialized DefaultEndpoint instance. Useful when
+     * creating endpoints manually (e.g., as beans in Spring).
      * <p/>
      * Please note that the endpoint URI must be set through properties (or
      * overriding {@link #createEndpointUri()} if one uses this constructor.
      * <p/>
-     * <b>Note:</b> It is preferred to create endpoints using the associated 
component.
+     * <b>Note:</b> It is preferred to create endpoints using the associated
+     * component.
      */
     protected DefaultEndpoint() {
         super();
@@ -113,7 +121,7 @@ public abstract class DefaultEndpoint ex
     @Override
     public boolean equals(Object object) {
         if (object instanceof DefaultEndpoint) {
-            DefaultEndpoint that = (DefaultEndpoint) object;
+            DefaultEndpoint that = (DefaultEndpoint)object;
             return ObjectHelper.equal(this.getEndpointUri(), 
that.getEndpointUri());
         }
         return false;
@@ -125,8 +133,8 @@ public abstract class DefaultEndpoint ex
     }
 
     /**
-     * Returns a unique String ID which can be used for aliasing without 
having to use the whole URI which
-     * is not unique
+     * Returns a unique String ID which can be used for aliasing without having
+     * to use the whole URI which is not unique
      */
     public String getId() {
         return id;
@@ -136,8 +144,7 @@ public abstract class DefaultEndpoint ex
         if (endpointUri == null) {
             endpointUri = createEndpointUri();
             if (endpointUri == null) {
-                throw new IllegalArgumentException("endpointUri is not 
specified and " + getClass().getName()
-                        + " does not implement createEndpointUri() to create a 
default value");
+                throw new IllegalArgumentException("endpointUri is not 
specified and " + getClass().getName() + " does not implement 
createEndpointUri() to create a default value");
             }
         }
         return endpointUri;
@@ -145,7 +152,8 @@ public abstract class DefaultEndpoint ex
 
     public String getEndpointKey() {
         if (isLenientProperties()) {
-            // only use the endpoint uri without parameters as the properties 
is lenient
+            // only use the endpoint uri without parameters as the properties 
is
+            // lenient
             String uri = getEndpointUri();
             if (uri.indexOf('?') != -1) {
                 return ObjectHelper.before(uri, "?");
@@ -164,8 +172,9 @@ public abstract class DefaultEndpoint ex
 
     /**
      * Returns the component that created this endpoint.
-     *
-     * @return the component that created this endpoint, or <tt>null</tt> if 
none set
+     * 
+     * @return the component that created this endpoint, or <tt>null</tt> if
+     *         none set
      */
     public Component getComponent() {
         return component;
@@ -196,12 +205,12 @@ public abstract class DefaultEndpoint ex
     public Class<Exchange> getExchangeType() {
         Type type = getClass().getGenericSuperclass();
         if (type instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = (ParameterizedType) type;
+            ParameterizedType parameterizedType = (ParameterizedType)type;
             Type[] arguments = parameterizedType.getActualTypeArguments();
             if (arguments.length > 0) {
                 Type argumentType = arguments[0];
                 if (argumentType instanceof Class) {
-                    return (Class<Exchange>) argumentType;
+                    return (Class<Exchange>)argumentType;
                 }
             }
         }
@@ -218,7 +227,7 @@ public abstract class DefaultEndpoint ex
 
     /**
      * Returns the default exchange pattern to use for createExchange().
-     *
+     * 
      * @see #setExchangePattern(ExchangePattern exchangePattern)
      */
     public ExchangePattern getExchangePattern() {
@@ -235,7 +244,7 @@ public abstract class DefaultEndpoint ex
 
     /**
      * Returns whether synchronous processing should be strictly used.
-     *
+     * 
      * @see #setSynchronous(boolean synchronous)
      */
     public boolean isSynchronous() {
@@ -243,9 +252,9 @@ public abstract class DefaultEndpoint ex
     }
 
     /**
-     * Sets whether synchronous processing should be strictly used, or Camel 
is allowed to use
-     * asynchronous processing (if supported).
-     *
+     * Sets whether synchronous processing should be strictly used, or Camel is
+     * allowed to use asynchronous processing (if supported).
+     * 
      * @param synchronous <tt>true</tt> to enforce synchronous processing
      */
     public void setSynchronous(boolean synchronous) {
@@ -264,18 +273,20 @@ public abstract class DefaultEndpoint ex
     }
 
     /**
-     * Sets the endpointUri if it has not been specified yet via some kind of 
dependency injection mechanism.
-     * This allows dependency injection frameworks such as Spring or Guice to 
set the default endpoint URI in cases
-     * where it has not been explicitly configured using the name/context in 
which an Endpoint is created.
+     * Sets the endpointUri if it has not been specified yet via some kind of
+     * dependency injection mechanism. This allows dependency injection
+     * frameworks such as Spring or Guice to set the default endpoint URI in
+     * cases where it has not been explicitly configured using the name/context
+     * in which an Endpoint is created.
      */
     public void setEndpointUriIfNotSpecified(String value) {
         if (endpointUri == null && value != null) {
-               // FIXME: set the component first
-               // ObjectHelper.notNull(camelContext, "camelContext");
-               int s = value.indexOf(":");
-               if (camelContext != null && s > 0) {
-                       component = 
camelContext.getComponent(value.substring(0, s));
-               }
+            // FIXME: set the component first
+            // ObjectHelper.notNull(camelContext, "camelContext");
+            int s = value.indexOf(":");
+            if (camelContext != null && s > 0) {
+                component = camelContext.getComponent(value.substring(0, s));
+            }
             setEndpointUri(value);
         }
     }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java 
Mon Aug 29 11:37:12 2011
@@ -86,20 +86,15 @@ public final class DefaultExchange imple
         if (hasProperties()) {
             exchange.setProperties(safeCopy(getProperties()));
         }
-        safeCopy(exchange.getIn(), getIn());
+        
+        exchange.setIn(getIn().copy());
         if (hasOut()) {
-            safeCopy(exchange.getOut(), getOut());
+            exchange.setOut(getOut().copy());
         }
         exchange.setException(getException());
         return exchange;
     }
 
-    private static void safeCopy(Message message, Message that) {
-        if (message != null) {
-            message.copyFrom(that);
-        }
-    }
-
     private static Map<String, Object> safeCopy(Map<String, Object> 
properties) {
         if (properties == null) {
             return null;

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java 
Mon Aug 29 11:37:12 2011
@@ -34,8 +34,8 @@ import org.apache.camel.component.file.G
 
 /**
  * Some helper methods when working with {@link org.apache.camel.Message}.
- *
- * @version 
+ * 
+ * @version
  */
 public final class MessageHelper {
 
@@ -46,12 +46,12 @@ public final class MessageHelper {
     }
 
     /**
-     * Extracts the given body and returns it as a String, that
-     * can be used for logging etc.
+     * Extracts the given body and returns it as a String, that can be used for
+     * logging etc.
      * <p/>
      * Will handle stream based bodies wrapped in StreamCache.
-     *
-     * @param message  the message with the body
+     * 
+     * @param message the message with the body
      * @return the body as String, can return <tt>null</null> if no body
      */
     public static String extractBodyAsString(Message message) {
@@ -81,9 +81,10 @@ public final class MessageHelper {
      * Gets the given body class type name as a String.
      * <p/>
      * Will skip java.lang. for the build in Java types.
-     *
-     * @param message  the message with the body
-     * @return the body typename as String, can return <tt>null</null> if no 
body
+     * 
+     * @param message the message with the body
+     * @return the body typename as String, can return
+     *         <tt>null</null> if no body
      */
     public static String getBodyTypeName(Message message) {
         if (message == null) {
@@ -95,10 +96,10 @@ public final class MessageHelper {
         }
         return answer;
     }
-    
+
     /**
-     * If the message body contains a {@link StreamCache} instance, reset the 
cache to 
-     * enable reading from it again.
+     * If the message body contains a {@link StreamCache} instance, reset the
+     * cache to enable reading from it again.
      * 
      * @param message the message for which to reset the body
      */
@@ -107,19 +108,21 @@ public final class MessageHelper {
             return;
         }
         if (message.getBody() instanceof StreamCache) {
-            ((StreamCache) message.getBody()).reset();
+            ((StreamCache)message.getBody()).reset();
         }
     }
-    
+
     /**
-     * Returns the MIME content type on the message or <tt>null</tt> if none 
defined
+     * Returns the MIME content type on the message or <tt>null</tt> if none
+     * defined
      */
-    public static String getContentType(Message message) {        
+    public static String getContentType(Message message) {
         return message.getHeader(Exchange.CONTENT_TYPE, String.class);
     }
 
     /**
-     * Returns the MIME content encoding on the message or <tt>null</tt> if 
none defined
+     * Returns the MIME content encoding on the message or <tt>null</tt> if 
none
+     * defined
      */
     public static String getContentEncoding(Message message) {
         return message.getHeader(Exchange.CONTENT_ENCODING, String.class);
@@ -128,9 +131,9 @@ public final class MessageHelper {
     /**
      * Extracts the body for logging purpose.
      * <p/>
-     * Will clip the body if its too big for logging.
-     * Will prepend the message with <tt>Message: </tt>
-     *
+     * Will clip the body if its too big for logging. Will prepend the message
+     * with <tt>Message: </tt>
+     * 
      * @see org.apache.camel.Exchange#LOG_DEBUG_BODY_STREAMS
      * @see org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
      * @param message the message
@@ -144,7 +147,7 @@ public final class MessageHelper {
      * Extracts the body for logging purpose.
      * <p/>
      * Will clip the body if its too big for logging.
-     *
+     * 
      * @see org.apache.camel.Exchange#LOG_DEBUG_BODY_STREAMS
      * @see org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
      * @param message the message
@@ -177,13 +180,14 @@ public final class MessageHelper {
      * Extracts the body for logging purpose.
      * <p/>
      * Will clip the body if its too big for logging.
-     *
+     * 
      * @see org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
      * @param message the message
      * @param prepend a message to prepend
      * @param allowStreams whether or not streams is allowed
      * @param allowFiles whether or not files is allowed
-     * @param maxChars limit to maximum number of chars. Use 0 or negative 
value to not limit at all.
+     * @param maxChars limit to maximum number of chars. Use 0 or negative 
value
+     *            to not limit at all.
      * @return the logging message
      */
     public static String extractBodyForLogging(Message message, String 
prepend, boolean allowStreams, boolean allowFiles, int maxChars) {
@@ -193,29 +197,31 @@ public final class MessageHelper {
         }
 
         if (!allowStreams) {
-               if (obj instanceof StreamSource  && !(obj instanceof 
StringSource || obj instanceof BytesSource)) {
-                       /* Generally do not log StreamSources but as 
StringSource and ByteSoure
-                        * are memory based     they are ok */
-                       return prepend + "[Body is instance of 
java.xml.transform.StreamSource]";
-               } else if (obj instanceof StreamCache) {
-                       return prepend + "[Body is instance of 
org.apache.camel.StreamCache]";
-               } else if (obj instanceof InputStream) {
-                       return prepend + "[Body is instance of 
java.io.InputStream]";
-               } else if (obj instanceof OutputStream) {
-                       return prepend + "[Body is instance of 
java.io.OutputStream]";
-               } else if (obj instanceof Reader) {
-                       return prepend + "[Body is instance of java.io.Reader]";
-               } else if (obj instanceof Writer) {
-                       return prepend + "[Body is instance of java.io.Writer]";
-               } else if (obj instanceof GenericFile || obj instanceof File) {
-                       return prepend + "[Body is file based: " + obj + "]";
-               }
+            if (obj instanceof StreamSource && !(obj instanceof StringSource 
|| obj instanceof BytesSource)) {
+                /*
+                 * Generally do not log StreamSources but as StringSource and
+                 * ByteSoure are memory based they are ok
+                 */
+                return prepend + "[Body is instance of 
java.xml.transform.StreamSource]";
+            } else if (obj instanceof StreamCache) {
+                return prepend + "[Body is instance of 
org.apache.camel.StreamCache]";
+            } else if (obj instanceof InputStream) {
+                return prepend + "[Body is instance of java.io.InputStream]";
+            } else if (obj instanceof OutputStream) {
+                return prepend + "[Body is instance of java.io.OutputStream]";
+            } else if (obj instanceof Reader) {
+                return prepend + "[Body is instance of java.io.Reader]";
+            } else if (obj instanceof Writer) {
+                return prepend + "[Body is instance of java.io.Writer]";
+            } else if (obj instanceof GenericFile || obj instanceof File) {
+                return prepend + "[Body is file based: " + obj + "]";
+            }
         }
 
         // is the body a stream cache
         StreamCache cache;
         if (obj instanceof StreamCache) {
-            cache = (StreamCache) obj;
+            cache = (StreamCache)obj;
         } else {
             cache = null;
         }
@@ -252,8 +258,8 @@ public final class MessageHelper {
 
     /**
      * Dumps the message as a generic XML structure.
-     *
-     * @param message  the message
+     * 
+     * @param message the message
      * @return the XML
      */
     public static String dumpAsXml(Message message) {
@@ -262,8 +268,8 @@ public final class MessageHelper {
 
     /**
      * Dumps the message as a generic XML structure.
-     *
-     * @param message  the message
+     * 
+     * @param message the message
      * @param includeBody whether or not to include the message body
      * @return the XML
      */
@@ -286,7 +292,8 @@ public final class MessageHelper {
                 }
                 sb.append(">");
 
-                // dump header value as XML, use Camel type converter to 
convert to String
+                // dump header value as XML, use Camel type converter to 
convert
+                // to String
                 if (value != null) {
                     try {
                         String xml = 
message.getExchange().getContext().getTypeConverter().convertTo(String.class, 
value);
@@ -312,8 +319,10 @@ public final class MessageHelper {
             }
             sb.append(">");
 
-            // dump body value as XML, use Camel type converter to convert to 
String
-            // do not allow streams, but allow files, and clip very big 
message bodies (128kb)
+            // dump body value as XML, use Camel type converter to convert to
+            // String
+            // do not allow streams, but allow files, and clip very big message
+            // bodies (128kb)
             String xml = extractBodyForLogging(message, "", false, true, 128 * 
1024);
             if (xml != null) {
                 // must always xml encode
@@ -329,7 +338,7 @@ public final class MessageHelper {
 
     /**
      * Copies the headers from the source to the target message.
-     *
+     * 
      * @param source the source message
      * @param target the target message
      * @param override whether to override existing headers

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomProducerServicePoolTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomProducerServicePoolTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomProducerServicePoolTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomProducerServicePoolTest.java
 Mon Aug 29 11:37:12 2011
@@ -40,7 +40,7 @@ public class CustomProducerServicePoolTe
     private static final class MyEndpoint extends DefaultEndpoint {
 
         private MyEndpoint(String endpointUri, CamelContext camelContext) {
-               // FIXME: another endpoint that works without a Component
+            // FIXME: another endpoint that works without a Component
             super();
             this.setCamelContext(camelContext);
             this.setEndpointUri(endpointUri);

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
 Mon Aug 29 11:37:12 2011
@@ -38,7 +38,7 @@ public class DefaultCamelContextEndpoint
         for (int i = 0; i < 78; i++) {
             String uri = "myendpoint?id=" + i;
             DefaultEndpoint e = new DefaultEndpoint() {
-               // FIXME: another endpoint that works without a Component
+                // FIXME: another endpoint that works without a Component
                 public Producer createProducer() throws Exception {
                     return null;
                 }

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheTest.java
 Mon Aug 29 11:37:12 2011
@@ -36,7 +36,7 @@ public class DefaultCamelContextEndpoint
         for (int i = 0; i < 1003; i++) {
             String uri = "myendpoint?id=" + i;
             DefaultEndpoint e = new DefaultEndpoint() {
-               // FIXME: another endpoint that works without a Component
+                // FIXME: another endpoint that works without a Component
                 public Producer createProducer() throws Exception {
                     return null;
                 }

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
 Mon Aug 29 11:37:12 2011
@@ -119,7 +119,7 @@ public class Endpoint2MustBeStartedBefor
     private final class MyEndpoint extends DefaultEndpoint {
 
         private MyEndpoint(String endpointUri, CamelContext camelContext) {
-               // FIXME: another endpoint that works without a Component
+            // FIXME: another endpoint that works without a Component
             super();
             this.setCamelContext(camelContext);
             this.setEndpointUri(endpointUri);

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
 Mon Aug 29 11:37:12 2011
@@ -118,7 +118,7 @@ public class EndpointMustBeStartedBefore
     private final class MyEndpoint extends DefaultEndpoint {
 
         private MyEndpoint(String endpointUri, CamelContext camelContext) {
-               // FIXME: another endpoint that works without a Component
+            // FIXME: another endpoint that works without a Component
             super();
             this.setCamelContext(camelContext);
             this.setEndpointUri(endpointUri);

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
 Mon Aug 29 11:37:12 2011
@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.camel.Ordered;
-
 import junit.framework.TestCase;
 
+import org.apache.camel.Ordered;
+
 /**
  * @version 
  */

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
 Mon Aug 29 11:37:12 2011
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.jms;
 
-import static 
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
-
 import java.io.FileInputStream;
 
 import javax.jms.ConnectionFactory;
@@ -33,6 +31,9 @@ import org.apache.camel.component.mock.M
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
+import static 
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+
 /**
  * For unit testing with XML streams that can be troublesome with the 
StreamCache
  *

Modified: 
camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java?rev=1162751&r1=1162750&r2=1162751&view=diff
==============================================================================
--- 
camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java
 (original)
+++ 
camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java
 Mon Aug 29 11:37:12 2011
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.language.juel.issues;
 
-import static org.apache.camel.language.juel.JuelExpression.el;
-
 import javax.xml.transform.TransformerConfigurationException;
 
 import org.apache.camel.Exchange;
@@ -30,6 +28,8 @@ import org.apache.camel.component.mock.M
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
+import static org.apache.camel.language.juel.JuelExpression.el;
+
 /**
  * @version 
  */


Reply via email to