Added bsf tag lib to multi-module build.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1800930 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jelly-tags/bsf/build.xml b/jelly-tags/bsf/build.xml
deleted file mode 100644
index f702e58..0000000
--- a/jelly-tags/bsf/build.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-SNAPSHOT
- on date May 24 2004, time 2301-->
-<project default="jar" name="commons-jelly-tags-bsf" basedir=".">
- <property name="defaulttargetdir" value="target">
- </property>
- <property name="libdir" value="target/lib">
- </property>
- <property name="classesdir" value="target/classes">
- </property>
- <property name="testclassesdir" value="target/test-classes">
- </property>
- <property name="testreportdir" value="target/test-reports">
- </property>
- <property name="distdir" value="dist">
- </property>
- <property name="javadocdir" value="dist/docs/api">
- </property>
- <property name="final.name" value="commons-jelly-tags-bsf-1.0-SNAPSHOT">
- </property>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
- </condition>
- </target>
- <target name="compile" description="o Compile the code" depends="get-deps">
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/java">
- </pathelement>
- </src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- </classpath>
- </javac>
- <copy todir="${classesdir}">
- <fileset dir="src/java">
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.jelly">
- </include>
- <include name="**/*.xml">
- </include>
- <include name="**/*.xsl">
- </include>
- <include name="**/*.rng">
- </include>
- <include name="**/*.dtd">
- </include>
- <include name="**/*.properties">
- </include>
- <include name="**/*.html">
- </include>
- </fileset>
- </copy>
- </target>
- <target name="jar" description="o Create the jar" depends="compile,test">
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
- <target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}">
- </delete>
- <delete dir="${distdir}">
- </delete>
- </target>
- <target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist">
- </mkdir>
- <copy todir="dist">
- <fileset dir="${defaulttargetdir}" includes="*.jar">
- </fileset>
- <fileset dir="${basedir}" includes="LICENSE*, README*">
- </fileset>
- </copy>
- </target>
- <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
- <fail message="There were test failures.">
- </fail>
- </target>
- <target name="internal-test" depends="compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value=".">
- </sysproperty>
- <formatter type="xml">
- </formatter>
- <formatter usefile="false" type="plain">
- </formatter>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="src/test">
- <include name="**/Test*.java">
- </include>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <target name="compile-tests" depends="compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/test">
- </pathelement>
- </src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- </javac>
- </target>
- <target name="javadoc" description="o Generate javadoc" depends="jar">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
- <format pattern="2002-yyyy" property="year">
- </format>
- </tstamp>
- <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
- </property>
- <property name="title" value="commons-jelly-tags-bsf 1.0-SNAPSHOT API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.jelly.tags.bsf.*">
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="target/${final.name}.jar">
- </pathelement>
- </classpath>
- </javadoc>
- </target>
- <target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar">
- </get>
- <get dest="${libdir}/bsf-2.3.0-rc1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/bsf/jars/bsf-2.3.0-rc1.jar">
- </get>
- <get dest="${libdir}/commons-jexl-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-SNAPSHOT.jar">
- </get>
- <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
- </get>
- <get dest="${libdir}/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.jar">
- </get>
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
- </get>
- <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
- </get>
- <get dest="${libdir}/dom4j-1.5-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5-beta-2.jar">
- </get>
- <get dest="${libdir}/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.1-beta-2.jar">
- </get>
- <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
- </get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
- </get>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
- </get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
- </get>
- </target>
- <target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
- </get>
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
-</project>
\ No newline at end of file
diff --git a/jelly-tags/bsf/maven.xml b/jelly-tags/bsf/maven.xml
deleted file mode 100644
index 8a2b8cc..0000000
--- a/jelly-tags/bsf/maven.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project default="java:jar">
-
-</project>
diff --git a/jelly-tags/bsf/project.xml b/jelly-tags/bsf/pom.xml
similarity index 64%
rename from jelly-tags/bsf/project.xml
rename to jelly-tags/bsf/pom.xml
index f848231..fec7563 100644
--- a/jelly-tags/bsf/project.xml
+++ b/jelly-tags/bsf/pom.xml
@@ -15,44 +15,28 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project>
- <extend>${basedir}/../tag-project.xml</extend>
- <artifactId>commons-jelly-tags-bsf</artifactId>
- <name>commons-jelly-tags-bsf</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.bsf</package>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
- <description>
- This is a Jelly interface for the Bean Scripting Framework
- </description>
- <shortDescription>Commons Jelly BSF Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_BSF-1_0</tag>
- </version>
- </versions>
-
+ <artifactId>commons-jelly-tags-bsf</artifactId>
+ <packaging>jar</packaging>
+ <name>commons-jelly-tags-bsf</name>
+ <description>This is a Jelly interface for the Bean Scripting Framework.</description>
+
<dependencies>
-
-
-
<!-- START for compilation -->
<dependency>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
- <url>http://jakarta.apache.org/bsf</url>
- <properties>
- <gump.project>jakarta-bsf</gump.project>
- </properties>
</dependency>
- <!-- END for compilation -->
-
-
+ <!-- END for compilation -->
</dependencies>
-
</project>
diff --git a/jelly-tags/bsf/project.properties b/jelly-tags/bsf/project.properties
deleted file mode 100644
index 2850c0e..0000000
--- a/jelly-tags/bsf/project.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -------------------------------------------------------------------
-# P R O J E C T P R O P E R T I E S
-# -------------------------------------------------------------------
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/package.html b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/package.html
similarity index 100%
rename from jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/package.html
rename to jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/package.html
diff --git a/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/bsf/example.jelly b/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/example.jelly
similarity index 100%
rename from jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/bsf/example.jelly
rename to jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/example.jelly
diff --git a/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/javascript/example.jelly b/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/example.jelly
similarity index 100%
rename from jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/javascript/example.jelly
rename to jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/example.jelly
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index a9739c0..13f5796 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -20,6 +20,7 @@
<module>bean</module>
<module>beanshell</module>
<module>betwixt</module>
+ <module>bsf</module>
<module>junit</module>
<module>log</module>
<module>util</module>
