Author: ebourg
Date: Fri Mar 22 09:35:54 2013
New Revision: 1459685
URL: http://svn.apache.org/r1459685
Log:
Upgraded the dependency on JEXL (1.1 -> 2.1.1)
Modified:
commons/proper/scxml/trunk/pom.xml
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlContext.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
Modified: commons/proper/scxml/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=1459685&r1=1459684&r2=1459685&view=diff
==============================================================================
--- commons/proper/scxml/trunk/pom.xml (original)
+++ commons/proper/scxml/trunk/pom.xml Fri Mar 22 09:35:54 2013
@@ -155,9 +155,9 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
- <version>1.1</version>
+ <version>2.1.1</version>
<optional>true</optional>
</dependency>
<dependency>
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlContext.java?rev=1459685&r1=1459684&r2=1459685&view=diff
==============================================================================
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlContext.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlContext.java
Fri Mar 22 09:35:54 2013
@@ -27,7 +27,7 @@ import org.apache.commons.scxml.env.Simp
*
*/
public class JexlContext extends SimpleContext
- implements org.apache.commons.jexl.JexlContext {
+ implements org.apache.commons.jexl2.JexlContext {
/** Serial version UID. */
private static final long serialVersionUID = 1L;
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java?rev=1459685&r1=1459684&r2=1459685&view=diff
==============================================================================
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
Fri Mar 22 09:35:54 2013
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.commons.jexl.Expression;
-import org.apache.commons.jexl.ExpressionFactory;
+import org.apache.commons.jexl2.Expression;
+import org.apache.commons.jexl2.JexlEngine;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
import org.apache.commons.scxml.SCXMLExpressionException;
@@ -49,11 +49,6 @@ public class JexlEvaluator implements Ev
/** Pattern for recognizing the Commons SCXML Data() builtin function. */
private static Pattern dataFct = Pattern.compile("Data\\(");
- /** Constructor. */
- public JexlEvaluator() {
- super();
- }
-
/**
* Evaluate an expression.
*
@@ -68,23 +63,20 @@ public class JexlEvaluator implements Ev
if (expr == null) {
return null;
}
- JexlContext jexlCtx = null;
+ JexlContext jexlCtx;
if (ctx instanceof JexlContext) {
jexlCtx = (JexlContext) ctx;
} else {
throw new SCXMLExpressionException(ERR_CTX_TYPE);
}
- Expression exp = null;
+
try {
- String evalExpr = inFct.matcher(expr).
- replaceAll("_builtin.isMember(_ALL_STATES, ");
- evalExpr = dataFct.matcher(evalExpr).
- replaceAll("_builtin.data(_ALL_NAMESPACES, ");
- exp = ExpressionFactory.createExpression(evalExpr);
+ String evalExpr =
inFct.matcher(expr).replaceAll("_builtin.isMember(_ALL_STATES, ");
+ evalExpr =
dataFct.matcher(evalExpr).replaceAll("_builtin.data(_ALL_NAMESPACES, ");
+ Expression exp = new JexlEngine().createExpression(evalExpr);
return exp.evaluate(getEffectiveContext(jexlCtx));
} catch (Exception e) {
- throw new SCXMLExpressionException("eval('" + expr + "'):"
- + e.getMessage(), e);
+ throw new SCXMLExpressionException("eval('" + expr + "'):" +
e.getMessage(), e);
}
}
@@ -96,23 +88,20 @@ public class JexlEvaluator implements Ev
if (expr == null) {
return null;
}
- JexlContext jexlCtx = null;
+ JexlContext jexlCtx;
if (ctx instanceof JexlContext) {
jexlCtx = (JexlContext) ctx;
} else {
throw new SCXMLExpressionException(ERR_CTX_TYPE);
}
- Expression exp = null;
+
try {
- String evalExpr = inFct.matcher(expr).
- replaceAll("_builtin.isMember(_ALL_STATES, ");
- evalExpr = dataFct.matcher(evalExpr).
- replaceAll("_builtin.data(_ALL_NAMESPACES, ");
- exp = ExpressionFactory.createExpression(evalExpr);
+ String evalExpr =
inFct.matcher(expr).replaceAll("_builtin.isMember(_ALL_STATES, ");
+ evalExpr =
dataFct.matcher(evalExpr).replaceAll("_builtin.data(_ALL_NAMESPACES, ");
+ Expression exp = new JexlEngine().createExpression(evalExpr);
return (Boolean) exp.evaluate(getEffectiveContext(jexlCtx));
} catch (Exception e) {
- throw new SCXMLExpressionException("eval('" + expr + "'):"
- + e.getMessage(), e);
+ throw new SCXMLExpressionException("eval('" + expr + "'):" +
e.getMessage(), e);
}
}
@@ -124,25 +113,21 @@ public class JexlEvaluator implements Ev
if (expr == null) {
return null;
}
- JexlContext jexlCtx = null;
+ JexlContext jexlCtx;
if (ctx instanceof JexlContext) {
jexlCtx = (JexlContext) ctx;
} else {
throw new SCXMLExpressionException(ERR_CTX_TYPE);
}
- Expression exp = null;
+
try {
- String evalExpr = inFct.matcher(expr).
- replaceAll("_builtin.isMember(_ALL_STATES, ");
- evalExpr = dataFct.matcher(evalExpr).
- replaceFirst("_builtin.dataNode(_ALL_NAMESPACES, ");
- evalExpr = dataFct.matcher(evalExpr).
- replaceAll("_builtin.data(_ALL_NAMESPACES, ");
- exp = ExpressionFactory.createExpression(evalExpr);
+ String evalExpr =
inFct.matcher(expr).replaceAll("_builtin.isMember(_ALL_STATES, ");
+ evalExpr =
dataFct.matcher(evalExpr).replaceFirst("_builtin.dataNode(_ALL_NAMESPACES, ");
+ evalExpr =
dataFct.matcher(evalExpr).replaceAll("_builtin.data(_ALL_NAMESPACES, ");
+ Expression exp = new JexlEngine().createExpression(evalExpr);
return (Node) exp.evaluate(getEffectiveContext(jexlCtx));
} catch (Exception e) {
- throw new SCXMLExpressionException("eval('" + expr + "'):"
- + e.getMessage(), e);
+ throw new SCXMLExpressionException("eval('" + expr + "'):" +
e.getMessage(), e);
}
}
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCInstanceTest.java?rev=1459685&r1=1459684&r2=1459685&view=diff
==============================================================================
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
Fri Mar 22 09:35:54 2013
@@ -21,7 +21,7 @@ import java.util.Set;
import junit.framework.TestCase;
-import org.apache.commons.jexl.JexlContext;
+import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.scxml.env.SimpleContext;
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
import org.apache.commons.scxml.model.History;
