avatar
Rosa has added 594d3db483
Automatic import for version 1.6.4-2.fc15
... ... --- /dev/null
... ... +++ b/.abf.yml
... ... @@ -0,0 +1,2 @@
1
sources:
2
  "velocity-1.6.4.tar.gz": 624c244401065f02b1ce5772d14e58039a4a7d6a
view file @ 594d3db483
... ... --- /dev/null
... ... +++ b/velocity-1.6.4.pom
... ... @@ -0,0 +1,333 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!--
3
 Licensed to the Apache Software Foundation (ASF) under one
4
 or more contributor license agreements.  See the NOTICE file
5
 distributed with this work for additional information
6
 regarding copyright ownership.  The ASF licenses this file
7
 to you under the Apache License, Version 2.0 (the
8
 "License"); you may not use this file except in compliance
9
 with the License.  You may obtain a copy of the License at
10
11
   http://www.apache.org/licenses/LICENSE-2.0
12
13
 Unless required by applicable law or agreed to in writing,
14
 software distributed under the License is distributed on an
15
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16
 KIND, either express or implied.  See the License for the
17
 specific language governing permissions and limitations
18
 under the License.    
19
-->
20
<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">
21
22
  <modelVersion>4.0.0</modelVersion>
23
24
  <parent>
25
    <groupId>org.apache</groupId>
26
    <artifactId>apache</artifactId>
27
    <version>4</version>
28
  </parent>
29
30
  <groupId>org.apache.velocity</groupId>
31
  <artifactId>velocity</artifactId>
32
  <version>1.6.4</version>
33
34
  <name>Apache Velocity</name>
35
  <url>http://velocity.apache.org/engine/releases/velocity-1.6.2/</url>
36
  <description>Apache Velocity is a general purpose template engine.</description>
37
  <inceptionYear>2000</inceptionYear>
38
  <packaging>jar</packaging>
39
  
40
  <prerequisites>
41
      <maven>2.0.9</maven>
42
  </prerequisites>
43
44
  <build>
45
    <defaultGoal>install</defaultGoal>
46
    <sourceDirectory>src/java</sourceDirectory>
47
    <testSourceDirectory>src/test</testSourceDirectory>
48
    <plugins>
49
      <plugin>
50
        <groupId>org.apache.maven.plugins</groupId>
51
        <artifactId>maven-site-plugin</artifactId>
52
        <configuration>
53
          <inputEncoding>UTF-8</inputEncoding>
54
          <outputEncoding>UTF-8</outputEncoding>
55
          <xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
56
        </configuration>
57
      </plugin>
58
    </plugins>
59
    <resources>
60
      <resource>
61
        <directory>src/java</directory>
62
        <excludes>
