svn commit: r687103 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/language/ components/camel-ognl/src/main/java/org/apache/camel/language/ognl/

[davsclaus]

Author: davsclaus
Date: Tue Aug 19 10:35:09 2008
New Revision: 687103

URL: http://svn.apache.org/viewvc?rev=687103&view=rev
Log:
Needed the caused exception for OGNL expression failure to get the real cause. 
Also the in and out has been @deprecated in OGNL language as you can not use 
the shorthand dot notation for in as in is a reserved word. So we deprecated 
both in and out and you have to use request and response instead.

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/IllegalSyntaxException.java
    
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
    
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/IllegalSyntaxException.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/IllegalSyntaxException.java?rev=687103&r1=687102&r2=687103&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/IllegalSyntaxException.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/IllegalSyntaxException.java
 Tue Aug 19 10:35:09 2008
@@ -29,7 +29,11 @@
     private final String expression;
 
     public IllegalSyntaxException(Language language, String expression) {
-        super("Illegal syntax for language: " + language + ". Expression: " + 
expression);
+        this(language, expression, null);
+    }
+
+    public IllegalSyntaxException(Language language, String expression, 
Throwable cause) {
+        super("Illegal syntax for language: " + language + ". Expression: " + 
expression, cause);
         this.language = language;
         this.expression = expression;
     }

Modified: 
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java?rev=687103&r1=687102&r2=687103&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
 (original)
+++ 
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
 Tue Aug 19 10:35:09 2008
@@ -42,7 +42,7 @@
         try {
             this.expression = Ognl.parseExpression(expressionString);
         } catch (OgnlException e) {
-            throw new IllegalSyntaxException(language, expressionString);
+            throw new IllegalSyntaxException(language, expressionString, e);
         }
     }
 

Modified: 
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java?rev=687103&r1=687102&r2=687103&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
 (original)
+++ 
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
 Tue Aug 19 10:35:09 2008
@@ -55,10 +55,17 @@
     public Message getRequest() {
         return exchange.getIn();
     }
+    
+    /**
+     * @deprecated doesnt work in OGNL use request instead
+     */
     public Message getIn() {
         return exchange.getIn();
     }
 
+    /**
+     * @deprecated doesnt work in OGNL use response instead
+     */
     public Message getOut() {
         return exchange.getOut();
     }