Author: oheger
Date: Sat Sep 16 15:00:45 2017
New Revision: 1808562
URL: http://svn.apache.org/viewvc?rev=1808562&view=rev
Log:
Added velocity tag lib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/velocity/pom.xml
- copied, changed from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/project.xml
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
- copied, changed from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
- copied, changed from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java
- copied, changed from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java
- copied, changed from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
- copied, changed from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
Removed:
commons/proper/jelly/trunk/jelly-tags/velocity/build.xml
commons/proper/jelly/trunk/jelly-tags/velocity/maven.xml
commons/proper/jelly/trunk/jelly-tags/velocity/project.properties
commons/proper/jelly/trunk/jelly-tags/velocity/project.xml
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
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=1808562&r1=1808561&r2=1808562&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Sat Sep 16 15:00:45 2017
@@ -47,6 +47,7 @@
<module>threads</module>
<module>util</module>
<module>validate</module>
+ <module>velocity</module>
<module>xml</module>
<module>xmlunit</module>
</modules>
Copied: commons/proper/jelly/trunk/jelly-tags/velocity/pom.xml (from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/project.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/velocity/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/velocity/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/velocity/project.xml&r1=1808561&r2=1808562&rev=1808562&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/velocity/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/velocity/pom.xml Sat Sep 16 15:00:45
2017
@@ -6,52 +6,37 @@
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
-
+
+ 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>
- <extend>${basedir}/../tag-project.xml</extend>
+<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-velocity</artifactId>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-velocity</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-
- <package>org.apache.commons.jelly.tags.velocity</package>
-
- <description>
- This is a Jelly interface for Velocity.
- </description>
- <shortDescription>Commons Jelly Velocity Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_VELOCITY-1_0</tag>
- </version>
- </versions>
+ <description>This is a Jelly interface for Velocity.</description>
<dependencies>
-
<!-- START for compilation -->
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.3</version>
- <url>http://jakarta.apache.org/velocity/</url>
- <properties>
- <gump.project>jakarta-velocity</gump.project>
- <gump.id>velocity</gump.id>
- </properties>
</dependency>
<!-- END for compilation -->
-
</dependencies>
-
</project>
Copied:
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
(from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java?p2=commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java&p1=commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java&r1=1808561&r2=1808562&rev=1808562&view=diff
==============================================================================
---
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
(original)
+++
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
Sat Sep 16 15:00:45 2017
@@ -17,9 +17,9 @@ package org.apache.commons.jelly.tags.ve
* limitations under the License.
*/
-import java.util.Set;
-import java.util.HashSet;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.commons.jelly.JellyContext;
import org.apache.velocity.context.Context;
Copied:
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
(from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java?p2=commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java&p1=commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java&r1=1808561&r2=1808562&rev=1808562&view=diff
==============================================================================
---
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
(original)
+++
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
Sat Sep 16 15:00:45 2017
@@ -17,19 +17,18 @@ package org.apache.commons.jelly.tags.ve
* limitations under the License.
*/
-import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.XMLOutput;
-
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
+import org.apache.commons.jelly.JellyTagException;
+import org.apache.commons.jelly.XMLOutput;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+
/**
* A tag that uses Velocity to render a specified template with the
* JellyContext storing the results in either a variable in the
Copied:
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java
(from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagLibrary.java&r1=1808561&r2=1808562&rev=1808562&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java
(from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java?p2=commons/proper/jelly/trunk/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java&p1=commons/proper/jelly/trunk/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java&r1=1808561&r2=1808562&rev=1808562&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
(from r1808561,
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java?p2=commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java&p1=commons/proper/jelly/trunk/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java&r1=1808561&r2=1808562&rev=1808562&view=diff
==============================================================================
---
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
(original)
+++
commons/proper/jelly/trunk/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
Sat Sep 16 15:00:45 2017
@@ -17,16 +17,16 @@ package org.apache.commons.jelly.tags.ve
* limitations under the License.
*/
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.jelly.JellyContext;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.collections.CollectionUtils;
-
/**
* Unit test for <code>JellyContextAdapter</code>.
*
