You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2017/07/05 19:46:18 UTC
svn commit: r1800922 - in /commons/proper/jelly/trunk/jelly-tags: ./ ant/
ant/src/java/org/apache/commons/jelly/tags/ant/
ant/src/java/org/apache/commons/jelly/task/ ant/src/main/
ant/src/main/java/ ant/src/main/java/org/ ant/src/main/java/org/apache/ ...
Author: oheger
Date: Wed Jul 5 19:46:18 2017
New Revision: 1800922
URL: http://svn.apache.org/viewvc?rev=1800922&view=rev
Log:
Added ant tag lib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/ant/pom.xml
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/project.xml
commons/proper/jelly/trunk/jelly-tags/ant/src/main/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/TaskSource.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/package.html
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/package.html
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java
commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/package.html
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/package.html
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/MyTagLibrary.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/MyTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/DummyTask.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_jar.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_tasks.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/filescanner.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/filescanner.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/jellyunit.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/sample.txt
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/sample.txt
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/show_properties.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/show_properties.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/suite.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/example.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/typoTest.jelly
- copied, changed from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly
Removed:
commons/proper/jelly/trunk/jelly-tags/ant/build.xml
commons/proper/jelly/trunk/jelly-tags/ant/maven.xml
commons/proper/jelly/trunk/jelly-tags/ant/project.properties
commons/proper/jelly/trunk/jelly-tags/ant/project.xml
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/package.html
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java
commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/package.html
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/filescanner.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/sample.txt
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/show_properties.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/MyTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/DummyTask.java
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly
commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly
Modified:
commons/proper/jelly/trunk/jelly-tags/pom.xml
Copied: commons/proper/jelly/trunk/jelly-tags/ant/pom.xml (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/ant/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/ant/project.xml&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/ant/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/ant/pom.xml Wed Jul 5 19:46:18 2017
@@ -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 -->
+ <!-- END for testing -->
</dependencies>
</project>
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/TaskSource.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/TaskSource.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/TaskSource.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/package.html (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/package.html?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/package.html&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/package.html&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/package.html (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/package.html?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/package.html&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/package.html&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/TestJelly.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/TestJelly.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/MyTagLibrary.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/MyTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/MyTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/MyTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/MyTagLibrary.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/TestJelly.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/TestJelly.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/DummyTask.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/DummyTask.java&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/build.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/build.xml Wed Jul 5 19:46:18 2017
@@ -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}"/>
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_jar.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_jar.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_jar.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_tasks.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_tasks.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/example_tasks.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/filescanner.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/filescanner.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/filescanner.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/filescanner.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/filescanner.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/jellyunit.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/jellyunit.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/jellyunit.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/sample.txt (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/sample.txt)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/sample.txt?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/sample.txt&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/sample.txt&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/show_properties.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/show_properties.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/show_properties.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/show_properties.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/show_properties.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly (original)
+++ commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/suite.jelly Wed Jul 5 19:46:18 2017
@@ -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>
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/suite.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/tag/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/example.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/example.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/task/example.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/typoTest.jelly (from r1800921, commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/typoTest.jelly?p2=commons/proper/jelly/trunk/jelly-tags/ant/src/test/resources/org/apache/commons/jelly/ant/typoTest.jelly&p1=commons/proper/jelly/trunk/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly&r1=1800921&r2=1800922&rev=1800922&view=diff
==============================================================================
(empty)
Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1800922&r1=1800921&r2=1800922&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul 5 19:46:18 2017
@@ -14,6 +14,7 @@
<description>Parent pom for tag library projects.</description>
<modules>
+ <module>ant</module>
<module>junit</module>
<module>util</module>
</modules>