Added ant tag lib to multi-module build.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1800922 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jelly-tags/ant/build.xml b/jelly-tags/ant/build.xml
deleted file mode 100644
index 847a42d..0000000
--- a/jelly-tags/ant/build.xml
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
- on date May 12 2005, time 1012-->
-
-<project default="jar" name="commons-jelly-tags-ant" basedir=".">
- <!--Load local and user build preferences-->
-
- <property file="build.properties">
- </property>
- <property file="${user.home}/build.properties">
- </property>
- <!--Build properties-->
-
- <property name="defaulttargetdir" value="${basedir}/target">
- </property>
- <property name="libdir" value="${user.home}/.maven/repository">
- </property>
- <property name="classesdir" value="${basedir}/target/classes">
- </property>
- <property name="testclassesdir" value="${basedir}/target/test-classes">
- </property>
- <property name="testreportdir" value="${basedir}/target/test-reports">
- </property>
- <property name="distdir" value="${basedir}/dist">
- </property>
- <property name="javadocdir" value="${basedir}/dist/docs/api">
- </property>
- <property name="final.name" value="commons-jelly-tags-ant-1.1-SNAPSHOT">
- </property>
- <property name="proxy.host" value="">
- </property>
- <property name="proxy.port" value="">
- </property>
- <property name="proxy.username" value="">
- </property>
- <property name="proxy.password" value="">
- </property>
- <path id="build.classpath">
- <pathelement location="${libdir}/ant/jars/ant-1.6.2.jar">
- </pathelement>
- <pathelement location="${libdir}/ant/jars/ant-launcher-1.6.2.jar">
- </pathelement>
- <pathelement location="${libdir}/ant/jars/ant-junit-1.6.2.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-tags-util-1.1.1.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-cli/jars/commons-cli-1.0.jar">
- </pathelement>
- <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-collections/jars/commons-collections-2.1.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-SNAPSHOT.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
- </pathelement>
- <pathelement location="${libdir}/dom4j/jars/dom4j-1.5.jar">
- </pathelement>
- <pathelement location="${libdir}/jaxen/jars/jaxen-1.1-beta-2.jar">
- </pathelement>
- <pathelement location="${libdir}/xerces/jars/xerces-2.2.1.jar">
- </pathelement>
- </path>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
- </condition>
- <!--Test if JUNIT is present in ANT classpath-->
-
- <available property="Junit.present" classname="junit.framework.Test">
- </available>
- <!--Test if user defined a proxy-->
-
- <condition property="useProxy">
- <and>
- <isset property="proxy.host">
- </isset>
- <not>
- <equals trim="true" arg2="" arg1="${proxy.host}">
- </equals>
- </not>
- </and>
- </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="${basedir}/src/java">
- </pathelement>
- </src>
- <classpath refid="build.classpath">
- </classpath>
- </javac>
- <copy todir="${classesdir}">
- <fileset dir="${basedir}/src/java">
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
- <copy todir="${classesdir}/META-INF" file="${basedir}/../../LICENSE.txt">
- </copy>
- </target>
- <target name="jar" description="o Create the jar" depends="compile,test">
- <jar jarfile="${defaulttargetdir}/${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" if="Junit.present" depends="junit-present,compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
- <junit dir="${basedir}" 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>
- <path refid="build.classpath">
- </path>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="${basedir}/src/test">
- <include name="**/Test*.java">
- </include>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <target name="junit-present" unless="Junit.present" depends="init">
- <echo>================================= WARNING ================================</echo>
- <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
- <echo>==========================================================================</echo>
- </target>
- <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="${basedir}/src/test">
- </pathelement>
- </src>
- <classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- </javac>
- <copy todir="${testclassesdir}">
- <fileset dir="${basedir}/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="javadoc" description="o Generate javadoc" depends="get-deps">
- <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-ant 1.1-SNAPSHOT API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.jelly.tags.ant.*">
- <classpath>
- <path refid="build.classpath">
- </path>
- </classpath>
- </javadoc>
- </target>
- <target name="get-dep-ant.jar" description="o Download the dependency : ant.jar" unless="ant.jar" depends="init,setProxy,noProxy,get-custom-dep-ant.jar">
- <mkdir dir="${libdir}/ant/jars/">
- </mkdir>
- <get dest="${libdir}/ant/jars/ant-1.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.6.2.jar">
- </get>
- </target>
- <target name="get-custom-dep-ant.jar" if="ant.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/ant/jars/">
- </mkdir>
- <get dest="${libdir}/ant/jars/ant-1.6.2.jar" usetimestamp="true" ignoreerrors="true" src="${ant.jar}">
- </get>
- </target>
- <target name="get-dep-ant-launcher.jar" description="o Download the dependency : ant-launcher.jar" unless="ant-launcher.jar" depends="init,setProxy,noProxy,get-custom-dep-ant-launcher.jar">
- <mkdir dir="${libdir}/ant/jars/">
- </mkdir>
- <get dest="${libdir}/ant/jars/ant-launcher-1.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-launcher-1.6.2.jar">
- </get>
- </target>
- <target name="get-custom-dep-ant-launcher.jar" if="ant-launcher.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/ant/jars/">
- </mkdir>
- <get dest="${libdir}/ant/jars/ant-launcher-1.6.2.jar" usetimestamp="true" ignoreerrors="true" src="${ant-launcher.jar}">
- </get>
- </target>
- <target name="get-dep-ant-junit.jar" description="o Download the dependency : ant-junit.jar" unless="ant-junit.jar" depends="init,setProxy,noProxy,get-custom-dep-ant-junit.jar">
- <mkdir dir="${libdir}/ant/jars/">
- </mkdir>
- <get dest="${libdir}/ant/jars/ant-junit-1.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-junit-1.6.2.jar">
- </get>
- </target>
- <target name="get-custom-dep-ant-junit.jar" if="ant-junit.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/ant/jars/">
- </mkdir>
- <get dest="${libdir}/ant/jars/ant-junit-1.6.2.jar" usetimestamp="true" ignoreerrors="true" src="${ant-junit.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jelly-tags-junit.jar" description="o Download the dependency : commons-jelly-tags-junit.jar" unless="commons-jelly-tags-junit.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly-tags-junit.jar">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jelly-tags-junit.jar" if="commons-jelly-tags-junit.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly-tags-junit.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jelly-tags-util.jar" description="o Download the dependency : commons-jelly-tags-util.jar" unless="commons-jelly-tags-util.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly-tags-util.jar">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-util-1.1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-util-1.1.1.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jelly-tags-util.jar" if="commons-jelly-tags-util.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-util-1.1.1.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly-tags-util.jar}">
- </get>
- </target>
- <target name="get-dep-commons-cli.jar" description="o Download the dependency : commons-cli.jar" unless="commons-cli.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-cli.jar">
- <mkdir dir="${libdir}/commons-cli/jars/">
- </mkdir>
- <get dest="${libdir}/commons-cli/jars/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-cli/jars/commons-cli-1.0.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-cli.jar" if="commons-cli.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-cli/jars/">
- </mkdir>
- <get dest="${libdir}/commons-cli/jars/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-cli.jar}">
- </get>
- </target>
- <target name="get-dep-xml-apis.jar" description="o Download the dependency : xml-apis.jar" unless="xml-apis.jar" depends="init,setProxy,noProxy,get-custom-dep-xml-apis.jar">
- <mkdir dir="${libdir}/xml-apis/jars/">
- </mkdir>
- <get dest="${libdir}/xml-apis/jars/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>
- </target>
- <target name="get-custom-dep-xml-apis.jar" if="xml-apis.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xml-apis/jars/">
- </mkdir>
- <get dest="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="${xml-apis.jar}">
- </get>
- </target>
- <target name="get-dep-commons-beanutils.jar" description="o Download the dependency : commons-beanutils.jar" unless="commons-beanutils.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-beanutils.jar">
- <mkdir dir="${libdir}/commons-beanutils/jars/">
- </mkdir>
- <get dest="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-beanutils.jar" if="commons-beanutils.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-beanutils/jars/">
- </mkdir>
- <get dest="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="${commons-beanutils.jar}">
- </get>
- </target>
- <target name="get-dep-commons-collections.jar" description="o Download the dependency : commons-collections.jar" unless="commons-collections.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-collections.jar">
- <mkdir dir="${libdir}/commons-collections/jars/">
- </mkdir>
- <get dest="${libdir}/commons-collections/jars/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-collections.jar" if="commons-collections.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-collections/jars/">
- </mkdir>
- <get dest="${libdir}/commons-collections/jars/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="${commons-collections.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jexl.jar" description="o Download the dependency : commons-jexl.jar" unless="commons-jexl.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jexl.jar">
- <mkdir dir="${libdir}/commons-jexl/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jexl.jar" if="commons-jexl.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jexl/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jexl.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jelly.jar" description="o Download the dependency : commons-jelly.jar" unless="commons-jelly.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly.jar">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jelly.jar" if="commons-jelly.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly.jar}">
- </get>
- </target>
- <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
- <mkdir dir="${libdir}/commons-logging/jars/">
- </mkdir>
- <get dest="${libdir}/commons-logging/jars/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>
- </target>
- <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-logging/jars/">
- </mkdir>
- <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}">
- </get>
- </target>
- <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
- <mkdir dir="${libdir}/dom4j/jars/">
- </mkdir>
- <get dest="${libdir}/dom4j/jars/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5.jar">
- </get>
- </target>
- <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/dom4j/jars/">
- </mkdir>
- <get dest="${libdir}/dom4j/jars/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}">
- </get>
- </target>
- <target name="get-dep-jaxen.jar" description="o Download the dependency : jaxen.jar" unless="jaxen.jar" depends="init,setProxy,noProxy,get-custom-dep-jaxen.jar">
- <mkdir dir="${libdir}/jaxen/jars/">
- </mkdir>
- <get dest="${libdir}/jaxen/jars/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>
- </target>
- <target name="get-custom-dep-jaxen.jar" if="jaxen.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/jaxen/jars/">
- </mkdir>
- <get dest="${libdir}/jaxen/jars/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="${jaxen.jar}">
- </get>
- </target>
- <target name="get-dep-xerces.jar" description="o Download the dependency : xerces.jar" unless="xerces.jar" depends="init,setProxy,noProxy,get-custom-dep-xerces.jar">
- <mkdir dir="${libdir}/xerces/jars/">
- </mkdir>
- <get dest="${libdir}/xerces/jars/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
- </get>
- </target>
- <target name="get-custom-dep-xerces.jar" if="xerces.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xerces/jars/">
- </mkdir>
- <get dest="${libdir}/xerces/jars/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="${xerces.jar}">
- </get>
- </target>
- <target name="get-deps" unless="noget" depends="get-dep-ant.jar,get-dep-ant-launcher.jar,get-dep-ant-junit.jar,get-dep-commons-jelly-tags-junit.jar,get-dep-commons-jelly-tags-util.jar,get-dep-commons-cli.jar,get-dep-xml-apis.jar,get-dep-commons-beanutils.jar,get-dep-commons-collections.jar,get-dep-commons-jexl.jar,get-dep-commons-jelly.jar,get-dep-commons-logging.jar,get-dep-dom4j.jar,get-dep-jaxen.jar,get-dep-xerces.jar">
- </target>
- <target name="setProxy" if="useProxy" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
-
- <echo>Proxy used :</echo>
- <echo>Proxy host [${proxy.host}]</echo>
- <echo>Proxy port [${proxy.port}]</echo>
- <echo>Proxy user [${proxy.username}]</echo>
- <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
- </setproxy>
- </target>
- <target name="noProxy" unless="useProxy" depends="init">
- <echo>Proxy not used.</echo>
- </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>
diff --git a/jelly-tags/ant/maven.xml b/jelly-tags/ant/maven.xml
deleted file mode 100644
index 5788e37..0000000
--- a/jelly-tags/ant/maven.xml
+++ /dev/null
@@ -1,48 +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">
-
- <!-- define the classpath used to run examples -->
- <goal name="create-classpath" prereqs="java:compile,test:compile">
- <path id="test.classpath">
- <pathelement path="${maven.build.dest}"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/test-classes"/>
- <path refid="maven.dependency.classpath"/>
- </path>
- </goal>
-
- <!-- demos -->
- <goal name="demo:fileset" prereqs="create-classpath"
- description="A demo of the fileScanner tag to walk Ant fileSets">
-
- <java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/ant/filescanner.jelly"/>
- </java>
- </goal>
-
-
- <goal name="demo:antjar" prereqs="create-classpath"
- description="Runs a sample which creates a jar using the Ant tag library">
- <java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/ant/example_jar.jelly"/>
- </java>
- </goal>
-
-</project>
diff --git a/jelly-tags/ant/project.xml b/jelly-tags/ant/pom.xml
similarity index 62%
rename from jelly-tags/ant/project.xml
rename to jelly-tags/ant/pom.xml
index 438b3cc..1698c4a 100644
--- a/jelly-tags/ant/project.xml
+++ b/jelly-tags/ant/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,35 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<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>
-<project>
- <!--
- BRITTLE! must include ${basedir} location or Maven will
- not run this script outside of the base directory
- -->
-
- <extend>${basedir}/../tag-project.xml</extend>
<artifactId>commons-jelly-tags-ant</artifactId>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-ant</name>
- <currentVersion>1.1.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.ant</package>
<description>This is a Jelly interface for Ant.</description>
- <shortDescription>Commons Jelly Ant Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_ANT-1_0</tag>
- </version>
- <version>
- <id>1.1</id>
- <name>1.1</name>
- <tag>commons-jelly-tags-ant-1.1</tag>
- </version>
- </versions>
+
<dependencies>
<!-- START for compilation -->
-
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
@@ -60,35 +46,24 @@
<artifactId>ant-junit</artifactId>
<version>1.6.5</version>
</dependency>
+
<!-- END for compilation -->
+
<!-- START for testing -->
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <url>http://commons.apache.org/jelly/libs/junit/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-util</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
+
<!-- END for testing -->
- <!-- START for running demos -->
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- </dependency>
- <!-- END for running demos -->
-
</dependencies>
</project>
diff --git a/jelly-tags/ant/project.properties b/jelly-tags/ant/project.properties
deleted file mode 100644
index 2850c0e..0000000
--- a/jelly-tags/ant/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/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/TaskSource.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/TaskSource.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/package.html b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/package.html
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/package.html
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/package.html
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/package.html b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/package.html
similarity index 100%
rename from jelly-tags/ant/src/java/org/apache/commons/jelly/task/package.html
rename to jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/package.html
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/TestJelly.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/TestJelly.java
rename to jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java
rename to jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/MyTagLibrary.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/MyTagLibrary.java
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/MyTagLibrary.java
rename to jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/MyTagLibrary.java
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/TestJelly.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/TestJelly.java
rename to jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/DummyTask.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/DummyTask.java
rename to jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml
similarity index 95%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml
index e5cebc9..ad62713 100644
--- a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml
+++ b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml
@@ -5,16 +5,16 @@
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="echoFoo" name="ant-test" basedir=".">
+<project default="echoFoo" name="ant-test" basedir="">
<property name="foo5.1" value="${foo5}"/>
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_jar.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_jar.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_tasks.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_tasks.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/filescanner.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/filescanner.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/filescanner.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/filescanner.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/jellyunit.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/jellyunit.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/sample.txt b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/sample.txt
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/sample.txt
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/sample.txt
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/show_properties.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/show_properties.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/show_properties.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/show_properties.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly
similarity index 81%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly
index 8bb571b..b7b5031 100644
--- a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly
+++ b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly
@@ -6,19 +6,19 @@
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.
-->
-<test:suite
- xmlns:j="jelly:core"
- xmlns:test="jelly:junit"
- xmlns:util="jelly:util"
+<test:suite
+ xmlns:j="jelly:core"
+ xmlns:test="jelly:junit"
+ xmlns:util="jelly:util"
xmlns="jelly:ant">
<j:set var="dir" value="target/test-classes/org/apache/commons/jelly/ant"/>
@@ -35,7 +35,7 @@
</test:case>
<test:case name="readWrite">
-
+
<j:set var="foo1" value="bar1"/>
<property name="foo1.1" value="${foo1}"/>
@@ -49,7 +49,7 @@
<test:case name="writeIn">
- <ant
+ <ant
dir="${dir}"
target="writeFoo3Bar3"
/>
@@ -67,7 +67,7 @@
<j:set var="foo4" value="bar4"/>
- <ant
+ <ant
dir="${dir}"
target="readWriteFoo4.1Foo4"
/>
@@ -101,42 +101,42 @@
<test:case name="copy">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
-
+ <mkdir dir="target/tmp/ant-tests"/>
+
<copy
overwrite="true"
- file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
- tofile="${basedir}/target/tmp/ant-tests/output.txt">
+ file="target/test-classes/org/apache/commons/jelly/ant/sample.txt"
+ tofile="target/tmp/ant-tests/output.txt">
<filterset>
<filter token="foo" value="bar"/>
</filterset>
</copy>
-
+
<util:loadText var="text" file="${basedir}/target/tmp/ant-tests/output.txt"/>
<delete file="${basedir}/target/tmp/ant-tests/output.txt"/>
-
+
<test:assertEquals expected="hello bar how are you?" actual="${text.trim()}"/>
</test:case>
<test:case name="copyWithReference">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
+ <mkdir dir="target/tmp/ant-tests"/>
<filterset id="myFilter">
<filter token="foo" value="bar"/>
</filterset>
-
+
<copy
overwrite="true"
- file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
- tofile="${basedir}/target/tmp/ant-tests/output.txt">
+ file="target/test-classes/org/apache/commons/jelly/ant/sample.txt"
+ tofile="target/tmp/ant-tests/output.txt">
<filterset refid="myFilter"/>
</copy>
-
- <util:loadText var="text" file="${basedir}/target/tmp/ant-tests/output.txt"/>
- <delete file="${basedir}/target/tmp/ant-tests/output.txt"/>
-
+
+ <util:loadText var="text" file="target/tmp/ant-tests/output.txt"/>
+ <delete file="target/tmp/ant-tests/output.txt"/>
+
<test:assertEquals expected="hello bar how are you?" actual="${text.trim()}"/>
</test:case>
@@ -144,23 +144,23 @@
<test:case name="parallelCopy">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
-
+ <mkdir dir="target/tmp/ant-tests"/>
+
<parallel>
<copy
overwrite="true"
- file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
- tofile="${basedir}/target/tmp/ant-tests/output.txt">
+ file="target/test-classes/org/apache/commons/jelly/ant/sample.txt"
+ tofile="target/tmp/ant-tests/output.txt">
<filterset>
<filter token="foo" value="bar"/>
</filterset>
</copy>
<echo>Performing copy in parallel</echo>
</parallel>
-
+
<util:loadText var="text" file="${basedir}/target/tmp/ant-tests/output.txt"/>
<delete file="${basedir}/target/tmp/ant-tests/output.txt"/>
-
+
<test:assertEquals expected="hello bar how are you?" actual="${text.trim()}"/>
</test:case>
@@ -176,16 +176,16 @@
<parallel>
<copy
overwrite="true"
- file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
+ file="${basedir}/target/test-classes/org/apache/commons/jelly/ant/sample.txt"
tofile="${basedir}/target/tmp/ant-tests/output.txt">
<filterset refid="myFilter"/>
</copy>
<echo>Performing copy in parallel</echo>
- </parallel>
-
+ </parallel>
+
<util:loadText var="text" file="${basedir}/target/tmp/ant-tests/output.txt"/>
<delete file="${basedir}/target/tmp/ant-tests/output.txt"/>
-
+
<test:assertEquals expected="hello bar how are you?" actual="${text.trim()}"/>
</test:case>
@@ -199,18 +199,18 @@
<echo>
<setProperty name="message" value="${foo}"/>
</echo>
-
+
<echo>
<setProperty name="message" value="${bar}" default="the default also worked"/>
</echo>
- <!-- haven't thought of a neat way to test this yet... -->
+ <!-- haven't thought of a neat way to test this yet... -->
</test:case>
<test:case name="nestedTask">
<j:include uri="task/example.jelly"/>
-
+
</test:case>
<test:case name="setProperty">
@@ -223,15 +223,15 @@
<nested>
<setProperty name="force" value="true"/>
</nested>
-
+
<j:catch var="ex">
<nested>
<setProperty name="force" value="false"/>
</nested>
- </j:catch>
-
+ </j:catch>
+
<test:assert test="${ex != null}">We should have created an exception</test:assert>
-
+
</test:case>
</test:suite>
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/suite.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/suite.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/example.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/example.jelly
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly b/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/typoTest.jelly
similarity index 100%
rename from jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly
rename to jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/typoTest.jelly
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index d711019..72b6fe5 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -14,6 +14,7 @@
<description>Parent pom for tag library projects.</description>
<modules>
+ <module>ant</module>
<module>junit</module>
<module>util</module>
</modules>