63
          <exclude>**/*.java</exclude>
64
        </excludes>
65
      </resource>
66
    </resources>
67
  </build>
68
69
  <distributionManagement>
70
    <site>
71
      <id>velocity.apache.org</id>
72
      <url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.6.4/</url>
73
    </site>
74
    <repository>
75
      <id>apache.releases</id>
76
      <name>Apache Release Distribution Repository</name>
77
      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
78
    </repository>
79
    <snapshotRepository>
80
      <id>apache.snapshots</id>
81
      <name>Apache Development Snapshot Repository</name>
82
      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
83
    </snapshotRepository>
84
  </distributionManagement>
85
86
  <developers>
87
    <developer>
88
      <name>Will Glass-Husain</name>
89
      <id>wglass</id>
90
      <email>wglass@forio.com</email>
91
      <organization>Forio Business Simulations</organization>
92
      <roles>
93
        <role>Java Developer</role>
94
      </roles>
95
    </developer>
96
97
   <developer>
98
      <name>Geir Magnusson Jr.</name>
99
      <id>geirm</id>
100
      <email>geirm@optonline.net</email>
101
      <organization>Independent (DVSL Maven)</organization>
102
      <roles>
103
        <role>Java Developer</role>
104
      </roles>
105
    </developer>
106
107
    <developer>
108
      <name>Daniel Rall</name>
109
      <id>dlr</id>
110
      <email>dlr@finemaltcoding.com</email>
111
      <organization>CollabNet, Inc.</organization>
112
      <roles>
113
        <role>Java Developer</role>
114
      </roles>
115
    </developer>
116
117
    <developer>
118
      <name>Henning P. Schmiedehausen</name>
119
      <id>henning</id>
120
      <email>hps@intermeta.de</email>
121
      <organization>INTERMETA - Gesellschaft für Mehrwertdienste mbH</organization>
122
      <roles>
123
        <role>Java Developer</role>
124
      </roles>
125
      <timezone>2</timezone>
126
    </developer>
127
128
    <developer>
129
      <name>Nathan Bubna</name>
130
      <id>nbubna</id>
131
      <email>nathan@esha.com</email>
132
      <organization>ESHA Research</organization>
133
      <roles>
134
        <role>Java Developer</role>
135
      </roles>
136
    </developer>
137
138
  </developers>
139
140
  <dependencies>
141
    <dependency>
142
      <groupId>commons-collections</groupId>
143
      <artifactId>commons-collections</artifactId>
144
      <version>3.2.1</version>
145
    </dependency>
146
    <dependency>
147
      <groupId>commons-lang</groupId>
148
      <artifactId>commons-lang</artifactId>
149
      <version>2.4</version>
150
    </dependency>
151
    <dependency>
152
      <groupId>oro</groupId>
153
      <artifactId>oro</artifactId>
154
      <version>2.0.8</version>
155
    </dependency>
156
    <dependency>
157
      <groupId>jdom</groupId>
158
      <artifactId>jdom</artifactId>
159
      <version>1.0</version>
160
      <scope>provided</scope>
161
    </dependency>
162
    <dependency>
163
      <groupId>commons-logging</groupId>
164
      <artifactId>commons-logging</artifactId>
165
      <version>1.1</version>
166
      <scope>provided</scope>
167
      <exclusions>
168
        <exclusion>
169
          <groupId>avalon-framework</groupId>
170
          <artifactId>avalon-framework</artifactId>
171
        </exclusion>
172
        <exclusion>
173
          <groupId>log4j</groupId>
174
          <artifactId>log4j</artifactId>
175
        </exclusion>
176
        <exclusion>
177
          <groupId>javax.servlet</groupId>
178
          <artifactId>servlet-api</artifactId>
179
        </exclusion>
180
      </exclusions>
181
    </dependency>
182
    <dependency>
183
      <groupId>log4j</groupId>
184
      <artifactId>log4j</artifactId>
185
      <version>1.2.12</version>
186
      <scope>provided</scope>
187
    </dependency>
188
    <dependency>
189
      <groupId>javax.servlet</groupId>
190
      <artifactId>servlet-api</artifactId>
191
      <version>2.3</version>
192
      <scope>provided</scope>
193
    </dependency>
194
    <dependency>
195
      <groupId>logkit</groupId>
196
      <artifactId>logkit</artifactId>
197
      <version>2.0</version>
198
      <scope>provided</scope>
199
    </dependency>
200
    <dependency>
201
      <groupId>ant</groupId>
202
      <artifactId>ant</artifactId>
203
      <version>1.6</version>
204
      <scope>provided</scope>
205
    </dependency>
206
    <dependency>
207
      <groupId>werken-xpath</groupId>
208
      <artifactId>werken-xpath</artifactId>
209
      <version>0.9.4</version>
210
      <scope>provided</scope>
211
    </dependency>
212
    <dependency>
213
      <groupId>junit</groupId>
214
      <artifactId>junit</artifactId>
215
      <version>3.8.1</version>
216
      <scope>test</scope>
217
    </dependency>
218
    <dependency>
219
      <groupId>hsqldb</groupId>
220
      <artifactId>hsqldb</artifactId>
221
      <version>1.7.1</version>
222
      <scope>test</scope>
223
    </dependency>
224
  </dependencies>
225
226
  <reporting>
227
    <plugins>
228
      <plugin>
229
        <groupId>org.apache.maven.plugins</groupId>
230
        <artifactId>maven-project-info-reports-plugin</artifactId>
231
        <version>2.1</version>
232
        <reportSets>
233
          <reportSet>
234
            <reports>
235
              <report>dependencies</report>
236
              <report>issue-tracking</report>
237
              <report>license</report>
238
              <report>summary</report>
239
              <report>scm</report>
240
            </reports>
241
          </reportSet>
242
        </reportSets>
243
      </plugin>
244
      <plugin>
245
        <groupId>org.apache.maven.plugins</groupId>
246
        <artifactId>maven-changes-plugin</artifactId>
247
        <version>2.0</version>
248
        <reportSets>
249
          <reportSet>
250
            <reports>
251
              <report>changes-report</report>
252
              <report>jira-report</report>
253
            </reports>
254
          </reportSet>
255
        </reportSets>
256
        <configuration>
257
            <issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
258
          <!-- Apache JIRA, Component Engine -->
259
          <component>12311337</component>
260
          <!-- FixFor 1.6 -->
261
          <filter>fixfor=12310290&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
262
          <maxEntries>100</maxEntries>
263
          <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
264
        </configuration>
265
      </plugin>
266
      <plugin>
267
        <groupId>org.codehaus.mojo</groupId>
268
        <artifactId>taglist-maven-plugin</artifactId>
269
        <version>2.2</version>
270
        <configuration>
271
          <tag>TODO</tag>
272
          <tag>FIXME</tag>
273
        </configuration>
274
      </plugin>
275
      <plugin>
276
        <groupId>org.apache.maven.plugins</groupId>
277
        <artifactId>maven-jxr-plugin</artifactId>
278
        <version>2.1</version>
279
      </plugin>
280
      <plugin>
281
        <groupId>org.apache.maven.plugins</groupId>
282
        <artifactId>maven-javadoc-plugin</artifactId>
283
        <version>2.5</version>
284
        <configuration>
285
          <links>
286
            <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
287
            <link>http://jakarta.apache.org/oro/api</link>
288
            <link>http://jakarta.apache.org/commons/lang/api-release</link>
289
            <link>http://jakarta.apache.org/commons/collections/api-release</link>
290
291
            <link>http://www.jdom.org/docs/apidocs</link>
292
            <link>http://logging.apache.org/log4j/docs/api</link>
293
            <link>http://excalibur.apache.org/apidocs</link>
294
            <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi</link>
295
          </links>
296
        </configuration>
297
      </plugin>
298
      <plugin>
299
        <groupId>org.apache.maven.plugins</groupId>
300
        <artifactId>maven-changelog-plugin</artifactId>
301
        <version>2.1</version>
302
      </plugin>
303
      <plugin>
304
        <groupId>org.codehaus.mojo</groupId>
305
        <artifactId>findbugs-maven-plugin</artifactId>
306
        <version>1.2</version>
307
        <configuration>
308
          <xmlOutput>true</xmlOutput>
309
          <threshold>Low</threshold>
310
          <effort>Max</effort>
311
          <excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
312
          <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory> 
313
        </configuration>
314
      </plugin>
315
    </plugins>
316
  </reporting>
317
318
  <scm>
319
    <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x</connection>
320
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x</developerConnection>
321
    <tag>HEAD</tag>
322
    <url>http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x</url>
323
  </scm>
324
325
    <properties>
326
        <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
327
    </properties>
328
329
  <issueManagement>
330
    <system>JIRA</system>
331
    <url>${jira.browse.url}/VELOCITY</url>
332
  </issueManagement>
333
</project>
\ No newline at end of file
view file @ 594d3db483
... ... --- /dev/null
... ... +++ b/velocity-cleanup-pom.patch
... ... @@ -0,0 +1,35 @@
1
--- velocity-1.6.4/pom.xml.orig	2010-11-03 17:54:46.130858097 +0100
2
+++ velocity-1.6.4/pom.xml	2010-11-03 17:55:51.449631138 +0100
3
@@ -21,12 +21,6 @@
4
 
5
   <modelVersion>4.0.0</modelVersion>
6
 
7
-  <parent>
8
-    <groupId>org.apache</groupId>
9
-    <artifactId>apache</artifactId>
10
-    <version>4</version>
11
-  </parent>
12
-
13
   <groupId>org.apache.velocity</groupId>
14
   <artifactId>velocity</artifactId>
15
   <version>1.6.4</version>
16
@@ -192,12 +186,6 @@
17
       <scope>provided</scope>
18
     </dependency>
19
     <dependency>
20
-      <groupId>logkit</groupId>
21
-      <artifactId>logkit</artifactId>
22
-      <version>2.0</version>
23
-      <scope>provided</scope>
24
-    </dependency>
25
-    <dependency>
26
       <groupId>ant</groupId>
27
       <artifactId>ant</artifactId>
28
       <version>1.6</version>
29
@@ -330,4 +318,4 @@
30
     <system>JIRA</system>
31
     <url>${jira.browse.url}/VELOCITY</url>
32
   </issueManagement>
33
-</project>
34
\ No newline at end of file
35
+</project>
view file @ 594d3db483
... ... --- /dev/null
... ... +++ b/velocity-remove-avalon-logkit.patch
... ... @@ -0,0 +1,31 @@
1
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
2
--- velocity-1.6.3/src/java/org/apache/velocity/runtime/defaults/velocity.properties	2009-12-07 23:41:24.000000000 +0000
3
+++ velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/defaults/velocity.properties	2010-01-15 12:25:51.406906108 +0000
4
@@ -20,10 +20,10 @@
5
 # ----------------------------------------------------------------------------
6
 
7
 # ----------------------------------------------------------------------------
8
-#  default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
9
+#  default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
10
 # ----------------------------------------------------------------------------
11
 
12
-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
13
+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
14
 
15
 # ---------------------------------------------------------------------------
16
 # This is the location of the Velocity Runtime log.
17
Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: AvalonLogChute.java
18
Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: AvalonLogSystem.java
19
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
20
--- velocity-1.6.3/src/java/org/apache/velocity/runtime/log/LogManager.java	2009-12-07 23:41:24.000000000 +0000
21
+++ velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/log/LogManager.java	2010-01-15 12:25:51.407906304 +0000
22
@@ -119,7 +119,7 @@
23
          * classes, and we use the first one we find.
24
          *
25
          * Note that the default value of this property contains the
26
-         * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute,
27
+         * Log4JLogChute, CommonsLogLogChute,
28
          * ServletLogChute, and the JdkLogChute for
29
          * convenience - so we use whichever we works first.
30
          */
