svn commit: r1431784 - /camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java

[ningjiang]

Author: ningjiang
Date: Fri Jan 11 01:36:11 2013
New Revision: 1431784

URL: http://svn.apache.org/viewvc?rev=1431784&view=rev
Log:
CAMEL-5954 Unified the variables which are exports to script

Modified:
    
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java

Modified: 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=1431784&r1=1431783&r2=1431784&view=diff
==============================================================================
--- 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
 (original)
+++ 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
 Fri Jan 11 01:36:11 2013
@@ -31,6 +31,7 @@ import javax.script.ScriptException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
+import org.apache.camel.Message;
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.converter.ObjectConverter;
@@ -369,10 +370,16 @@ public class ScriptBuilder implements Ex
         ScriptContext context = engine.getContext();
         int scope = ScriptContext.ENGINE_SCOPE;
         context.setAttribute("context", exchange.getContext(), scope);
+        context.setAttribute("camelContext", exchange.getContext(), scope);
         context.setAttribute("exchange", exchange, scope);
-        context.setAttribute("request", exchange.getIn(), scope);
+        Message in = exchange.getIn();
+        context.setAttribute("in", in, scope);
+        context.setAttribute("request", in, scope);
+        context.setAttribute("headers", in.getHeaders(), scope);
         if (exchange.hasOut()) {
-            context.setAttribute("response", exchange.getOut(), scope);
+            Message out = exchange.getOut();
+            context.setAttribute("out", out , scope);
+            context.setAttribute("response", out, scope);
         }
         // to make using properties component easier
         context.setAttribute("properties", new 
ScriptPropertiesFunction(exchange.getContext()), scope);