[jbpm-commits] JBoss JBPM SVN: r1715 - in jbpm4/pvm/trunk: modules/core and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-07-24 10:46:43 -0400 (Thu, 24 Jul 2008) New Revision: 1715 Modified: jbpm4/pvm/trunk/.classpath jbpm4/pvm/trunk/modules/core/pom.xml jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java jbpm4/pvm/trunk/pom.xml Log: added juel and javax-el-api dependencies Modified: jbpm4/pvm/trunk/.classpath =================================================================== --- jbpm4/pvm/trunk/.classpath 2008-07-24 14:29:59 UTC (rev 1714) +++ jbpm4/pvm/trunk/.classpath 2008-07-24 14:46:43 UTC (rev 1715) @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/java"/> - <classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/resources"/> - <classpathentry kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/java"/> - <classpathentry kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/java"/> + <classpathentry kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/java"/> + <classpathentry excluding="**" kind="src" output="modules/core/target/classes" path="modules/core/src/main/resources"/> + <classpathentry excluding="**" kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: jbpm4/pvm/trunk/modules/core/pom.xml =================================================================== --- jbpm4/pvm/trunk/modules/core/pom.xml 2008-07-24 14:29:59 UTC (rev 1714) +++ jbpm4/pvm/trunk/modules/core/pom.xml 2008-07-24 14:46:43 UTC (rev 1715) @@ -94,6 +94,27 @@ <groupId>cactus</groupId> <artifactId>cactus</artifactId> </dependency> + + <dependency> + <groupId>juel</groupId> + <artifactId>juel</artifactId> + </dependency> + + <dependency> + <groupId>juel</groupId> + <artifactId>juel-engine</artifactId> + </dependency> + + <dependency> + <groupId>juel</groupId> + <artifactId>juel-impl</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + </dependencies> <!-- Plugins --> Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java 2008-07-24 14:29:59 UTC (rev 1714) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java 2008-07-24 14:46:43 UTC (rev 1715) @@ -21,6 +21,8 @@ */ package org.jbpm.pvm.expr; +import javax.el.ExpressionFactory; + import org.jbpm.pvm.samples.activities.WaitState; import org.jbpm.pvm.test.base.JbpmTestCase; import org.jbpm.pvm.client.ClientProcessInstance; @@ -47,7 +49,7 @@ " read-contexts='execution, environment, environment-factory' " + " write-context='execution'>" + " <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" + - " <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" + +// " <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" + " </script-manager>" + " </environment-factory>" + "</contexts>" @@ -59,11 +61,10 @@ .node("unused").initial().behaviour(WaitState.class) .done().beginProcessInstance(); execution.setVariable("pv", "hello"); - Environment environment = environmentFactory.openEnvironment(); try { assertEquals("hello", scriptManager.evaluateExpression("#{pv}", execution, null)); - assertEquals("hello", scriptManager.evaluateExpression("pv", execution, "groovy")); + // assertEquals("hello", scriptManager.evaluateExpression("pv", execution, "groovy")); } finally { environment.close(); } Modified: jbpm4/pvm/trunk/pom.xml =================================================================== --- jbpm4/pvm/trunk/pom.xml 2008-07-24 14:29:59 UTC (rev 1714) +++ jbpm4/pvm/trunk/pom.xml 2008-07-24 14:46:43 UTC (rev 1715) @@ -48,6 +48,8 @@ <jsr233.version>2.0.3</jsr233.version> <jboss.seam.version>2.0.1.GA</jboss.seam.version> <cactus.version>13-1.7.1</cactus.version> + <juel.version>2.1.0</juel.version> + <javax.el.api.version>1.0</javax.el.api.version> </properties> <!-- DependencyManagement --> @@ -126,6 +128,31 @@ <artifactId>cactus</artifactId> <version>${cactus.version}</version> </dependency> + + <dependency> + <groupId>juel</groupId> + <artifactId>juel</artifactId> + <version>${juel.version}</version> + </dependency> + + <dependency> + <groupId>juel</groupId> + <artifactId>juel-engine</artifactId> + <version>${juel.version}</version> + </dependency> + + <dependency> + <groupId>juel</groupId> + <artifactId>juel-impl</artifactId> + <version>${juel.version}</version> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>${javax.el.api.version}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -142,9 +169,13 @@ <!-- DistributionManagement --> <distributionManagement> <site> - <id>jbws.dyndns.org</id> - <url>file:///home/tdiesler/workspace/jbpm-site</url> + <id>local.site</id> + <url>file:///${publications}/pvm/site</url> </site> + <repository> + <id>repository.jboss.org</id> + <url>file:///${publications}/repository.jboss.org</url> + </repository> </distributionManagement> <!-- Profiles -->