31
Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: VelocityFormatter.java
view file @ 594d3db483
... ... --- /dev/null
... ... +++ b/velocity-servletapi5.patch
... ... @@ -0,0 +1,29 @@
1
--- velocity-1.6.3/src/test/org/apache/velocity/test/VelocityServletTestCase.java	2009-12-07 23:41:27.000000000 +0000
2
+++ velocity-1.6.3.mef/src/test/org/apache/velocity/test/VelocityServletTestCase.java	2010-01-15 13:03:56.465905895 +0000
3
@@ -250,6 +250,11 @@
4
         public void setAttribute(String name, Object value)
5
         {
6
         }
7
+
8
+	public Set getResourcePath(String path)
9
+	{
10
+	    return null;
11
+	}
12
     }
13
 
14
     static class MockHttpServletResponse implements HttpServletResponse
15
@@ -408,5 +413,14 @@
16
         public void setStatus(int i , String s)
17
         {
18
         }
19
+
20
+        public void setCharacterEncoding(String charset)
21
+        {
22
+        }
23
+
24
+         public String getContentType()
25
+         {
26
+             return null;
27
+         }
28
     }
29
 }
view file @ 594d3db483
... ... --- /dev/null
... ... +++ b/velocity-tomcat6.patch
... ... @@ -0,0 +1,37 @@
1
From 8758e3c83411ffadc084d241217fc25f1fd31f42 Mon Sep 17 00:00:00 2001
2
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
3
Date: Thu, 14 Oct 2010 10:20:52 +0200
4
Subject: [PATCH] Fix test for servlet api 2.5
5
6
---
7
 .../velocity/test/VelocityServletTestCase.java     |    7 ++++++-
