svn commit: r745536 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: processor/Delayer.java processor/idempotent/IdempotentConsumer.java util/ExpressionHelper.java util/ResolverUtil.java

[davsclaus]

Author: davsclaus
Date: Wed Feb 18 15:13:42 2009
New Revision: 745536

URL: http://svn.apache.org/viewvc?rev=745536&view=rev
Log:
Removed class that isnt needed since exchanges can evalutate by type now

Removed:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java?rev=745536&r1=745535&r2=745536&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java 
Wed Feb 18 15:13:42 2009
@@ -19,7 +19,6 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
-import org.apache.camel.util.ExpressionHelper;
 
 /**
  * A <a href="http://camel.apache.org/delayer.html";>Delayer</a> which
@@ -70,7 +69,7 @@
     protected void delay(Exchange exchange) throws Exception {
         long time = 0;
         if (timeExpression != null) {
-            Long longValue = ExpressionHelper.evaluateAsType(timeExpression, 
exchange, Long.class);
+            Long longValue = timeExpression.evaluate(exchange, Long.class);
             if (longValue != null) {
                 time = longValue.longValue();
             }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java?rev=745536&r1=745535&r2=745536&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
 Wed Feb 18 15:13:42 2009
@@ -21,7 +21,6 @@
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ServiceSupport;
 import org.apache.camel.spi.IdempotentRepository;
-import org.apache.camel.util.ExpressionHelper;
 import org.apache.camel.util.ServiceHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -53,7 +52,7 @@
     }
 
     public void process(Exchange exchange) throws Exception {
-        String messageId = 
ExpressionHelper.evaluateAsString(messageIdExpression, exchange);
+        String messageId = messageIdExpression.evaluate(exchange, 
String.class);
         if (messageId == null) {
             throw new NoMessageIdException(exchange, messageIdExpression);
         }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java?rev=745536&r1=745535&r2=745536&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java 
Wed Feb 18 15:13:42 2009
@@ -36,37 +36,28 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p>
  * ResolverUtil is used to locate classes that are available in the/a class 
path
  * and meet arbitrary conditions. The two most common conditions are that a
  * class implements/extends another class, or that is it annotated with a
  * specific annotation. However, through the use of the {...@link Test} class 
it is
  * possible to search using arbitrary conditions.
- * </p>
  * <p/>
- * <p>
  * A ClassLoader is used to locate all locations (directories and jar files) in
  * the class path that contain classes within certain packages, and then to 
load
  * those classes and check them. By default the ClassLoader returned by
  * {...@code Thread.currentThread().getContextClassLoader()} is used, but this 
can
  * be overridden by calling {...@link #setClassLoaders(Set)} prior to
  * invoking any of the {...@code find()} methods.
- * </p>
  * <p/>
- * <p>
  * General searches are initiated by calling the
- * {...@link #find(ResolverUtil.Test, String)} ()} method and supplying a 
package
+ * {...@link #find(org.apache.camel.util.ResolverUtil.Test, String)}} method 
and supplying a package
  * name and a Test instance. This will cause the named package <b>and all
  * sub-packages</b> to be scanned for classes that meet the test. There are
  * also utility methods for the common use cases of scanning multiple packages
  * for extensions of particular classes, or classes annotated with a specific
  * annotation.
- * </p>
  * <p/>
- * <p>
  * The standard usage pattern for the ResolverUtil class is as follows:
- * </p>
- * <p/>
  * <pre>
  * resolverUtil&lt;ActionBean&gt; resolver = new 
ResolverUtil&lt;ActionBean&gt;();
  * resolver.findImplementation(ActionBean.class, pkg1, pkg2);