[jbpm-commits] JBoss JBPM SVN: r6597 - jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity.

[do-not-reply at jboss.org]

Author: rebody
Date: 2010-08-16 04:03:48 -0400 (Mon, 16 Aug 2010)
New Revision: 6597

Modified:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
Log:
JBPM-2686 let expr in ScriptActivity use UEL as default language.

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java	2010-08-16 00:05:49 UTC (rev 6596)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java	2010-08-16 08:03:48 UTC (rev 6597)
@@ -22,8 +22,8 @@
 package org.jbpm.jpdl.internal.activity;
 
 import org.jbpm.api.model.OpenExecution;
+import org.jbpm.pvm.internal.el.Expression;
 import org.jbpm.pvm.internal.env.EnvironmentImpl;
-import org.jbpm.pvm.internal.el.Expression;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java	2010-08-16 00:05:49 UTC (rev 6596)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java	2010-08-16 08:03:48 UTC (rev 6597)
@@ -22,8 +22,8 @@
 package org.jbpm.jpdl.internal.activity;
 
 import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.pvm.internal.el.Expression;
 import org.jbpm.pvm.internal.env.EnvironmentImpl;
-import org.jbpm.pvm.internal.script.ScriptManager;
 import org.jbpm.pvm.internal.util.XmlUtil;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.w3c.dom.Element;
@@ -45,10 +45,9 @@
 
     String script = XmlUtil.attribute(element, "expr");
     Element textElement = XmlUtil.element(element, "text");
-    if(script!=null) {
-      ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
-      language = scriptManager.getDefaultExpressionLanguage();
-      if (textElement!=null) {
+    if (script != null) {
+      language = Expression.LANGUAGE_UEL_VALUE;
+      if (textElement != null) {
         parse.addProblem("in <script ...> attribute expr can't be combined with a nested text element", element);
       }
     } else if(textElement != null) {
@@ -59,7 +58,7 @@
     }
 
     String variableName = XmlUtil.attribute(element, "var");
-    
+
     ScriptActivity scriptActivity = new ScriptActivity();
     scriptActivity.setScript(script);
     scriptActivity.setLanguage(language);