8
 1 files changed, 6 insertions(+), 1 deletions(-)
9
10
diff --git a/src/test/org/apache/velocity/test/VelocityServletTestCase.java b/src/test/org/apache/velocity/test/VelocityServletTestCase.java
11
index 824583e..ac0ab5c 100644
12
--- a/src/test/org/apache/velocity/test/VelocityServletTestCase.java
13
+++ b/src/test/org/apache/velocity/test/VelocityServletTestCase.java
14
@@ -16,7 +16,7 @@ package org.apache.velocity.test;
15
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16
  * KIND, either express or implied.  See the License for the
17
  * specific language governing permissions and limitations
18
- * under the License.    
19
+ * under the License.
20
  */
21
 
22
 import java.io.IOException;
23
@@ -149,6 +149,11 @@ public class VelocityServletTestCase extends TestCase
24
             return this;
25
         }
26
 
27
+        public String getContextPath()
28
+        {
29
+            return "";
30
+        }
31
+
32
         public String getServletContextName()
33
         {
34
             return "VelocityTestContext";
35
-- 
36
1.7.2.3
37
view file @ 594d3db483
... ... --- /dev/null
... ... +++ b/velocity-use-system-jars.patch
... ... @@ -0,0 +1,180 @@
1
--- velocity-1.6.3.mef/build/build.xml.orig	2010-01-15 12:53:01.344906711 +0000
2
+++ velocity-1.6.3.mef/build/build.xml	2010-01-15 12:53:07.537915055 +0000
3
@@ -138,28 +138,6 @@
4
   <!-- =================================================================== -->
5
   <!-- sets up the build environment (classpath and libs)                  -->
6
   <!-- =================================================================== -->
7
-  <target name="build-prepare">
8
-    <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
9
-
10
-    <!-- Build classpath -->
11
-    <path id="velocity.build.classpath">
12
-      <fileset dir="${build.lib}">
13
-        <include name="**/*.jar"/>
14
-      </fileset>
15
-    </path>
16
-
17
-    <!-- Test classpath, contains dependencies needed only for Testing -->
18
-    <path id="velocity.test.classpath">
19
-      <fileset dir="${build.test.lib}">
20
-        <include name="**/*.jar"/>
21
-      </fileset>
22
-    </path>
23
-
24
-    <path id="velocity.run.classpath">
25
-      <path refid="velocity.build.classpath"/>
26
-      <pathelement location="${build.dir}/${final.name}.jar"/>
27
-    </path>
28
-  </target>
29
 
30
   <!-- =================================================================== -->
31
   <!-- checks for the existence/non-existence of various java features     -->
32
@@ -172,12 +150,11 @@
33
   <target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
34
   <target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
35
 
36
-  <target name="check-jdbc" depends="build-prepare">
37
+  <target name="check-jdbc">
38
     <!--  note: check to see if required class is available.  -->
39
     <!-- might be j2ee.jar, jdbc2_0-stdext.jar, or simply JDK 1.4+ -->
40
     <available classname="javax.sql.DataSource"
41
                property="jdbc.present">
42
-      <classpath refid="velocity.build.classpath"/>
43
     </available>
44
   </target>
45
 
46
@@ -208,10 +185,9 @@
47
     </echo>
48
   </target>
49
 
50
-  <target name="check-jdk14" depends="build-prepare">
51
+  <target name="check-jdk14">
52
      <available classname="java.util.logging.Logger"
53
                property="jdk14.present">
54
-      <classpath refid="velocity.build.classpath"/>
55
     </available>
56
   </target>
57
 
58
@@ -246,7 +222,7 @@
59
   <!-- =================================================================== -->
60
   <target name="compile" depends="compile-src,compile-test"/>
61
 
62
-  <target name="compile-src" depends="prepare,build-prepare,check-jdbc,check-jdk14"
63
+  <target name="compile-src" depends="prepare,check-jdbc,check-jdk14"
64
           description="Compiles the Velocity source">
65
     <javac srcdir="${build.src}"
66
       destdir="${build.dest}"
67
@@ -255,8 +231,7 @@
68
       target="${javac.target}"
69
       source="${javac.source}"
70
       deprecation="${deprecation}"
71
-      optimize="${optimize}"
72
-      classpathref="velocity.build.classpath"/>
73
+      optimize="${optimize}"/>
74
 
75
     <copy todir="${build.dest}" filtering="yes">
76
       <fileset dir="${src.java.dir}">
77
@@ -266,7 +241,7 @@
78
 
79
   </target>
80
 
81
-  <target name="compile-test" depends="prepare,build-prepare,compile-src"
82
+  <target name="compile-test" depends="prepare,compile-src"
83
           description="Compiles the Velocity test classes">
84
     <javac srcdir="${build.test.src}"
85
       destdir="${build.test.dest}"
86
@@ -277,8 +252,6 @@
87
 
88
       <!-- Don't use the run classpath, build using the exploded class tree -->
89
       <classpath>
90
-        <path refid="velocity.build.classpath"/>
91
-        <path refid="velocity.test.classpath" />
92
         <pathelement location="${build.dest}"/>
93
       </classpath>
94
     </javac>
95
@@ -503,7 +476,7 @@
96
   <!-- =================================================================== -->
97
   <!-- Compiles the example code                                           -->
98
   <!-- =================================================================== -->
99
-  <target name="examples" depends="build-prepare,jar"
100
+  <target name="examples"
101
           description="Compiles the Velocity Example code">
102
 
103
     <echo>
104
@@ -527,8 +500,7 @@
105
       encoding="UTF-8"
106
       debug="${debug}"
107
       deprecation="${deprecation}"
108
-      optimize="${optimize}"
109
-      classpathref="velocity.run.classpath"/>
110
+      optimize="${optimize}"/>
111
   </target>
112
 
113
   <target name="examples-clean" depends="examples-clean-anakia">
114
@@ -546,7 +518,7 @@
115
   <!-- =================================================================== -->
116
   <!-- Creates the API documentation                                       -->
117
   <!-- =================================================================== -->
118
-  <target name="javadocs" depends="prepare,build-prepare"
119
+  <target name="javadocs" depends="prepare"
120
           description="Creates the Javadoc API documentation">
121
 
122
     <mkdir dir="${build.javadoc}"/>
123
@@ -562,8 +534,7 @@
124
              doctitle="${name} ${version} API"
125
              encoding="UTF-8"
126
              docencoding="UTF-8"
127
-             bottom="Copyright &#169; 2000-${build.year} &lt;a href=&quot;http://www.apache.org/&quot;&gt;Apache Software Foundation&lt;/a&gt;. All Rights Reserved."
128
-             classpathref="velocity.build.classpath">
129
+             bottom="Copyright &#169; 2000-${build.year} &lt;a href=&quot;http://www.apache.org/&quot;&gt;Apache Software Foundation&lt;/a&gt;. All Rights Reserved.">
130
 
131
       <link href="${javadocs.ref.jsdk}"/>
132
       <link href="http://www.jdom.org/docs/apidocs"/>
133
@@ -918,12 +889,11 @@
134
   <!-- Make HTML version of Velocity documentation                         -->
135
   <!-- =================================================================== -->
136
 
137
-  <target name="docs" depends="build-prepare,jar"
138
+  <target name="docs" depends="jar"
139
           description="Generates the Velocity HTML documentation">
140
 
141
     <taskdef name="anakia"
142
-             classname="org.apache.velocity.anakia.AnakiaTask"
143
-             classpathref="velocity.run.classpath"/>
144
+             classname="org.apache.velocity.anakia.AnakiaTask"/>
145
 
146
     <echo>
147
   #######################################################
148
@@ -1106,7 +1076,7 @@
149
   <!-- =================================================================== -->
150
   <!-- JUnit Tests for Velocity                                            -->
151
   <!-- =================================================================== -->
152
-  <target name="test" depends="build-prepare,compile-test"
153
+  <target name="test" depends="compile-test"
154
           description="Run the Velocity testcases">
155
 
156
     <mkdir dir="${build.test.reports}"/>
157
@@ -1120,8 +1090,6 @@
158
 
159
       <!-- Don't use the run classpath, test using the exploded class tree -->
160
       <classpath>
161
-        <path refid="velocity.build.classpath" />
162
-        <path refid="velocity.test.classpath" />
163
         <pathelement path="${build.dest}"/>
164
         <pathelement path="${build.test.dest}"/>
165
       </classpath>
166
--- velocity-1.6.3.mef/build/testcases.xml.orig	2010-01-15 13:09:06.265907075 +0000
167
+++ velocity-1.6.3.mef/build/testcases.xml	2010-01-15 13:09:08.356067618 +0000
168
@@ -36,12 +36,6 @@
169
 
170
   <!-- Build classpath -->
171
   <path id="velocity.test.classpath">
172
-    <fileset dir="${build.lib}">
173
-      <include name="**/*.jar"/>
174
-    </fileset>
175
-    <fileset dir="${build.test.lib}">
176
-      <include name="**/*.jar"/>
177
-    </fileset>
178
     <pathelement location="${build.dest}"/>
179
     <pathelement location="${build.test.dest}"/>
180
   </path>
... ... --- /dev/null
... ... +++ b/velocity.spec
... ... @@ -0,0 +1,398 @@
1
# Copyright (c) 2000-2005, JPackage Project
2
# All rights reserved.
3
#
4
# Redistribution and use in source and binary forms, with or without
5
# modification, are permitted provided that the following conditions
6
# are met:
7
#
8
# 1. Redistributions of source code must retain the above copyright
9
#    notice, this list of conditions and the following disclaimer.
10
# 2. Redistributions in binary form must reproduce the above copyright
11
#    notice, this list of conditions and the following disclaimer in the
12
#    documentation and/or other materials provided with the
13
#    distribution.
14
# 3. Neither the name of the JPackage Project nor the names of its
15
#    contributors may be used to endorse or promote products derived
16
#    from this software without specific prior written permission.
17
#
18
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29
#
30
31
Name:           velocity
32
Version:        1.6.4
33
Release:        2%{?dist}
34
Epoch:          0
35
Summary:        Java-based template engine
36
License:        ASL 2.0
37
URL:            http://velocity.apache.org/
38
Source0:        http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.tar.gz
39
Source1:        http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
40
Patch0:		velocity-remove-avalon-logkit.patch
41
Patch1:		velocity-use-system-jars.patch
42
Patch2:		velocity-servletapi5.patch
43
Patch3:		velocity-cleanup-pom.patch
44
Patch4:         velocity-tomcat6.patch
45
Group:          Development/Libraries
46
Requires:       apache-commons-collections
47
Requires:       apache-commons-logging
48
Requires:       apache-commons-lang
49
Requires:       tomcat6-servlet-2.5-api
50
Requires:       oro
51
Requires:	werken-xpath
52
Requires:       junit
53
Requires:       hsqldb
54
Requires:       jdom
55
Requires:       bcel
56
Requires:       log4j
57
Requires(post): jpackage-utils
58
Requires(postun): jpackage-utils
59
60
BuildRequires:	werken-xpath
61
BuildRequires:  ant
62
BuildRequires:  antlr
63
BuildRequires:  junit
64
BuildRequires:	ant-junit
65
BuildRequires:  hsqldb
66
BuildRequires:  apache-commons-collections
67
BuildRequires:  apache-commons-logging
68
BuildRequires:  apache-commons-lang
69
BuildRequires:  tomcat6-servlet-2.5-api
70
BuildRequires:  oro
71
BuildRequires:  jdom
72
BuildRequires:  bcel
73
BuildRequires:  log4j
74
BuildRequires:  jpackage-utils
75
76
# It fails one of the arithmetic test cases with gcj
77
BuildRequires:	java-devel >= 1:1.6.0
78
BuildArch:      noarch
79
80
%description
81
Velocity is a Java-based template engine. It permits anyone to use the
82
simple yet powerful template language to reference objects defined in
83
Java code.
84
When Velocity is used for web development, Web designers can work in
85
parallel with Java programmers to develop web sites according to the
86
Model-View-Controller (MVC) model, meaning that web page designers can
87
focus solely on creating a site that looks good, and programmers can
88
focus solely on writing top-notch code. Velocity separates Java code
89
from the web pages, making the web site more maintainable over the long
90
run and providing a viable alternative to Java Server Pages (JSPs) or
91
PHP.
92
Velocity's capabilities reach well beyond the realm of web sites; for
93
example, it can generate SQL and PostScript and XML (see Anakia for more
94
information on XML transformations) from templates. It can be used
95
either as a standalone utility for generating source code and reports,
96
or as an integrated component of other systems. Velocity also provides
97
template services for the Turbine web application framework.
98
Velocity+Turbine provides a template service that will allow web
99
applications to be developed according to a true MVC model.
100
101
%package        manual
102
Summary:        Manual for %{name}
103
Group:          Documentation
104
105
%description    manual
106
Documentation for %{name}.
107
108
%package        javadoc
109
Summary:        Javadoc for %{name}
110
Group:          Documentation
111
Requires:       jpackage-utils
112
113
%description    javadoc
114
Javadoc for %{name}.
115
116
%package        demo
117
Summary:        Demo for %{name}
118
Group:          Development/Libraries
119
Requires:       %{name} = %{epoch}:%{version}-%{release}
120
121
%description    demo
122
Demonstrations and samples for %{name}.
123
124
# -----------------------------------------------------------------------------
125
126
%prep
127
%setup -q -n %{name}-%{version}
128
129
# remove bundled libs/classes (except those used for testing)
130
find . -name '*.jar' -o -name '*.class' -not -path '*test*' -print -delete
131
132
# Remove dependency on avalon-logkit
133
rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
134
rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
135
rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
136
%patch0 -p1
137
138
# Use system jars instead of downloading
139
%patch1 -p1
140
141
#Apply patch to remove explicit dependency on servletapi3
142
%patch2 -p1
143
144
# Remove (unavailable) parent reference and avalon-logkit from POM
145
cp %{SOURCE1} ./pom.xml
146
%patch3 -p1
147
148
# fix test for servlet api 2.5
149
%patch4 -p1
150
151
# -----------------------------------------------------------------------------
152
153
%build
154
export CLASSPATH=$(build-classpath \
155
antlr \
156
apache-commons-collections \
157
commons-lang \
158
commons-logging \
159
tomcat6-servlet-2.5-api \
160
junit \
161
oro \
162
log4j \
163
jdom \
164
bcel \
165
werken.xpath \
166
hsqldb \
167
junit)
168
ant \
169
  -buildfile build/build.xml \
170
  -Dbuild.sysclasspath=first \
171
  jar javadocs test
172
173
# fix line-endings in generated files
174
sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list
175
176
# -----------------------------------------------------------------------------
177
178
%install
179
rm -rf %{buildroot}
180
181
# jars
182
install -d -m 755 %{buildroot}%{_javadir}
183
install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
184
185
# javadoc
186
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
187
cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
188
189
# data
190
install -d -m 755 %{buildroot}%{_datadir}/%{name}
191
cp -pr convert examples test %{buildroot}%{_datadir}/%{name}
192
193
# Maven metadata
194
install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
195
%add_to_maven_depmap org.apache.velocity %{name} %{version} JPP %{name}
196
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
197
198
# -----------------------------------------------------------------------------
199
200
%post
201
%update_maven_depmap
202
203
%postun
204
%update_maven_depmap
205
206
# -----------------------------------------------------------------------------
207
208
%files
209
%defattr(-,root,root,-)
210
%doc LICENSE NOTICE README.txt
211
%{_javadir}/*.jar
212
%{_mavendepmapfragdir}/*
213
%{_mavenpomdir}/*
214
215
%files manual
216
%defattr(-,root,root,-)
217
%doc LICENSE
218
%doc docs/*
219
220
%files javadoc
221
%defattr(-,root,root,-)
222
%doc LICENSE
223
%{_javadocdir}/%{name}
224
225
%files demo
226
%defattr(-,root,root,-)
227
%doc LICENSE
228
%{_datadir}/%{name}
229
230
%changelog
231
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-2
232
- Add compatibility depmap
233
234
* Wed Nov  3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
235
- Rebase to latest upstream
236
- Fix problems from bz#226525
237
238
* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
239
- Use apache-commons-collections instead of jakarta name
240
- Use tomcat6 for dependency instead of tomcat5 (bz#640660)
241
242
* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
243
- Fix BR/R for jakarta-commons-rename.
244
245
* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-3
246
- Get (Build)Requires right
247
248
* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-2
249
- Require all of the packages in the POM
250
- Add dist to version
251
252
* Fri Jan 15 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-1
253
- Update to 1.6.3
254
- Remove dependency on avalon-logkit
255
- Add maven metadata and pom
256
257
* Sun Jan 10 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-10.5
258
- Drop gcj_support.
259
- Fix groups and url.
260
- Use upstream tarball.
261
262
* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.4-10.4
263
- Convert specfile to UTF-8.
264
265
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-9.4
266
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
267
268
* Fri Apr 24 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0:1.4-8.4
269
- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
270
271
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-8.3
272
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
273
274
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7.3
275
- drop repotag
276
277
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7jpp.2
278
- fix license tag
279
280
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.4-7jpp.1
281
- Autorebuild for GCC 4.3
282
283
* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-6jpp.1
284
- Resync with latest from JPP.
285
- Partially adopt new naming convention.
286
287
* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_2fc
288
- Rebuilt
289
290
* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_1fc
291
- Merge with latest from JPP.
292
- Remove fileversion and my_version macros.
293
- Remove notexentests patch and replace with a patch to disable
294
- failure on tests.
295
296
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.4-3jpp_8fc
297
- Rebuilt
298
299
* Tue Jul 18 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.4-3jpp_7fc
300
- Build on all archs.
301
302
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_6fc
303
- rebuild
304
305
* Wed Mar  8 2006 Rafael Schloming <rafaels@redhat.com> - 0:1.4-3jpp_5fc
306
- excluded s390[x] and ppc64 due to eclipse
307
308
* Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.4-3jpp_4fc
309
- stop scriptlet spew
310
311
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_3fc
312
- rebuilt again
313
314
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_2fc
315
- rebuilt
316
317
* Tue Nov  8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.4-3jpp_1fc
318
- Converted from ISO-8859-1 to UTF-8
319
320
* Wed Jun 15 2005 Gary Benson <gbenson@redhat.com> 0:1.4-3jpp_1fc
321
- Build into Fedora.
322
323
* Thu Jun  9 2005 Gary Benson <gbenson@redhat.com>
324
- Remove jarfiles from the tarball.
325
326
* Mon Jun  6 2005 Gary Benson <gbenson@redhat.com>
327
- Build with servletapi5.
328
- Add NOTICE file as per Apache License version 2.0.
329
- Skip some failing tests.
330
331
* Mon Oct 18 2004 Fernando Nasser <fnasser@redhat.com> 0:1.4-3jpp_1rh
332
- First Red Hat build
333
334
* Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
335
- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory
336
  by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java
337
  as well as using org.jdom.output.Format in AnakiaTask.java
338
- Therefore require jdom >= 0:1.0-1
339
340
* Thu Sep 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-2jpp
341
- Build with ant-1.6.2
342
343
* Mon Jun 07 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-1jpp
344
- 1.4 final
345
- Patch #0 is unnecessary (upstream)
346
- We have to build velocity against servletapi3
347
348
* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
349
- Fix a few jpackage related .spec typos, oops.
350
351
* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.1jpp
352
- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
353
  build problems.
354
355
* Sun May 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.1-2jpp
356
- Add Epochs to dependencies.
357
- Add explicit defattrs.
358
- Add non-versioned javadoc symlinks.
359
- Use sed instead of bash 2 extension when symlinking jars during build.
360
- Use full URL in Source.
361
- Fix -javadoc Group tag.
362
- Drop patch in favour of ant options.
363
- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests).
364
365
* Sat May 24 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3.1-1jpp
366
- 1.3.1 stable release
367
368
* Fri May 23 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3-1jpp
369
- 1.3 stable release
370
- Updated for JPackage 1.5
371
- Run JUnit regression tests as part of the build process
372
- Added patch file to fix test case classpath for JUnit standard locations
373
374
* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp
375
- 1.3.0rc1
376
- dropped patch
377
- versioned dir for javadoc
378
- no dependencies for manual and javadoc packages
379
- stricter dependency for demo package
380
381
* Wed Dec 12 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-1jpp
382
- 1.2
383
- regenerated patch and corrected manifest
384
- requires and buildrequires jdom >= 1.0-0.b7.1
385
386
* Wed Dec 5 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-4jpp
387
- javadoc into javadoc package
388
389
* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.1-3jpp
390
- removed packager tag
391
- new jpp extension
392
393
* Thu Nov 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-2jpp
394
- first unified release
395
- s/jPackage/JPackage
396
397
* Fri Sep 14 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-1jpp
398
- first Mandrake release

Comments