svn commit: r712497 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: component/dataset/DataSet.java component/dataset/DataSetConsumer.java component/timer/TimerConsumer.java model/AggregatorType.java

[davsclaus]

Author: davsclaus
Date: Sun Nov  9 05:27:56 2008
New Revision: 712497

URL: http://svn.apache.org/viewvc?rev=712497&view=rev
Log:
CAMEL-656: Polished dataset and timer component. Added @deprecation to not used 
method. Removed unused imports.

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java?rev=712497&r1=712496&r2=712497&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
 Sun Nov  9 05:27:56 2008
@@ -29,8 +29,6 @@
 
     /**
      * Populates a message exchange when using the DataSet as a source of 
messages
-     *
-     * @param exchange
      */
     void populateMessage(Exchange exchange, long messageIndex) throws 
Exception;
 

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java?rev=712497&r1=712496&r2=712497&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
 Sun Nov  9 05:27:56 2008
@@ -80,7 +80,7 @@
                 }
             }
         } catch (Exception e) {
-            LOG.error(e);
+            handleException(e);
         }
     }
 

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java?rev=712497&r1=712496&r2=712497&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
 Sun Nov  9 05:27:56 2008
@@ -101,7 +101,7 @@
         try {
             getProcessor().process(exchange);
         } catch (Exception e) {
-            getExceptionHandler().handleException(e);
+            handleException(e);
         }
     }
 }

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=712497&r1=712496&r2=712497&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
 Sun Nov  9 05:27:56 2008
@@ -34,9 +34,7 @@
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.builder.xml.DefaultNamespaceContext;
 import org.apache.camel.model.language.ExpressionType;
 import org.apache.camel.processor.Aggregator;
 import org.apache.camel.processor.FilterProcessor;
@@ -368,8 +366,11 @@
 
     public void setOutputs(List<ProcessorType<?>> outputs) {
         this.outputs = outputs;
-    }    
+    }
 
+    /**
+     * @deprecated not used. Will be removed in Camel 2.0.
+     */
     protected FilterProcessor createFilterProcessor(RouteContext routeContext) 
throws Exception {
         Processor childProcessor = routeContext.createProcessor(this);
         return new 
FilterProcessor(getExpression().createPredicate(routeContext), childProcessor);