rpms/velocity
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest version

Browse Source 
- Drop old/unused patches
This commit is contained in:
Stanislav Ochotnicky 2011-02-21 16:48:54 +01:00
parent 45df5f4a1c
commit cf428fb9fc
15 changed files with 178 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
velocity-1.6.3.tar.gz
/velocity-1.6.4.tar.gz
/velocity-1.7.tar.gz

62
0001-Remove-avalon-logkit.patch Normal file
View File

@ -0,0 +1,62 @@
From 1d2f89cb3e954b943751fa8dd587fdb404eb9338 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 21 Feb 2011 15:53:34 +0100
Subject: [PATCH 1/3] Remove avalon-logkit
we don't have it packaged so change defaults and remove it from pom.xml
---
pom.xml | 6 ------
.../velocity/runtime/defaults/velocity.properties | 4 ++--
.../apache/velocity/runtime/log/LogManager.java | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 77a8e38..f453208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,12 +197,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6</version>
diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
index 750a59a..7fac119 100644
--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
@@ -20,10 +20,10 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
+# default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
# ----------------------------------------------------------------------------
-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
+runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
# ---------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
diff --git a/src/java/org/apache/velocity/runtime/log/LogManager.java b/src/java/org/apache/velocity/runtime/log/LogManager.java
index 19d1016..97dceef 100644
--- a/src/java/org/apache/velocity/runtime/log/LogManager.java
+++ b/src/java/org/apache/velocity/runtime/log/LogManager.java
@@ -119,7 +119,7 @@ public class LogManager
* classes, and we use the first one we find.
*
* Note that the default value of this property contains the
- * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute,
+ * Log4JLogChute, CommonsLogLogChute,
* ServletLogChute, and the JdkLogChute for
* convenience - so we use whichever we works first.
*/
--
1.7.4

43
velocity-tomcat6.patch → 0002-Fix-servlet25-testcase.patch
View File

@ -1,14 +1,14 @@
From 8758e3c83411ffadc084d241217fc25f1fd31f42 Mon Sep 17 00:00:00 2001
From 29a4b2d7cca447279d91cd7ff9a2ed13436f82a7 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Thu, 14 Oct 2010 10:20:52 +0200
Subject: [PATCH] Fix test for servlet api 2.5
Date: Mon, 21 Feb 2011 15:56:54 +0100
Subject: [PATCH 2/3] Fix servlet25 testcase
---
.../velocity/test/VelocityServletTestCase.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
.../velocity/test/VelocityServletTestCase.java | 21 +++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/test/org/apache/velocity/test/VelocityServletTestCase.java b/src/test/org/apache/velocity/test/VelocityServletTestCase.java
index 824583e..ac0ab5c 100644
index 700a453..ac0ab5c 100644
--- a/src/test/org/apache/velocity/test/VelocityServletTestCase.java
+++ b/src/test/org/apache/velocity/test/VelocityServletTestCase.java
@@ -16,7 +16,7 @@ package org.apache.velocity.test;
@ -32,6 +32,33 @@ index 824583e..ac0ab5c 100644
public String getServletContextName()
{
return "VelocityTestContext";
--
1.7.2.3
@@ -250,6 +255,11 @@ public class VelocityServletTestCase extends TestCase
public void setAttribute(String name, Object value)
{
}
+
+ public Set getResourcePath(String path)
+ {
+ return null;
+ }
}
static class MockHttpServletResponse implements HttpServletResponse
@@ -408,5 +418,14 @@ public class VelocityServletTestCase extends TestCase
public void setStatus(int i , String s)
{
}
+
+ public void setCharacterEncoding(String charset)
+ {
+ }
+
+ public String getContentType()
+ {
+ return null;
+ }
}
}
--
1.7.4

59
velocity-use-system-jars.patch → 0003-Use-system-jars.patch
View File

