From do-not-reply at jboss.org Mon Aug 16 04:03:50 2010
Content-Type: multipart/mixed; boundary="===============6952604907007192754=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: jbpm-commits at lists.jboss.org
Subject: [jbpm-commits] JBoss JBPM SVN: r6597 -
 jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity.
Date: Mon, 16 Aug 2010 04:03:49 -0400
Message-ID: <201008160803.o7G83ngj008819@svn01.web.mwc.hst.phx2.redhat.com>

--===============6952604907007192754==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/S=
criptActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/S=
criptBinding.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/act=
ivity/ScriptActivity.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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/act=
ivity/ScriptBinding.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D XmlUtil.attribute(element, "expr");
     Element textElement =3D XmlUtil.element(element, "text");
-    if(script!=3Dnull) {
-      ScriptManager scriptManager =3D EnvironmentImpl.getFromCurrent(Scrip=
tManager.class);
-      language =3D scriptManager.getDefaultExpressionLanguage();
-      if (textElement!=3Dnull) {
+    if (script !=3D null) {
+      language =3D Expression.LANGUAGE_UEL_VALUE;
+      if (textElement !=3D null) {
         parse.addProblem("in <script ...> attribute expr can't be combined=
 with a nested text element", element);
       }
     } else if(textElement !=3D null) {
@@ -59,7 +58,7 @@
     }
 =

     String variableName =3D XmlUtil.attribute(element, "var");
-    =

+
     ScriptActivity scriptActivity =3D new ScriptActivity();
     scriptActivity.setScript(script);
     scriptActivity.setLanguage(language);


--===============6952604907007192754==--