You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/06/12 18:26:01 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/taglibs/beanshell/src/test/org/apache/commons/jelly/tags/beanshell TestBeanShellEL.java
jstrachan 2002/06/12 09:26:00
Modified: jelly project.xml build.xml
Added: jelly/src/java/org/apache/commons/jelly/tags/bsf
BSFExpressionFactory.java BSFExpression.java
JavaScriptTagLibrary.java BSFTagLibrary.java
JPythonTagLibrary.java PNutsTagLibrary.java
JellyContextRegistry.java package.html
jelly/src/java/org/apache/commons/jelly/tags/beanshell
JellyInterpreter.java BeanShellExpression.java
package.html BeanShellExpressionFactory.java
BeanShellTagLibrary.java
jelly/src/test/org/apache/commons/jelly/beanshell
TestBeanShellEL.java
Removed: jelly/src/taglibs/ojb/target/classes/META-INF LICENSE.txt
jelly/src/taglibs/ojb/target/classes/org/apache/commons/jelly/tags/ojb
OjbTagLibrary.class package.html StoreTag.class
BrokerTag.class
jelly/src/taglibs/bsf/src/java/org/apache/commons/jelly/tags/bsf
ContextRegistry.java BSFTagLibrary.java
BSFExpressionFactory.java JPythonTagLibrary.java
BSFExpression.java JavaScriptTagLibrary.java
PNutsTagLibrary.java
jelly/src/taglibs/beanshell/src/java/org/apache/commons/jelly/tags/beanshell
BeanShellExpression.java BeanShellTagLibrary.java
JellyInterpreter.java
BeanShellExpressionFactory.java
jelly/src/taglibs/ojb/dist/docs/api/org/apache/commons/jelly/tags/ojb
package-summary.html OjbTagLibrary.html
package-frame.html package-tree.html StoreTag.html
BrokerTag.html
jelly/src/taglibs/ojb/dist/docs/api stylesheet.css
help-doc.html deprecated-list.html packages.html
index.html serialized-form.html index-all.html
overview-tree.html package-list
allclasses-frame.html
jelly/src/taglibs/ojb/target/conf MANIFEST.MF
jelly/src/taglibs/ojb/dist LICENSE commons-jelly-ojb.jar
jelly/src/taglibs/beanshell/src/test/org/apache/commons/jelly/tags/beanshell
TestBeanShellEL.java
Log:
Moved the beanshell and BSF tag libraries back into the main source tree,
until Maven can handle sub-projects more gracefully.
So now beanshell and BSF tag libraries are included in Jelly by default. We may make these libraries optional again in the future
Revision Changes Path
1.6 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
1.6 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
1.4 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
1.5 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
1.4 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
1.4 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
1.4 +4 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
1.4 +2 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/package.html
1.5 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
1.5 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
1.4 +2 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/package.html
1.4 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
1.4 +5 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
1.16 +23 -1 jakarta-commons-sandbox/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 12 Jun 2002 13:21:34 -0000 1.15
+++ project.xml 12 Jun 2002 16:25:59 -0000 1.16
@@ -149,8 +149,30 @@
<jar>werkz-1.0-dev.jar</jar>
</dependency>
- <!-- runtime dependencies only required for testing and sample programs -->
+ <!--
+ || Optional tag library dependencies
+ || These will be sub-projects one day, when Maven handles them gracefully
+ -->
+ <!-- beanshell taglib -->
+ <dependency>
+ <name>bsh</name>
+ <type>required</type>
+ <version>1.2-b3</version>
+ <jar>bsh-1.2-b3.jar</jar>
+ </dependency>
+
+ <!-- bsf taglib -->
+ <dependency>
+ <name>bsf</name>
+ <type>required</type>
+ <version>2.2</version>
+ <jar>bsf-2.2.jar</jar>
+ </dependency>
+
+
+ <!-- runtime dependencies for test programs -->
+
<dependency>
<name>hsqldb</name>
<type>required</type>
1.44 +12 -3 jakarta-commons-sandbox/jelly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 12 Jun 2002 14:38:57 -0000 1.43
+++ build.xml 12 Jun 2002 16:26:00 -0000 1.44
@@ -14,6 +14,15 @@
<!-- Set default values for the build -->
<property file="project.properties" />
+ <path id="callback.classpath">
+ <pathelement path="${maven.build.dest}"/>
+ <pathelement path="${maven.src.dir}/java"/>
+ <pathelement path="${basedir}"/>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement location="${lib.repo}/xmlParserAPIs-2.0.0.jar"/>
+ <pathelement location="${lib.repo}/xercesImpl-2.0.0.jar"/>
+ </path>
+
<!-- maven:start -->
<!-- ================================================================== -->
@@ -326,15 +335,15 @@
</target>
- <target name="demo.werkz2" depends="compile">
+ <target name="demo.werkz2">
<property name="maven.core.callback.post-compile.buildFile" value="build.xml"/>
<property name="maven.core.callback.post-compile.buildTarget" value="demo.werkz2.callback"/>
<maven-ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
</target>
- <target name="demo.werkz2.callback" depends="compile">
+ <target name="demo.werkz2.callback">
<java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
+ <classpath refid="callback.classpath"/>
<arg value="src/test/org/apache/commons/jelly/werkz/example.jelly"/>
<arg value="compile"/>
<arg value="test"/>
1.9 +0 -0 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/beanshell/TestBeanShellEL.java
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>