@ -1,6 +1,18 @@
--- velocity-1.6.3.mef/build/build.xml.orig 2010-01-15 12:53:01.344906711 +0000
+++ velocity-1.6.3.mef/build/build.xml 2010-01-15 12:53:07.537915055 +0000
@@ -138,28 +138,6 @@
From 813085c72e9906a53bec5954bcce7305a7c320d1 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 21 Feb 2011 17:58:39 +0100
Subject: [PATCH 3/3] Use system jars
---
build/build.xml | 56 +++++++++++----------------------------------------
build/testcases.xml | 6 -----
2 files changed, 12 insertions(+), 50 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index c667553..479ef2d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -140,28 +140,6 @@
<!-- =================================================================== -->
<!-- sets up the build environment (classpath and libs) -->
<!-- =================================================================== -->
@ -29,7 +41,7 @@
<!-- =================================================================== -->
<!-- checks for the existence/non-existence of various java features -->
@@ -172,12 +150,11 @@
@@ -174,12 +152,11 @@
<target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
<target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
@ -43,7 +55,7 @@
</available>
</target>
@@ -208,10 +185,9 @@
@@ -210,10 +187,9 @@
</echo>
</target>
@ -55,7 +67,7 @@
</available>
</target>
@@ -246,7 +222,7 @@
@@ -248,7 +224,7 @@
<!-- =================================================================== -->
<target name="compile" depends="compile-src,compile-test"/>
@ -64,7 +76,7 @@
description="Compiles the Velocity source">
<javac srcdir="${build.src}"
destdir="${build.dest}"
@@ -255,8 +231,7 @@
@@ -257,8 +233,7 @@
target="${javac.target}"
source="${javac.source}"
deprecation="${deprecation}"
@ -74,7 +86,7 @@
<copy todir="${build.dest}" filtering="yes">
<fileset dir="${src.java.dir}">
@@ -266,7 +241,7 @@
@@ -268,7 +243,7 @@
</target>
@ -83,7 +95,7 @@
description="Compiles the Velocity test classes">
<javac srcdir="${build.test.src}"
destdir="${build.test.dest}"
@@ -277,8 +252,6 @@
@@ -279,8 +254,6 @@
<!-- Don't use the run classpath, build using the exploded class tree -->
<classpath>
@ -92,7 +104,7 @@
<pathelement location="${build.dest}"/>
</classpath>
</javac>
@@ -503,7 +476,7 @@
@@ -561,7 +534,7 @@
<!-- =================================================================== -->
<!-- Compiles the example code -->
<!-- =================================================================== -->
@ -101,7 +113,7 @@
description="Compiles the Velocity Example code">
<echo>
@@ -527,8 +500,7 @@
@@ -585,8 +558,7 @@
encoding="UTF-8"
debug="${debug}"
deprecation="${deprecation}"
@ -111,7 +123,7 @@
</target>
<target name="examples-clean" depends="examples-clean-anakia">
@@ -546,7 +518,7 @@
@@ -604,7 +576,7 @@
<!-- =================================================================== -->
<!-- Creates the API documentation -->
<!-- =================================================================== -->
@ -120,7 +132,7 @@
description="Creates the Javadoc API documentation">
<mkdir dir="${build.javadoc}"/>
@@ -562,8 +534,7 @@
@@ -620,8 +592,7 @@
doctitle="${name} ${version} API"
encoding="UTF-8"
docencoding="UTF-8"
@ -130,7 +142,7 @@
<link href="${javadocs.ref.jsdk}"/>
<link href="http://www.jdom.org/docs/apidocs"/>
@@ -918,12 +889,11 @@
@@ -1024,12 +995,11 @@
<!-- Make HTML version of Velocity documentation -->
<!-- =================================================================== -->
@ -145,16 +157,16 @@
<echo>
#######################################################
@@ -1106,7 +1076,7 @@
@@ -1231,7 +1201,7 @@
<!-- =================================================================== -->
<!-- JUnit Tests for Velocity -->
<!-- =================================================================== -->
- <target name="test" depends="build-prepare,compile-test"
+ <target name="test" depends="compile-test"
- <target name="test-main" depends="build-prepare,compile-test"
+ <target name="test-main" depends="compile-test"
description="Run the Velocity testcases">
<mkdir dir="${build.test.reports}"/>
@@ -1120,8 +1090,6 @@
<!-- Require ant 1.7+ for Junit compatibility -->
@@ -1264,8 +1234,6 @@
<!-- Don't use the run classpath, test using the exploded class tree -->
<classpath>
@ -163,8 +175,10 @@
<pathelement path="${build.dest}"/>
<pathelement path="${build.test.dest}"/>
</classpath>
--- velocity-1.6.3.mef/build/testcases.xml.orig 2010-01-15 13:09:06.265907075 +0000
+++ velocity-1.6.3.mef/build/testcases.xml 2010-01-15 13:09:08.356067618 +0000
diff --git a/build/testcases.xml b/build/testcases.xml
index 06bb36e..f3749bc 100644
--- a/build/testcases.xml
+++ b/build/testcases.xml
@@ -36,12 +36,6 @@
<!-- Build classpath -->
@ -178,3 +192,6 @@
<pathelement location="${build.dest}"/>
<pathelement location="${build.test.dest}"/>
</path>
--
1.7.4

