Author: oheger
Date: Wed Jul 5 19:45:32 2017
New Revision: 1800921
URL: http://svn.apache.org/viewvc?rev=1800921&view=rev
Log:
Added util taglib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/util/pom.xml
commons/proper/jelly/trunk/jelly-tags/util/src/main/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/AvailableTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/FileTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SleepTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SortTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/package.html
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/package.html
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/deletable.properties
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/deletable.properties
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/dummy.xml
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/dummy.xml
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/foo.properties
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/foo.properties
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText1.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText2.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText3.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText4.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText5.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText6.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText7.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText8.txt
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/suite.jelly
- copied, changed from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
Removed:
commons/proper/jelly/trunk/jelly-tags/util/build.xml
commons/proper/jelly/trunk/jelly-tags/util/maven.xml
commons/proper/jelly/trunk/jelly-tags/util/project.properties
commons/proper/jelly/trunk/jelly-tags/util/project.xml
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/AvailableTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/FileTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SleepTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SortTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/package.html
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/deletable.properties
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/dummy.xml
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/foo.properties
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
Modified:
commons/proper/jelly/trunk/jelly-tags/pom.xml
Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1800921&r1=1800920&r2=1800921&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul 5 19:45:32 2017
@@ -15,6 +15,7 @@
<modules>
<module>junit</module>
+ <module>util</module>
</modules>
<build>
Added: commons/proper/jelly/trunk/jelly-tags/util/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/pom.xml?rev=1800921&view=auto
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/util/pom.xml (added)
+++ commons/proper/jelly/trunk/jelly-tags/util/pom.xml Wed Jul 5 19:45:32 2017
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <artifactId>commons-jelly-tags-util</artifactId>
+ <packaging>jar</packaging>
+ <name>commons-jelly-tags-util</name>
+ <description>This is a set of Jelly utility tags.</description>
+
+ <dependencies>
+ <!-- START for compilation -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <!-- END for compilation -->
+
+ <!-- START for test -->
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-junit</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- END for test -->
+ </dependencies>
+</project>
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/AvailableTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/AvailableTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/FileTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/FileTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/PropertiesTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/PropertiesTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/ReplaceTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/ReplaceTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SleepTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SleepTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SortTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/SortTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/TokenizeTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/TokenizeTag.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/package.html
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/package.html)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/package.html?p2=commons/proper/jelly/trunk/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/package.html&p1=commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/package.html&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/TestJelly.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/TestJelly.java&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/deletable.properties
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/deletable.properties)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/deletable.properties?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/deletable.properties&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/deletable.properties&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/dummy.xml
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/dummy.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/dummy.xml?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/dummy.xml&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/dummy.xml&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/foo.properties
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/foo.properties)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/foo.properties?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/foo.properties&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/foo.properties&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText1.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText1.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText1.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText2.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText2.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText2.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText3.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText3.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText3.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText4.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText4.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText4.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText5.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText5.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText5.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText6.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText6.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText6.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText7.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText7.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText7.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText8.txt
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText8.txt?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/loadText8.txt&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/suite.jelly
(from r1800920,
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly&r1=1800920&r2=1800921&rev=1800921&view=diff
==============================================================================
---
commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
(original)
+++
commons/proper/jelly/trunk/jelly-tags/util/src/test/resources/org/apache/commons/jelly/tags/util/suite.jelly
Wed Jul 5 19:45:32 2017
@@ -15,43 +15,43 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<test:suite
- xmlns:j="jelly:core"
- xmlns:util="jelly:util"
+<test:suite
+ xmlns:j="jelly:core"
+ xmlns:util="jelly:util"
xmlns:test="jelly:junit">
<test:case name="testTokenize">
-
+
<util:tokenize var="tokens"
delim=",">Test1,Test2,Test3,Test4</util:tokenize>
- <j:set var="s" value="${size(tokens)}"/>
+ <j:set var="s" value="${size(tokens)}"/>
<test:assert test="${s == 4}"/>
<test:assert test="${size(tokens) == 4}"/>
-<!--
- <j:set var="s" value="${tokens.size()}"/>
+<!--
+ <j:set var="s" value="${tokens.size()}"/>
<test:assert test="${s == 4}"/>
-
+
<test:assert test="${tokens.size() == 4}"/>
-->
-
+
<test:assertEquals expected="Test1" actual="${tokens[0]}"/>
<test:assertEquals expected="Test2" actual="${tokens[1]}"/>
<test:assertEquals expected="Test3" actual="${tokens[2]}"/>
<test:assertEquals expected="Test4" actual="${tokens[3]}"/>
-
+
<test:assertEquals expected="Test4" actual="${tokens[s - 1]}"/>
<test:assertEquals expected="Test4" actual="${tokens[size(tokens) -
1]}"/>
-
-<!--
+
+<!--
<test:assertEquals expected="Test4" actual="${tokens.get(size(tokens)
- 1)}"/>
-
-
+
+
<test:assertEquals expected="Test4" actual="${tokens[tokens.size() -
1]}"/>
<test:assertEquals expected="Test4" actual="${tokens.get(tokens.size()
- 1)}"/>
--->
-
+-->
+
</test:case>
<test:case name="testFileExists">
@@ -60,59 +60,59 @@
<j:if test="${empty base.dir}">
<j:set var="base.dir" value="."/>
</j:if>
-
+
<j:set var="flag" value="not found"/>
- <util:available file="${base.dir}/project.xml">
+ <util:available file="${base.dir}/pom.xml">
<j:set var="flag" value="found"/>
</util:available>
-
+
<test:assertEquals expected="found" actual="${flag}">
- Should have found the file via the file $${base.dir}/project.xml
with base.dir=${base.dir}
+ Should have found the file via the file $${base.dir}/pom.xml with
base.dir=${base.dir}
</test:assertEquals>
-
+
<util:available file="${base.dir}/doesNotExist.xml">
<test:fail>The file ${base.dir}/doesNotExist.xml should not
exist</test:fail>
</util:available>
-
+
</test:case>
-
+
<test:case name="testURIExists">
<j:set var="flag" value="not found"/>
<!-- use relative URIs-->
-
+
<util:available uri="dummy.xml">
<j:set var="flag" value="found"/>
</util:available>
-
+
<test:assertEquals expected="found" actual="${flag}">
Should have found the file via the URI dummy.xml
</test:assertEquals>
-
+
<util:available uri="doesNotExist.xml">
<test:fail>The URI doesNotExist.xml should not exist!</test:fail>
</util:available>
-
+
</test:case>
-
+
<test:case name="testReplace">
-
+
<util:replace oldChar="\" newChar="/" var="testString">A\B</util:replace>
<test:assertEquals expected="A/B" actual="${testString}">
Should have replaced a back slash with a forward one
</test:assertEquals>
-
+
<j:set var="testString2"><util:replace oldChar="\"
newChar="/">A\B</util:replace></j:set>
<test:assertEquals expected="A/B" actual="${testString2}">
Should have replaced a back slash with a forward one
and placed the result into output
</test:assertEquals>
-
+
<util:replace oldChar="/" newChar="\" value="${testString}"
var="testString3" />
<test:assertEquals expected="A\B" actual="${testString3}">
Should have replaced a slash with a back slash from a variable
@@ -134,47 +134,47 @@
</test:case>
<test:case name="testProperties">
-
+
<util:properties uri="foo.properties"/>
-
+
<test:assertEquals expected="ABC" actual="${foo}"/>
-
+
</test:case>
-
+
<test:case name="testPropertiesVar">
-
+
<util:properties uri="foo.properties" var="props"/>
-
+
<test:assertEquals expected="ABC" actual="${props.foo}"/>
-
+
Loaded properties value ${props}
-
+
</test:case>
-
+
<test:case name="testPropertiesAreNotLocked">
- <j:set var="filename"
value="${basedir}/target/test-classes/org/apache/commons/jelly/tags/util/deletable.properties"/>
-
+ <j:set var="filename"
value="target/test-classes/org/apache/commons/jelly/tags/util/deletable.properties"/>
+
<util:properties file="${filename}"/>
-
+
<j:new var="f" className="java.io.File">
<j:arg type="java.lang.String" value="${filename}"/>
- </j:new>
+ </j:new>
<j:mute>
${f.delete()}
</j:mute>
-
+
<test:assertEquals expected="${false}" actual="${f.exists()}" >The file
${name} should no longer exist</test:assertEquals>
</test:case>
-
+
<test:case name="testFileTag">
- <util:file
name="${basedir}/src/test/org/apache/commons/jelly/tags/util/suite.jelly"
+ <util:file
name="${basedir}/src/test/org/apache/commons/jelly/tags/util/suite.jelly"
var="suite" />
<test:assert test="${suite != null}" >The suite should
exist</test:assert>
</test:case>
-
+
<test:case name="testSortBasic">
<j:new var="testCollection" className="java.util.ArrayList"/>
<j:mute>
@@ -188,7 +188,7 @@
<test:assertEquals expected="Jelly" actual="${sorted[1]}"/>
<test:assertEquals expected="World" actual="${sorted[2]}"/>
</test:case>
-
+
<test:case name="testSortBean">
<j:new var="testCollection" className="java.util.ArrayList"/>
@@ -212,50 +212,61 @@
<test:assertEquals expected="Australia"
actual="${sortedByLocation[0].location}"/>
<test:assertEquals expected="Australia"
actual="${sortedByLocation[1].location}"/>
<test:assertEquals expected="U.S.A."
actual="${sortedByLocation[2].location}"/>
-
+
</test:case>
<test:case name="testLoadTextTag">
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText1.txt"
+ <!-- To deal with different line ending styles -->
+ <j:set var="nl" value=" "/>
+ <j:set var="crlf" value=" "/>
+
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText1.txt"
var="oneLineNewLine" />
- <test:assertEquals expected="6"
actual="${oneLineNewLine.length().toString()}">
+ <test:assertEquals expected="6"
+ actual="${oneLineNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (one line with newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText2.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText2.txt"
var="oneLineNoNewLine" />
- <test:assertEquals expected="5"
actual="${oneLineNoNewLine.length().toString()}">
+ <test:assertEquals expected="5"
+ actual="${oneLineNoNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (one line without newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText3.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText3.txt"
var="twoLinesNewLine" />
- <test:assertEquals expected="11"
actual="${twoLinesNewLine.length().toString()}">
+ <test:assertEquals expected="11"
+ actual="${twoLinesNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (two lines with newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText4.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText4.txt"
var="twoLinesNoNewLine" />
- <test:assertEquals expected="10"
actual="${twoLinesNoNewLine.length().toString()}">
+ <test:assertEquals expected="10"
+ actual="${twoLinesNoNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (two lines without newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText5.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText5.txt"
var="emptyNewLine" />
- <test:assertEquals expected="1"
actual="${emptyNewLine.length().toString()}">
+ <test:assertEquals expected="1"
+ actual="${emptyNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (empty line with newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText6.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText6.txt"
var="emptyNoNewLine" />
<test:assertEquals expected="0"
actual="${emptyNoNewLine.length().toString()}">
Wrong size of loaded text (empty lines without newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText7.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText7.txt"
var="bigFileNewLine" />
- <test:assertEquals expected="10000"
actual="${bigFileNewLine.length().toString()}">
+ <test:assertEquals expected="10000"
+ actual="${bigFileNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (big file with newline)!
</test:assertEquals>
- <util:loadText
file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText8.txt"
+ <util:loadText
file="target/test-classes/org/apache/commons/jelly/tags/util/loadText8.txt"
var="bigFileNoNewLine" />
- <test:assertEquals expected="9999"
actual="${bigFileNoNewLine.length().toString()}">
+ <test:assertEquals expected="9999"
+ actual="${bigFileNoNewLine.replace(crlf, nl).length().toString()}">
Wrong size of loaded text (big file without newline)!
</test:assertEquals>
</test:case>
-
+
</test:suite>
