camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r673954 [1/2] - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/processor/interceptor/ camel-core/src/main/java/org/apache/camel/...
Date Fri, 04 Jul 2008 08:26:34 GMT
Author: ningjiang
Date: Fri Jul  4 01:26:32 2008
New Revision: 673954

URL: http://svn.apache.org/viewvc?rev=673954&view=rev
Log:
Applied the svn properties

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Routes.java   (props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/SystemHelper.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java   (props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java   (contents, props changed)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java   (contents, props changed)
    activemq/camel/trunk/components/camel-jetty/src/test/resources/log4j.properties   (props changed)
    activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java   (props changed)
    activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java   (props changed)
    activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java   (props changed)
    activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java   (props changed)
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml   (props changed)
    activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml   (contents, props changed)
    activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml   (props changed)
    activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java   (contents, props changed)
    activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java   (contents, props changed)
    activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java   (contents, props changed)
    activemq/camel/trunk/examples/camel-example-spring-jms/build.xml   (contents, props changed)
    activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/log4j.properties   (props changed)

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java Fri Jul  4 01:26:32 2008
@@ -1,152 +1,152 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Represents an instance and a type safe registry of well known Camel Exchange properties.
- * <p/>
- * <b>Usage pattern:</b>
- * <br/>In your code register a property that you wish to pass via Camel Exchange:
- * <pre>
- *      public static final ExchangeProperty<Boolean> myProperty =
- *            new ExchangeProperty<Boolean>("myProperty", "org.apache.myproject.mypackage.myproperty", Boolean.class);
- *
- *  Then in your code set this property's value:
- *      myProperty.set(exchange, Boolean.TRUE);
- *
- *  Check the value of this property where required:
- *      ExchangeProperty<?> property = ExchangeProperty.get("myProperty");
- *      if (property != null && property.get(exchange) == Boolean.TRUE) {
- *           // do your thing ...
- *       }
- *  Or
- *      Boolean value = myProperty.get(exchange);
- *      if (value == Boolean.TRUE) {
- *          // do your thing
- *      }
- *
- *  When your code no longer requires this property then deregister it:
- *      ExchangeProperty.deregister(myProperty);
- *  Or
- *      ExchangeProperty.deregister("myProperty");
- *  </pre>
- *
- *  <b>Note:</b> that if ExchangeProperty instance get or set methods are used then type checks
- *  of property's value are performed and a runtime exception can be thrown if type
- *  safety is violated.
- */
-public class ExchangeProperty<T> {
-
-    private static final List<ExchangeProperty<?>> VALUES =
-        new ArrayList<ExchangeProperty<?>>();
-
-    private static final Map<String, ExchangeProperty<?>> LITERAL_MAP =
-        new HashMap<String, ExchangeProperty<?>>();
-
-    private static final Map<String, ExchangeProperty<?>> NAME_MAP =
-        new HashMap<String, ExchangeProperty<?>>();
-
-    private final String literal;
-    private final String name;
-    private final Class<T> type;
-
-    public ExchangeProperty(String literal, String name, Class<T> type) {
-        this.literal = literal;
-        this.name = name;
-        this.type = type;
-        register(this);
-    }
-
-    public String literal() {
-        return literal;
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public Class<T> type() {
-        return type;
-    }
-
-    public T get(Exchange exchange) {
-        return exchange.getProperty(name, type);
-    }
-
-    public static ExchangeProperty<?> get(String literal) {
-        return LITERAL_MAP.get(literal);
-    }
-
-    public static ExchangeProperty<?> getByName(String name) {
-        return NAME_MAP.get(name);
-    }
-
-    public T set(Exchange exchange, T value) {
-        T oldValue = get(exchange);
-        exchange.setProperty(name, value);
-        return oldValue;
-    }
-
-    public T remove(Exchange exchange) {
-        T oldValue = get(exchange);
-        exchange.removeProperty(name);
-        return oldValue;
-    }
-
-    @Override
-    public String toString() {
-        return type().getCanonicalName() + " " + name + " (" + literal() + ")";
-    }
-
-    public static synchronized void register(ExchangeProperty<?> property) {
-        ExchangeProperty<?> existingProperty = LITERAL_MAP.get(property.literal());
-        if (existingProperty != null && existingProperty != property) {
-            throw new RuntimeCamelException("An Exchange Property '" + property.literal()
-                    + "' has already been registered; its traits are: " + existingProperty.toString());
-        }
-        VALUES.add(property);
-        LITERAL_MAP.put(property.literal(), property);
-        NAME_MAP.put(property.name(), property);
-    }
-
-    public static synchronized void deregister(ExchangeProperty<?> property) {
-        if (property != null) {
-            VALUES.remove(property);
-            LITERAL_MAP.remove(property.literal());
-            NAME_MAP.put(property.name(), property);
-        }
-    }
-
-    public static synchronized void deregister(String literal) {
-        ExchangeProperty<?> property = LITERAL_MAP.get(literal);
-        if (property != null) {
-            VALUES.remove(property);
-            LITERAL_MAP.remove(property.literal());
-            NAME_MAP.put(property.name(), property);
-        }
-    }
-
-    public static synchronized ExchangeProperty<?>[] values() {
-        return VALUES.toArray(new ExchangeProperty[0]);
-    }
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents an instance and a type safe registry of well known Camel Exchange properties.
+ * <p/>
+ * <b>Usage pattern:</b>
+ * <br/>In your code register a property that you wish to pass via Camel Exchange:
+ * <pre>
+ *      public static final ExchangeProperty<Boolean> myProperty =
+ *            new ExchangeProperty<Boolean>("myProperty", "org.apache.myproject.mypackage.myproperty", Boolean.class);
+ *
+ *  Then in your code set this property's value:
+ *      myProperty.set(exchange, Boolean.TRUE);
+ *
+ *  Check the value of this property where required:
+ *      ExchangeProperty<?> property = ExchangeProperty.get("myProperty");
+ *      if (property != null && property.get(exchange) == Boolean.TRUE) {
+ *           // do your thing ...
+ *       }
+ *  Or
+ *      Boolean value = myProperty.get(exchange);
+ *      if (value == Boolean.TRUE) {
+ *          // do your thing
+ *      }
+ *
+ *  When your code no longer requires this property then deregister it:
+ *      ExchangeProperty.deregister(myProperty);
+ *  Or
+ *      ExchangeProperty.deregister("myProperty");
+ *  </pre>
+ *
+ *  <b>Note:</b> that if ExchangeProperty instance get or set methods are used then type checks
+ *  of property's value are performed and a runtime exception can be thrown if type
+ *  safety is violated.
+ */
+public class ExchangeProperty<T> {
+
+    private static final List<ExchangeProperty<?>> VALUES =
+        new ArrayList<ExchangeProperty<?>>();
+
+    private static final Map<String, ExchangeProperty<?>> LITERAL_MAP =
+        new HashMap<String, ExchangeProperty<?>>();
+
+    private static final Map<String, ExchangeProperty<?>> NAME_MAP =
+        new HashMap<String, ExchangeProperty<?>>();
+
+    private final String literal;
+    private final String name;
+    private final Class<T> type;
+
+    public ExchangeProperty(String literal, String name, Class<T> type) {
+        this.literal = literal;
+        this.name = name;
+        this.type = type;
+        register(this);
+    }
+
+    public String literal() {
+        return literal;
+    }
+
+    public String name() {
+        return name;
+    }
+
+    public Class<T> type() {
+        return type;
+    }
+
+    public T get(Exchange exchange) {
+        return exchange.getProperty(name, type);
+    }
+
+    public static ExchangeProperty<?> get(String literal) {
+        return LITERAL_MAP.get(literal);
+    }
+
+    public static ExchangeProperty<?> getByName(String name) {
+        return NAME_MAP.get(name);
+    }
+
+    public T set(Exchange exchange, T value) {
+        T oldValue = get(exchange);
+        exchange.setProperty(name, value);
+        return oldValue;
+    }
+
+    public T remove(Exchange exchange) {
+        T oldValue = get(exchange);
+        exchange.removeProperty(name);
+        return oldValue;
+    }
+
+    @Override
+    public String toString() {
+        return type().getCanonicalName() + " " + name + " (" + literal() + ")";
+    }
+
+    public static synchronized void register(ExchangeProperty<?> property) {
+        ExchangeProperty<?> existingProperty = LITERAL_MAP.get(property.literal());
+        if (existingProperty != null && existingProperty != property) {
+            throw new RuntimeCamelException("An Exchange Property '" + property.literal()
+                    + "' has already been registered; its traits are: " + existingProperty.toString());
+        }
+        VALUES.add(property);
+        LITERAL_MAP.put(property.literal(), property);
+        NAME_MAP.put(property.name(), property);
+    }
+
+    public static synchronized void deregister(ExchangeProperty<?> property) {
+        if (property != null) {
+            VALUES.remove(property);
+            LITERAL_MAP.remove(property.literal());
+            NAME_MAP.put(property.name(), property);
+        }
+    }
+
+    public static synchronized void deregister(String literal) {
+        ExchangeProperty<?> property = LITERAL_MAP.get(literal);
+        if (property != null) {
+            VALUES.remove(property);
+            LITERAL_MAP.remove(property.literal());
+            NAME_MAP.put(property.name(), property);
+        }
+    }
+
+    public static synchronized ExchangeProperty<?>[] values() {
+        return VALUES.toArray(new ExchangeProperty[0]);
+    }
+
 }
\ No newline at end of file

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java Fri Jul  4 01:26:32 2008
@@ -20,7 +20,7 @@
 /**
  * An interface which provides the processing logic as a pluggable processor
  *
- * @version $Revision:  $
+ * @version $Revision$
  */
 public interface Intercept {
 

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Intercept.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Routes.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Routes.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java Fri Jul  4 01:26:32 2008
@@ -22,7 +22,7 @@
 /**
  * A default {@link ExchangeFormatter} which just uses the {@link org.apache.camel.Exchange#toString()} method
  *
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class DefaultExchangeFormatter implements ExchangeFormatter {
     protected static final DefaultExchangeFormatter INSTANCE = new DefaultExchangeFormatter();

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java Fri Jul  4 01:26:32 2008
@@ -21,7 +21,7 @@
 /**
  * Represents an exception that occurred when processing an exchange
  *
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class ExceptionEvent {
     private final DebugInterceptor interceptor;

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java Fri Jul  4 01:26:32 2008
@@ -22,7 +22,7 @@
  * A plugin used to turn an {@link Exchange} into a String
  * so it can be logged to a file
  *
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public interface ExchangeFormatter {
     /**

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java Fri Jul  4 01:26:32 2008
@@ -22,7 +22,7 @@
 import org.apache.camel.util.ObjectHelper;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class TraceFormatter {
     private boolean showBreadCrumb = true;

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/SystemHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/SystemHelper.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/SystemHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/SystemHelper.java Fri Jul  4 01:26:32 2008
@@ -23,7 +23,7 @@
 /**
  * A helper class for various {@link System} related methods
  *
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public final class SystemHelper {
     private static final transient Log LOG = LogFactory.getLog(SystemHelper.class);

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/SystemHelper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java Fri Jul  4 01:26:32 2008
@@ -1,112 +1,112 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel;
-
-import org.apache.camel.impl.DefaultExchange;
-
-public class ExchangePropertyTest extends ExchangeTestSupport {
-    protected static final String P1_NAME = "org.apache.myproject.mypackage.myproperty1";
-    protected static final String P2_NAME = "org.apache.myproject.mypackage.myproperty2";
-    
-    protected Exchange exchange;
-
-    public void testExchangePropertyRegistry() throws Exception {
-        ExchangeProperty<Boolean> myProperty1 = 
-            new ExchangeProperty<Boolean>("myProperty1", P1_NAME, Boolean.class);
-        
-        assertEquals(ExchangeProperty.get("myProperty1"), myProperty1);
-        assertEquals(ExchangeProperty.values().length, 1); 
-        assertEquals(ExchangeProperty.values()[0], myProperty1);
-
-        ExchangeProperty<Boolean> myProperty2 = 
-            new ExchangeProperty<Boolean>("myProperty2", P2_NAME, Boolean.class);
-        
-        assertEquals(ExchangeProperty.get("myProperty2"), myProperty2);
-        assertEquals(ExchangeProperty.values().length, 2); 
-        assertEquals(ExchangeProperty.values()[1], myProperty2);
-
-        try {
-            ExchangeProperty<Boolean> rejectedProperty = 
-                new ExchangeProperty<Boolean>("myProperty2", P2_NAME, Boolean.class);
-            fail("Expected RuntimeCamelException to be thrown due to duplicate property "
-                 + " registration attempt");
-        } catch (RuntimeCamelException e) {
-            assertEquals(ExchangeProperty.values().length, 2);
-        } catch (Throwable t) {
-            fail("Expected RuntimeCamelException to be thrown due to duplicate propery "
-                    + " registration attempt");
-        }
-        ExchangeProperty.deregister(myProperty1);
-        assertEquals(ExchangeProperty.get("myProperty1"), null);
-        ExchangeProperty.deregister("myProperty2");
-        assertEquals(ExchangeProperty.get("myProperty2"), null);
-        assertEquals(ExchangeProperty.values().length, 0);
-    }
-    
-    public void testExchangePropertySetterGetter() throws Exception {
-        Exchange exchange = createExchange();
-
-        ExchangeProperty<Boolean> myProperty1 = 
-            new ExchangeProperty<Boolean>("myProperty1", P1_NAME, Boolean.class);
-
-        ExchangeProperty<String> myProperty2 = 
-            new ExchangeProperty<String>("myProperty2", P2_NAME, String.class);
-        
-        myProperty1.set(exchange, Boolean.TRUE);
-        assertTrue("Unexpected property value", 
-                    myProperty1.get(exchange) == Boolean.TRUE);
-        assertTrue("Unexpected property value", 
-                    ExchangeProperty.get("myProperty1").get(exchange) == Boolean.TRUE);
-        
-        myProperty2.set(exchange, "camel");
-        assertTrue("Unexpected property value", 
-                    myProperty2.get(exchange).equals("camel"));
-        assertTrue("Unexpected property value", 
-                    ExchangeProperty.get("myProperty2").get(exchange).equals("camel"));
-        
-        ExchangeProperty.deregister(myProperty1);
-        assertEquals(ExchangeProperty.get("myProperty1"), null);
-        ExchangeProperty.deregister("myProperty2");
-        assertEquals(ExchangeProperty.get("myProperty2"), null);
-        assertEquals(ExchangeProperty.values().length, 0);
-    }
-
-    public void testExchangePropertyTypeSafety() throws Exception {
-        Exchange exchange = createExchange();
-        ExchangeProperty<Boolean> myProperty1 = 
-            new ExchangeProperty<Boolean>("myProperty1", P1_NAME, Boolean.class);
-        try {
-            exchange.setProperty(P1_NAME, "camel");
-            fail("Expected RuntimeCamelException to be thrown due to property value type cast violation");
-        } catch (RuntimeCamelException e) {
-            // complete
-        } catch (Throwable t) {
-            fail("Expected RuntimeCamelException to be thrown due to property value type cast violation");
-        }
-        
-        myProperty1.set(exchange, Boolean.TRUE);
-        
-        assertTrue("Unexpected property value", 
-                myProperty1.get(exchange) == Boolean.TRUE);
-        assertTrue("Unexpected property value", 
-                ExchangeProperty.get("myProperty1").get(exchange) == Boolean.TRUE);
-
-        ExchangeProperty.deregister(myProperty1);
-        assertEquals(ExchangeProperty.get("myProperty1"), null);
-        assertEquals(ExchangeProperty.values().length, 0);
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel;
+
+import org.apache.camel.impl.DefaultExchange;
+
+public class ExchangePropertyTest extends ExchangeTestSupport {
+    protected static final String P1_NAME = "org.apache.myproject.mypackage.myproperty1";
+    protected static final String P2_NAME = "org.apache.myproject.mypackage.myproperty2";
+    
+    protected Exchange exchange;
+
+    public void testExchangePropertyRegistry() throws Exception {
+        ExchangeProperty<Boolean> myProperty1 = 
+            new ExchangeProperty<Boolean>("myProperty1", P1_NAME, Boolean.class);
+        
+        assertEquals(ExchangeProperty.get("myProperty1"), myProperty1);
+        assertEquals(ExchangeProperty.values().length, 1); 
+        assertEquals(ExchangeProperty.values()[0], myProperty1);
+
+        ExchangeProperty<Boolean> myProperty2 = 
+            new ExchangeProperty<Boolean>("myProperty2", P2_NAME, Boolean.class);
+        
+        assertEquals(ExchangeProperty.get("myProperty2"), myProperty2);
+        assertEquals(ExchangeProperty.values().length, 2); 
+        assertEquals(ExchangeProperty.values()[1], myProperty2);
+
+        try {
+            ExchangeProperty<Boolean> rejectedProperty = 
+                new ExchangeProperty<Boolean>("myProperty2", P2_NAME, Boolean.class);
+            fail("Expected RuntimeCamelException to be thrown due to duplicate property "
+                 + " registration attempt");
+        } catch (RuntimeCamelException e) {
+            assertEquals(ExchangeProperty.values().length, 2);
+        } catch (Throwable t) {
+            fail("Expected RuntimeCamelException to be thrown due to duplicate propery "
+                    + " registration attempt");
+        }
+        ExchangeProperty.deregister(myProperty1);
+        assertEquals(ExchangeProperty.get("myProperty1"), null);
+        ExchangeProperty.deregister("myProperty2");
+        assertEquals(ExchangeProperty.get("myProperty2"), null);
+        assertEquals(ExchangeProperty.values().length, 0);
+    }
+    
+    public void testExchangePropertySetterGetter() throws Exception {
+        Exchange exchange = createExchange();
+
+        ExchangeProperty<Boolean> myProperty1 = 
+            new ExchangeProperty<Boolean>("myProperty1", P1_NAME, Boolean.class);
+
+        ExchangeProperty<String> myProperty2 = 
+            new ExchangeProperty<String>("myProperty2", P2_NAME, String.class);
+        
+        myProperty1.set(exchange, Boolean.TRUE);
+        assertTrue("Unexpected property value", 
+                    myProperty1.get(exchange) == Boolean.TRUE);
+        assertTrue("Unexpected property value", 
+                    ExchangeProperty.get("myProperty1").get(exchange) == Boolean.TRUE);
+        
+        myProperty2.set(exchange, "camel");
+        assertTrue("Unexpected property value", 
+                    myProperty2.get(exchange).equals("camel"));
+        assertTrue("Unexpected property value", 
+                    ExchangeProperty.get("myProperty2").get(exchange).equals("camel"));
+        
+        ExchangeProperty.deregister(myProperty1);
+        assertEquals(ExchangeProperty.get("myProperty1"), null);
+        ExchangeProperty.deregister("myProperty2");
+        assertEquals(ExchangeProperty.get("myProperty2"), null);
+        assertEquals(ExchangeProperty.values().length, 0);
+    }
+
+    public void testExchangePropertyTypeSafety() throws Exception {
+        Exchange exchange = createExchange();
+        ExchangeProperty<Boolean> myProperty1 = 
+            new ExchangeProperty<Boolean>("myProperty1", P1_NAME, Boolean.class);
+        try {
+            exchange.setProperty(P1_NAME, "camel");
+            fail("Expected RuntimeCamelException to be thrown due to property value type cast violation");
+        } catch (RuntimeCamelException e) {
+            // complete
+        } catch (Throwable t) {
+            fail("Expected RuntimeCamelException to be thrown due to property value type cast violation");
+        }
+        
+        myProperty1.set(exchange, Boolean.TRUE);
+        
+        assertTrue("Unexpected property value", 
+                myProperty1.get(exchange) == Boolean.TRUE);
+        assertTrue("Unexpected property value", 
+                ExchangeProperty.get("myProperty1").get(exchange) == Boolean.TRUE);
+
+        ExchangeProperty.deregister(myProperty1);
+        assertEquals(ExchangeProperty.get("myProperty1"), null);
+        assertEquals(ExchangeProperty.values().length, 0);
+    }
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePropertyTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java Fri Jul  4 01:26:32 2008
@@ -28,7 +28,7 @@
 import org.apache.camel.util.ReflectionInjector;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class StringSourceTest extends TestCase {
     protected TypeConverter converter = new DefaultTypeConverter(new ReflectionInjector());

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java Fri Jul  4 01:26:32 2008
@@ -20,7 +20,7 @@
 import org.apache.camel.component.mock.MockEndpoint;
 
 /**
- * @version $Revision: 647400 $
+ * @version $Revision$
  */
 public abstract class InterceptRouteTestSupport extends ContextTestSupport {
     protected MockEndpoint a;

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java Fri Jul  4 01:26:32 2008
@@ -19,7 +19,7 @@
 import org.apache.camel.builder.RouteBuilder;
 
 /**
- * @version $Revision:  $
+ * @version $Revision$
  */
 public class InterceptWithPredicateAndStopRouteTest extends
         InterceptRouteTestSupport {

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java Fri Jul  4 01:26:32 2008
@@ -19,7 +19,7 @@
 import org.apache.camel.builder.RouteBuilder;
 
 /**
- * @version $Revision:  $
+ * @version $Revision$
  */
 public class InterceptWithStopRouteTest extends InterceptRouteTestSupport {
 

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java Fri Jul  4 01:26:32 2008
@@ -24,7 +24,7 @@
 import org.apache.camel.processor.interceptor.Tracer;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class TraceInterceptorTest extends ContextTestSupport {
 

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-jetty/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html Fri Jul  4 01:26:32 2008
@@ -1,25 +1,25 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-</head>
-<body>
-
-Base classes for Factories
-
-</body>
-</html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Base classes for Factories
+
+</body>
+</html>

Propchange: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java Fri Jul  4 01:26:32 2008
@@ -26,7 +26,7 @@
 import org.springframework.beans.factory.BeanNameAware;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class DummyErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements BeanNameAware {
     public static final String PROPERTY_NAME = "DummyErrorHandler";

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java Fri Jul  4 01:26:32 2008
@@ -25,7 +25,7 @@
 import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 @ContextConfiguration
 public class ErrorHandlerConfigTest extends AbstractJUnit38SpringContextTests {

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java Fri Jul  4 01:26:32 2008
@@ -1,47 +1,47 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.spring.interceptor;
-
-import javax.sql.DataSource;
-
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
-
-/**
- * Used for unit testing
- */
-// START SNIPPET: e1
-public class BookService {
-
-    private SimpleJdbcTemplate jdbc;
-
-    public BookService() {
-    }
-
-    public void setDataSource(DataSource ds) {
-        jdbc = new SimpleJdbcTemplate(ds);
-    }
-
-    public void orderBook(String title) throws Exception {
-        if (title.startsWith("Donkey")) {
-            throw new IllegalArgumentException("We don't have Donkeys, only Camels");
-        }
-
-        // create new local datasource to store in DB
-        jdbc.update("insert into books (title) values (?)", title);
-    }
-}
-// END SNIPPET: e1
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.interceptor;
+
+import javax.sql.DataSource;
+
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+/**
+ * Used for unit testing
+ */
+// START SNIPPET: e1
+public class BookService {
+
+    private SimpleJdbcTemplate jdbc;
+
+    public BookService() {
+    }
+
+    public void setDataSource(DataSource ds) {
+        jdbc = new SimpleJdbcTemplate(ds);
+    }
+
+    public void orderBook(String title) throws Exception {
+        if (title.startsWith("Donkey")) {
+            throw new IllegalArgumentException("We don't have Donkeys, only Camels");
+        }
+
+        // create new local datasource to store in DB
+        jdbc.update("insert into books (title) values (?)", title);
+    }
+}
+// END SNIPPET: e1

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java Fri Jul  4 01:26:32 2008
@@ -1,108 +1,108 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.spring.interceptor;
-
-import javax.sql.DataSource;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringTestSupport;
-import org.apache.camel.spring.spi.SpringTransactionPolicy;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.support.TransactionTemplate;
-
-/**
- * Unit test to demonstrate the transactional client pattern.
- */
-public class TransactionalClientDataSourceTest extends SpringTestSupport {
-
-    private JdbcTemplate jdbc;
-
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext(
-            "/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml");
-    }
-
-    protected int getExpectedRouteCount() {
-        return 0;
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        this.disableJMX();
-        super.setUp();
-
-        // START SNIPPET: e5
-        // create database and insert dummy data
-        final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
-        jdbc = new JdbcTemplate(ds);
-        jdbc.execute("create table books (title varchar(50))");
-        jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
-        // END SNIPPET: e5
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        jdbc.execute("drop table books");
-        this.enableJMX();
-    }
-
-    // START SNIPPET: e3
-    public void testTransactionSuccess() throws Exception {
-        template.sendBody("direct:okay", "Hello World");
-
-        int count = jdbc.queryForInt("select count(*) from books");
-        assertEquals("Number of books", 3, count);
-    }
-    // END SNIPPET: e3
-
-    // START SNIPPET: e4
-    public void testTransactionRollback() throws Exception {
-        template.sendBody("direct:fail", "Hello World");
-
-        int count = jdbc.queryForInt("select count(*) from books");
-        assertEquals("Number of books", 1, count);
-    }
-    // END SNIPPET: e4
-
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() throws Exception {
-                // START SNIPPET: e1
-                // setup the transaction policy
-                TransactionTemplate tt = context.getRegistry()
-                    .lookup("PROPAGATION_REQUIRED", TransactionTemplate.class);
-                SpringTransactionPolicy required = new SpringTransactionPolicy(tt);
-
-                // set the required policy for this route
-                from("direct:okay").policy(required).
-                    setBody(constant("Tiger in Action")).beanRef("bookService").
-                    setBody(constant("Elephant in Action")).beanRef("bookService");
-                // END SNIPPET: e1
-
-                // START SNIPPET: e2
-                // set the required policy for this route
-                from("direct:fail").policy(required).
-                    setBody(constant("Tiger in Action")).beanRef("bookService").
-                    setBody(constant("Donkey in Action")).beanRef("bookService");
-                // END SNIPPET: e2
-            }
-        };
-    }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.interceptor;
+
+import javax.sql.DataSource;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.transaction.support.TransactionTemplate;
+
+/**
+ * Unit test to demonstrate the transactional client pattern.
+ */
+public class TransactionalClientDataSourceTest extends SpringTestSupport {
+
+    private JdbcTemplate jdbc;
+
+    protected ClassPathXmlApplicationContext createApplicationContext() {
+        return new ClassPathXmlApplicationContext(
+            "/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml");
+    }
+
+    protected int getExpectedRouteCount() {
+        return 0;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        this.disableJMX();
+        super.setUp();
+
+        // START SNIPPET: e5
+        // create database and insert dummy data
+        final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
+        jdbc = new JdbcTemplate(ds);
+        jdbc.execute("create table books (title varchar(50))");
+        jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
+        // END SNIPPET: e5
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        jdbc.execute("drop table books");
+        this.enableJMX();
+    }
+
+    // START SNIPPET: e3
+    public void testTransactionSuccess() throws Exception {
+        template.sendBody("direct:okay", "Hello World");
+
+        int count = jdbc.queryForInt("select count(*) from books");
+        assertEquals("Number of books", 3, count);
+    }
+    // END SNIPPET: e3
+
+    // START SNIPPET: e4
+    public void testTransactionRollback() throws Exception {
+        template.sendBody("direct:fail", "Hello World");
+
+        int count = jdbc.queryForInt("select count(*) from books");
+        assertEquals("Number of books", 1, count);
+    }
+    // END SNIPPET: e4
+
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                // START SNIPPET: e1
+                // setup the transaction policy
+                TransactionTemplate tt = context.getRegistry()
+                    .lookup("PROPAGATION_REQUIRED", TransactionTemplate.class);
+                SpringTransactionPolicy required = new SpringTransactionPolicy(tt);
+
+                // set the required policy for this route
+                from("direct:okay").policy(required).
+                    setBody(constant("Tiger in Action")).beanRef("bookService").
+                    setBody(constant("Elephant in Action")).beanRef("bookService");
+                // END SNIPPET: e1
+
+                // START SNIPPET: e2
+                // set the required policy for this route
+                from("direct:fail").policy(required).
+                    setBody(constant("Tiger in Action")).beanRef("bookService").
+                    setBody(constant("Donkey in Action")).beanRef("bookService");
+                // END SNIPPET: e2
+            }
+        };
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java Fri Jul  4 01:26:32 2008
@@ -22,7 +22,7 @@
 import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 @ContextConfiguration
 public class SpringTraceTest extends AbstractJUnit38SpringContextTests {

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml Fri Jul  4 01:26:32 2008
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-         http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
-
-    <!-- datasource to the database -->
-    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
-        <property name="url" value="jdbc:hsqldb:mem:camel"/>
-        <property name="username" value="sa"/>
-        <property name="password" value=""/>
-    </bean>
-
-    <!-- spring transaction manager -->
-    <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="dataSource"/>
-    </bean>
-
-    <!-- policy for required transaction used in our Camel routes -->
-    <bean id="PROPAGATION_REQUIRED" class="org.springframework.transaction.support.TransactionTemplate">
-        <property name="transactionManager" ref="txManager"/>
-    </bean>
-
-    <!-- bean for book business logic -->
-    <bean id="bookService" class="org.apache.camel.spring.interceptor.BookService">
-        <property name="dataSource" ref="dataSource"/>
-    </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+         http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+
+    <!-- datasource to the database -->
+    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+        <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+        <property name="url" value="jdbc:hsqldb:mem:camel"/>
+        <property name="username" value="sa"/>
+        <property name="password" value=""/>
+    </bean>
+
+    <!-- spring transaction manager -->
+    <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <!-- policy for required transaction used in our Camel routes -->
+    <bean id="PROPAGATION_REQUIRED" class="org.springframework.transaction.support.TransactionTemplate">
+        <property name="transactionManager" ref="txManager"/>
+    </bean>
+
+    <!-- bean for book business logic -->
+    <bean id="bookService" class="org.apache.camel.spring.interceptor.BookService">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+</beans>

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java (original)
+++ activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java Fri Jul  4 01:26:32 2008
@@ -1,45 +1,45 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.stream;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-
-/**
- * Unit test for System.out
- */
-public class StreamSystemOutTest extends ContextTestSupport {
-
-    // START SNIPPET: e1
-    public void testStringContent() throws Exception {
-        template.sendBody("direct:in", "Hello Text World\n");
-    }
-
-    public void testBinaryContent() {
-        template.sendBody("direct:in", "Hello Bytes World\n".getBytes());
-    }
-
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:in").to("stream:out");
-            }
-        };
-    }
-    // END SNIPPET: e1
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.stream;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test for System.out
+ */
+public class StreamSystemOutTest extends ContextTestSupport {
+
+    // START SNIPPET: e1
+    public void testStringContent() throws Exception {
+        template.sendBody("direct:in", "Hello Text World\n");
+    }
+
+    public void testBinaryContent() {
+        template.sendBody("direct:in", "Hello Bytes World\n".getBytes());
+    }
+
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                from("direct:in").to("stream:out");
+            }
+        };
+    }
+    // END SNIPPET: e1
+
+}

Propchange: activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java?rev=673954&r1=673953&r2=673954&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java (original)
+++ activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java Fri Jul  4 01:26:32 2008
@@ -1,80 +1,80 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.velocity;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.mock.MockEndpoint;
-
-/**
- * Unit test the cache when reloading .vm files in the classpath
- */
-public class VelocityContentCacheTest extends ContextTestSupport {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // create a vm file in the classpath as this is the tricky reloading stuff
-        template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Hello $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm");
-    }
-
-    public void testNotCached() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello London");
-
-        template.sendBodyAndHeader("direct:a", "Body", "name", "London");
-        mock.assertIsSatisfied();
-
-        // now change content in the file in the classpath and try again
-        template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm");
-
-        mock.reset();
-        mock.expectedBodiesReceived("Bye Paris");
-
-        template.sendBodyAndHeader("direct:a", "Body", "name", "Paris");
-        mock.assertIsSatisfied();
-    }
-
-    public void testCached() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello London");
-
-        template.sendBodyAndHeader("direct:b", "Body", "name", "London");
-        mock.assertIsSatisfied();
-
-        // now change content in the file in the classpath and try again
-        template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm");
-
-        mock.reset();
-        // we must expected the original filecontent as the cache is enabled, so its Hello and not Bye
-        mock.expectedBodiesReceived("Hello Paris");
-
-        template.sendBodyAndHeader("direct:b", "Body", "name", "Paris");
-        mock.assertIsSatisfied();
-    }
-
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() throws Exception {
-                from("direct:a").to("velocity://org/apache/camel/component/velocity/hello.vm?contentCache=false").to("mock:result");
-
-                from("direct:b").to("velocity://org/apache/camel/component/velocity/hello.vm?contentCache=true").to("mock:result");
-            }
-        };
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.velocity;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * Unit test the cache when reloading .vm files in the classpath
+ */
+public class VelocityContentCacheTest extends ContextTestSupport {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // create a vm file in the classpath as this is the tricky reloading stuff
+        template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Hello $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm");
+    }
+
+    public void testNotCached() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedBodiesReceived("Hello London");
+
+        template.sendBodyAndHeader("direct:a", "Body", "name", "London");
+        mock.assertIsSatisfied();
+
+        // now change content in the file in the classpath and try again
+        template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm");
+
+        mock.reset();
+        mock.expectedBodiesReceived("Bye Paris");
+
+        template.sendBodyAndHeader("direct:a", "Body", "name", "Paris");
+        mock.assertIsSatisfied();
+    }
+
+    public void testCached() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedBodiesReceived("Hello London");
+
+        template.sendBodyAndHeader("direct:b", "Body", "name", "London");
+        mock.assertIsSatisfied();
+
+        // now change content in the file in the classpath and try again
+        template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm");
+
+        mock.reset();
+        // we must expected the original filecontent as the cache is enabled, so its Hello and not Bye
+        mock.expectedBodiesReceived("Hello Paris");
+
+        template.sendBodyAndHeader("direct:b", "Body", "name", "Paris");
+        mock.assertIsSatisfied();
+    }
+
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                from("direct:a").to("velocity://org/apache/camel/component/velocity/hello.vm?contentCache=false").to("mock:result");
+
+                from("direct:b").to("velocity://org/apache/camel/component/velocity/hello.vm?contentCache=true").to("mock:result");
+            }
+        };
+    }
+}

Propchange: activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message