2
sources
View File

@ -1 +1 @@
1ba4363ac104301db59075dae0c9e7d0 velocity-1.6.4.tar.gz
6af13ea297dee7ddbabeaa8e3963c184 velocity-1.7.tar.gz

27
velocity-1.6.4.pom → velocity-1.7.pom
View File

@ -1,4 +1,5 @@
<?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
@ -17,7 +18,10 @@
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@ -29,10 +33,10 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.6.4</version>
<version>1.7</version>
<name>Apache Velocity</name>
<url>http://velocity.apache.org/engine/releases/velocity-1.6.2/</url>
<url>http://velocity.apache.org/engine/devel/</url>
<description>Apache Velocity is a general purpose template engine.</description>
<inceptionYear>2000</inceptionYear>
<packaging>jar</packaging>
@ -69,7 +73,7 @@
<distributionManagement>
<site>
<id>velocity.apache.org</id>
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.6.4/</url>
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.7</url>
</site>
<repository>
<id>apache.releases</id>
@ -152,6 +156,7 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jdom</groupId>
@ -312,14 +317,22 @@
<findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
</plugins>
</reporting>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x</developerConnection>
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
<tag>HEAD</tag>
<url>http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x</url>
<url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
</scm>
<properties>

11
velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
View File

@ -1,11 +0,0 @@
--- src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java.sav Thu Sep 23 12:46:10 2004
+++ src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java Thu Sep 23 12:46:29 2004
@@ -18,7 +18,7 @@
import org.jdom.Element;
import org.jdom.Namespace;
-import org.jdom.input.DefaultJDOMFactory;
+import org.jdom.DefaultJDOMFactory;
/**
* A customized JDOMFactory for Anakia that produces {@link AnakiaElement}

21
velocity-AnakiaTask-jdom-XMLOutputter.patch
View File

@ -1,21 +0,0 @@
--- src/java/org/apache/velocity/anakia/AnakiaTask.java.sav Wed Apr 14 14:26:40 2004
+++ src/java/org/apache/velocity/anakia/AnakiaTask.java Thu Sep 23 13:01:14 2004
@@ -34,6 +34,7 @@
import org.jdom.Document;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
+import org.jdom.output.Format;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
@@ -343,7 +344,9 @@
}
OutputWrapper ow = new OutputWrapper();
- ow.setEncoding (encoding);
+ Format owf = ow.getFormat();
+ owf.setEncoding (encoding);
+ ow.setFormat (owf);
context.put ("root", root.getRootElement());
context.put ("xmlout", ow );

11
velocity-build-testcases.patch
View File

@ -1,11 +0,0 @@
--- ./build/testcases.xml.save 2006-07-22 21:26:04.000000000 -0400
+++ ./build/testcases.xml 2006-07-22 21:25:43.000000000 -0400
@@ -13,7 +13,7 @@
<property name="velocity.test.runner" value="junit.textui.TestRunner"/>
<!-- Turns on/off overall failure if one test fails -->
- <property name="testbed.failonerror" value="true"/>
+ <property name="testbed.failonerror" value="false"/>
<!-- Build classpath -->
<path id="classpath">

35
velocity-cleanup-pom.patch
View File

@ -1,35 +0,0 @@
--- velocity-1.6.4/pom.xml.orig 2010-11-03 17:54:46.130858097 +0100
+++ velocity-1.6.4/pom.xml 2010-11-03 17:55:51.449631138 +0100
@@ -21,12 +21,6 @@
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>4</version>
- </parent>
-
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.6.4</version>
@@ -192,12 +186,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6</version>
@@ -330,4 +318,4 @@
<system>JIRA</system>
<url>${jira.browse.url}/VELOCITY</url>
</issueManagement>
-</project>
\ No newline at end of file
+</project>

150
velocity-enum.patch
View File

@ -1,150 +0,0 @@
diff -Naur velocity-1.4-orig/docs/api/index-all.html velocity-1.4/docs/api/index-all.html
--- velocity-1.4-orig/docs/api/index-all.html 2009-04-24 20:09:34.000000000 +0200
+++ velocity-1.4/docs/api/index-all.html 2009-04-24 20:12:12.000000000 +0200
@@ -1476,7 +1476,7 @@
<DD>Maps entries to the parent JAR File
Key = the entry *excluding* plain directories
Value = the JAR URL
-<DT><A HREF="org/apache/velocity/util/EnumerationIterator.html#enum"><B>enum</B></A> -
+<DT><A HREF="org/apache/velocity/util/EnumerationIterator.html#enumer"><B>enumer</B></A> -
Variable in class org.apache.velocity.util.<A HREF="org/apache/velocity/util/EnumerationIterator.html">EnumerationIterator</A>
<DD>The enumeration to iterate.
<DT><A HREF="org/apache/velocity/runtime/resource/ResourceCacheImpl.html#enumerateKeys()"><B>enumerateKeys()</B></A> -
diff -Naur velocity-1.4-orig/docs/api/org/apache/velocity/util/EnumerationIterator.html velocity-1.4/docs/api/org/apache/velocity/util/EnumerationIterator.html
--- velocity-1.4-orig/docs/api/org/apache/velocity/util/EnumerationIterator.html 2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/docs/api/org/apache/velocity/util/EnumerationIterator.html 2009-04-24 20:11:56.000000000 +0200
@@ -94,7 +94,7 @@
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>private &nbsp;java.util.Enumeration</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#enum">enum</A></B></CODE>
+<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#enumer">enumer</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The enumeration to iterate.</TD>
@@ -110,7 +110,7 @@
<B>Constructor Summary</B></FONT></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#EnumerationIterator(java.util.Enumeration)">EnumerationIterator</A></B>(java.util.Enumeration&nbsp;enum)</CODE>
+<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#EnumerationIterator(java.util.Enumeration)">EnumerationIterator</A></B>(java.util.Enumeration&nbsp;enumer)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new iteratorwrapper instance for the specified
@@ -173,10 +173,10 @@
</TR>
</TABLE>
-<A NAME="enum"><!-- --></A><H3>
-enum</H3>
+<A NAME="enumer"><!-- --></A><H3>
+enumer</H3>
<PRE>
-private java.util.Enumeration <B>enum</B></PRE>
+private java.util.Enumeration <B>enumer</B></PRE>
<DL>
<DD>The enumeration to iterate.</DL>
@@ -193,11 +193,11 @@
<A NAME="EnumerationIterator(java.util.Enumeration)"><!-- --></A><H3>
EnumerationIterator</H3>
<PRE>
-public <B>EnumerationIterator</B>(java.util.Enumeration&nbsp;enum)</PRE>
+public <B>EnumerationIterator</B>(java.util.Enumeration&nbsp;enumer)</PRE>
<DL>
<DD>Creates a new iteratorwrapper instance for the specified
Enumeration.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>enum</CODE> - The Enumeration to wrap.</DL>
+<DT><B>Parameters:</B><DD><CODE>enumer</CODE> - The Enumeration to wrap.</DL>
</DD>
</DL>
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/runtime/parser/Parser.java velocity-1.4/src/java/org/apache/velocity/runtime/parser/Parser.java
--- velocity-1.4-orig/src/java/org/apache/velocity/runtime/parser/Parser.java 2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/runtime/parser/Parser.java 2009-04-24 20:12:51.000000000 +0200
@@ -3214,8 +3214,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration enumer = jj_expentries.elements(); enumer.hasMoreElements();) {
+ int[] oldentry = (int[])(enumer.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/texen/Generator.java velocity-1.4/src/java/org/apache/velocity/texen/Generator.java
--- velocity-1.4-orig/src/java/org/apache/velocity/texen/Generator.java 2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/texen/Generator.java 2009-04-24 20:12:36.000000000 +0200
@@ -451,10 +451,10 @@
*/
protected void fillContextHash (Context context, Hashtable objs)
{
- Enumeration enum = objs.keys();
- while (enum.hasMoreElements())
+ Enumeration enumer = objs.keys();
+ while (enumer.hasMoreElements())
{
- String key = enum.nextElement().toString();
+ String key = enumer.nextElement().toString();
context.put (key, objs.get(key));
}
}
@@ -479,11 +479,11 @@
*/
protected void fillContextProperties (Context context)
{
- Enumeration enum = props.propertyNames();
+ Enumeration enumer = props.propertyNames();
- while (enum.hasMoreElements())
+ while (enumer.hasMoreElements())
{
- String nm = (String)enum.nextElement();
+ String nm = (String)enumer.nextElement();
if (nm.startsWith ("context.objects."))
{
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/util/EnumerationIterator.java velocity-1.4/src/java/org/apache/velocity/util/EnumerationIterator.java
--- velocity-1.4-orig/src/java/org/apache/velocity/util/EnumerationIterator.java 2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/util/EnumerationIterator.java 2009-04-24 20:12:26.000000000 +0200
@@ -30,17 +30,17 @@
/**
* The enumeration to iterate.
*/
- private Enumeration enum = null;
+ private Enumeration enumer = null;
/**
* Creates a new iteratorwrapper instance for the specified
* Enumeration.
*
- * @param enum The Enumeration to wrap.
+ * @param enumer The Enumeration to wrap.
*/
- public EnumerationIterator( Enumeration enum)
+ public EnumerationIterator( Enumeration enumer)
{
- this.enum = enum;
+ this.enumer = enumer;
}
/**
@@ -50,7 +50,7 @@
*/
public Object next()
{
- return enum.nextElement();
+ return enumer.nextElement();
}
/**
@@ -60,7 +60,7 @@
*/
public boolean hasNext()
{
- return enum.hasMoreElements();
+ return enumer.hasMoreElements();
}
/**

15
velocity-legacy-tests.patch
View File

@ -1,15 +0,0 @@
--- velocity-1.6.3.mef/build/testcases.xml.orig 2010-01-15 13:09:06.265907075 +0000
+++ velocity-1.6.3.mef/build/testcases.xml 2010-01-15 13:09:08.356067618 +0000
@@ -36,12 +36,6 @@
<!-- Build classpath -->
<path id="velocity.test.classpath">
- <fileset dir="${build.lib}">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${build.test.lib}">
- <include name="**/*.jar"/>
- </fileset>
<pathelement location="${build.dest}"/>
<pathelement location="${build.test.dest}"/>
</path>

31
velocity-remove-avalon-logkit.patch
View File

@ -1,31 +0,0 @@
diff -ur velocity-1.6.3/src/java/org/apache/velocity/runtime/defaults/velocity.properties velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/defaults/velocity.properties
--- velocity-1.6.3/src/java/org/apache/velocity/runtime/defaults/velocity.properties 2009-12-07 23:41:24.000000000 +0000
+++ velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/defaults/velocity.properties 2010-01-15 12:25:51.406906108 +0000
@@ -20,10 +20,10 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
+# default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
# ----------------------------------------------------------------------------
-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
+runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
# ---------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: AvalonLogChute.java
Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: AvalonLogSystem.java
diff -ur velocity-1.6.3/src/java/org/apache/velocity/runtime/log/LogManager.java velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/log/LogManager.java
--- velocity-1.6.3/src/java/org/apache/velocity/runtime/log/LogManager.java 2009-12-07 23:41:24.000000000 +0000
+++ velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/log/LogManager.java 2010-01-15 12:25:51.407906304 +0000
@@ -119,7 +119,7 @@
* classes, and we use the first one we find.
*
* Note that the default value of this property contains the
- * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute,
+ * Log4JLogChute, CommonsLogLogChute,
* ServletLogChute, and the JdkLogChute for
* convenience - so we use whichever we works first.
*/
Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: VelocityFormatter.java

29
velocity-servletapi5.patch
View File

@ -1,29 +0,0 @@
--- velocity-1.6.3/src/test/org/apache/velocity/test/VelocityServletTestCase.java 2009-12-07 23:41:27.000000000 +0000
+++ velocity-1.6.3.mef/src/test/org/apache/velocity/test/VelocityServletTestCase.java 2010-01-15 13:03:56.465905895 +0000
@@ -250,6 +250,11 @@
public void setAttribute(String name, Object value)
{
}
+
+ public Set getResourcePath(String path)
+ {
+ return null;
+ }
}
static class MockHttpServletResponse implements HttpServletResponse
@@ -408,5 +413,14 @@
public void setStatus(int i , String s)
{
}
+
+ public void setCharacterEncoding(String charset)
+ {
+ }
+
+ public String getContentType()
+ {
+ return null;
+ }
}
}

