Author: oheger
Date: Wed Jul 5 19:53:31 2017
New Revision: 1800937
URL: http://svn.apache.org/viewvc?rev=1800937&view=rev
Log:
Added html tag lib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/html/pom.xml
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/project.xml
commons/proper/jelly/trunk/jelly-tags/html/src/main/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/package.html
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/package.html
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example.jelly
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example2.jelly
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example2.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/index.html
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/index.html
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/radioToPDA.jelly
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/radioToPDA.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/suite.jelly
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/suite.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/textScript.txt
- copied, changed from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/textScript.txt
Removed:
commons/proper/jelly/trunk/jelly-tags/html/build.xml
commons/proper/jelly/trunk/jelly-tags/html/maven.xml
commons/proper/jelly/trunk/jelly-tags/html/project.properties
commons/proper/jelly/trunk/jelly-tags/html/project.xml
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/package.html
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example2.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/index.html
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/radioToPDA.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/suite.jelly
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/textScript.txt
Modified:
commons/proper/jelly/trunk/jelly-tags/pom.xml
Copied: commons/proper/jelly/trunk/jelly-tags/html/pom.xml (from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/project.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/html/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/html/project.xml&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/html/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/html/pom.xml Wed Jul 5 19:53:31 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,65 +15,70 @@
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>
- <extend>${basedir}/../tag-project.xml</extend>
<artifactId>commons-jelly-tags-html</artifactId>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-html</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.html</package>
- <description>These Jelly tags can scrub commons errors in HTML
syntax.</description>
- <shortDescription>Commons Jelly HTML Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS-JELLY-HTML-1_0</tag>
- </version>
- </versions>
+ <description>
+ These Jelly tags can scrub common errors in HTML syntax.
+ </description>
+
<dependencies>
- <!-- html taglib -->
+ <!-- START for compilation -->
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>0.9.5</version>
</dependency>
- <!-- START for running demos -->
+ <!-- END for compilation -->
+
+ <!-- Start for running demos -->
<dependency>
- <groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
<version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
- <version>1.0</version>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
- <version>1.0</version>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
- <version>1.0</version>
+ <version>1.2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
+
<!-- END for running demos -->
+
<!-- START for testing -->
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/junit/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
- <!-- END for testing -->
+ <!-- END for testing -->
</dependencies>
</project>
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java?p2=commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java&p1=commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/package.html
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/package.html)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/package.html?p2=commons/proper/jelly/trunk/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/package.html&p1=commons/proper/jelly/trunk/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/package.html&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/TestJelly.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/TestJelly.java&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example.jelly
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example.jelly)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example.jelly?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example.jelly&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example.jelly&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example2.jelly
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example2.jelly)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example2.jelly?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/example2.jelly&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/example2.jelly&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/index.html
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/index.html)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/index.html?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/index.html&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/index.html&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/radioToPDA.jelly
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/radioToPDA.jelly)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/radioToPDA.jelly?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/radioToPDA.jelly&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/radioToPDA.jelly&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/suite.jelly
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/suite.jelly)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/suite.jelly&r1=1800936&r2=1800937&rev=1800937&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/textScript.txt
(from r1800936,
commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/textScript.txt)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/textScript.txt?p2=commons/proper/jelly/trunk/jelly-tags/html/src/test/resources/org/apache/commons/jelly/html/textScript.txt&p1=commons/proper/jelly/trunk/jelly-tags/html/src/test/org/apache/commons/jelly/html/textScript.txt&r1=1800936&r2=1800937&rev=1800937&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=1800937&r1=1800936&r2=1800937&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul 5 19:53:31 2017
@@ -25,6 +25,7 @@
<module>dynabean</module>
<module>email</module>
<module>fmt</module>
+ <module>html</module>
<module>jsl</module>
<module>junit</module>
<module>log</module>