41
velocity.spec
View File

@ -29,25 +29,23 @@
#
Name: velocity
Version: 1.6.4
Release: 3%{?dist}
Version: 1.7
Release: 1%{?dist}
Epoch: 0
Summary: Java-based template engine
License: ASL 2.0
URL: http://velocity.apache.org/
Source0: http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.tar.gz
Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
Patch0: velocity-remove-avalon-logkit.patch
Patch1: velocity-use-system-jars.patch
Patch2: velocity-servletapi5.patch
Patch3: velocity-cleanup-pom.patch
Patch4: velocity-tomcat6.patch
Patch0: 0001-Remove-avalon-logkit.patch
Patch1: 0002-Fix-servlet25-testcase.patch
Patch2: 0003-Use-system-jars.patch
Group: Development/Libraries
Requires: apache-commons-collections
Requires: apache-commons-logging
Requires: apache-commons-lang
Requires: tomcat6-servlet-2.5-api
Requires: oro
Requires: jakarta-oro
Requires: werken-xpath
Requires: junit
Requires: hsqldb
@ -67,7 +65,7 @@ BuildRequires: apache-commons-collections
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-lang
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: oro
BuildRequires: jakarta-oro
BuildRequires: jdom
BuildRequires: bcel
BuildRequires: log4j
@ -133,20 +131,18 @@ find . -name '*.jar' -o -name '*.class' -not -path '*test*' -print -delete
rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
cp %{SOURCE1} ./pom.xml
# remove rest of avalon logkit refences
%patch0 -p1
# Use system jars instead of downloading
# Fix test cases for servlet25
%patch1 -p1
#Apply patch to remove explicit dependency on servletapi3
# Use system jar files instead of downloading from net
%patch2 -p1
# Remove (unavailable) parent reference and avalon-logkit from POM
cp %{SOURCE1} ./pom.xml
%patch3 -p1
# fix test for servlet api 2.5
%patch4 -p1
# -----------------------------------------------------------------------------
@ -158,11 +154,11 @@ commons-lang \
commons-logging \
tomcat6-servlet-2.5-api \
junit \
oro \
jakarta-oro \
log4j \
jdom \
bcel \
werken.xpath \
werken-xpath \
hsqldb \
junit)
ant \
@ -176,7 +172,6 @@ sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list
# -----------------------------------------------------------------------------
%install
rm -rf %{buildroot}
# jars
install -d -m 755 %{buildroot}%{_javadir}
@ -188,7 +183,7 @@ cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
# data
install -d -m 755 %{buildroot}%{_datadir}/%{name}
cp -pr convert examples test %{buildroot}%{_datadir}/%{name}
cp -pr examples test %{buildroot}%{_datadir}/%{name}
# Maven metadata
install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
@ -228,6 +223,10 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/%{name}
%changelog
* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-1
- Update to latest version
- Drop old patches
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild