[pkg-java] r8931 - in trunk/velocity/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Jul 7 23:06:34 UTC 2009
Author: ludovicc-guest
Date: 2009-07-07 23:06:34 +0000 (Tue, 07 Jul 2009)
New Revision: 8931
Added:
trunk/velocity/debian/MANIFEST.MF
trunk/velocity/debian/patches/build.patch
trunk/velocity/debian/patches/series
trunk/velocity/debian/velocity.links
Removed:
trunk/velocity/debian/patches/01_RemoveMailConfiguration.patch
trunk/velocity/debian/patches/02_VelocityServletTest_Servlet2.3_Compatibility.patch
trunk/velocity/debian/patches/03_testcases_runtime.patch
trunk/velocity/debian/patches/04_buildxml.patch
trunk/velocity/debian/velocity-ant.links
Modified:
trunk/velocity/debian/README.Debian
trunk/velocity/debian/antlib.xml
trunk/velocity/debian/build.properties
trunk/velocity/debian/changelog
trunk/velocity/debian/control
trunk/velocity/debian/rules
trunk/velocity/debian/velocity-doc.docs
Log:
* New version
Added: trunk/velocity/debian/MANIFEST.MF
===================================================================
--- trunk/velocity/debian/MANIFEST.MF (rev 0)
+++ trunk/velocity/debian/MANIFEST.MF 2009-07-07 23:06:34 UTC (rev 8931)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 14.0-b08 (Sun Microsystems Inc.)
+Class-Path: /usr/share/java/jdom1.jar /usr/share/java/commons-collections3.jar
+ /usr/share/java/logkit.jar /usr/share/java/werken.xpath.jar
+ /usr/share/java/commons-lang.jar /usr/share/java/commons-logging.jar
+
Modified: trunk/velocity/debian/README.Debian
===================================================================
--- trunk/velocity/debian/README.Debian 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/README.Debian 2009-07-07 23:06:34 UTC (rev 8931)
@@ -13,3 +13,25 @@
Their symlinks are created to /usr/share/ant/lib.
-- Takashi Okamoto <tora at debian.org>, Wed, 15 Aug 2001 08:57:18 +0900
+
+velocity.jar provides the following Ant tasks: anakia and texen.
+Those Ant tasks are made available under the following Antlib namespace:
+xmlns:velocity="antlib:org.apache.velocity"
+
+The following project is an example using the anakia task:
+
+<project name="myproject" xmlns:velocity="antlib:org.apache.velocity">
+
+ <!-- example use of the anakia task -->
+ <velocity:anakia basedir="xdocs/docs" destdir="build/docs"
+ extension=".html" style="site.vsl"
+ projectFile="../stylesheets/project.xml"
+ includes="**/*.xml"
+ lastModifiedCheck="true"
+ templatePath="xdocs/stylesheets">
+ </velocity:anakia>
+</project>
+
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 07 Jul 2009 13:24:03 +0100
+
Modified: trunk/velocity/debian/antlib.xml
===================================================================
--- trunk/velocity/debian/antlib.xml 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/antlib.xml 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<antlib>
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"
- classpath="/usr/share/java/commons-collections3.jar:usr/share/java/logkit.jar:usr/share/java/jdom1.jar:usr/share/java/werken.xpath.jar" />
- <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask"
- classpath="/usr/share/java/commons-collections3.jar:usr/share/java/logkit.jar" />
+ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask" />
+ <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask" />
</antlib>
Modified: trunk/velocity/debian/build.properties
===================================================================
--- trunk/velocity/debian/build.properties 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/build.properties 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,5 +1,7 @@
maven.test.skip=true
+build.directory=target
build.sourceDirectory=src/java
-build.resourcesDirectory=src/java
+build.resourcesDirectory=src/resources
build.testSourceDirectory=src/test
-javadoc.dir=build/docs/api
+javadoc.dir=target/docs/api
+manifest=debian/MANIFEST.MF
Modified: trunk/velocity/debian/changelog
===================================================================
--- trunk/velocity/debian/changelog 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/changelog 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,7 +1,7 @@
velocity (1.6.2-1) unstable; urgency=low
* New upstream version, add myself to Uploaders
- * Change section to java, bump up Standards-Version to 3.8.1
+ * Change section to java, bump up Standards-Version to 3.8.2
* Bump up debhelper to 6
* Move debhelper and cdbs from Build-Depends-Indep to Build-Depends to
clear Lintian error
@@ -10,18 +10,17 @@
instead of kaffe | java1-runtime | java2-runtime for velocity Depends:
* Update from libjdom0-java to libjdom1-java (Closes: #500536)
* Update from libcommons-collections-java to libcommons-collections3-java
+ * Add quilt to Build-Depends and use it to patch build.xml file to avoid
+ downloading jar files from the internet while building the documentation
* Add a dependency on libcommons-lang-java, libcommons-logging-java,
liboro-java
* Update from libservlet2.3-java to libservlet2.5-java
* Move liblogkit-java, liblog4j1.2-java, libservlet2.5-java, ant,
libwerken.xpath-java from Depends to Recommends (Closes: #532640)
- * Create a new velocity-ant package that holds the links to install under
- /usr/share/ant/lib, thus avoiding touching Ant every time Velocity is
- installed. (Closes: #506018)
- * Remove logkit.jar, jdom1.jar, commons-collections3.jar and
- werken.xpath.jar from /usr/share/ant/lib as the Antlib-defined tasks
- have their own classpath (using libraries in /usr/share/java) and
- don't need those shared Ant libraries anymore. (Closes: #506018)
+ * Create a antlib definition for the tasks anakia and texen, and add
+ the classpath information to the manifest in velocity.jar . This
+ removes the need to install jar links under /usr/share/ant/lib, which
+ have been removed except for the link to velocity.jar. (Closes: #506018)
* Add watch file
* Remove all patches as they don't apply anymore and seem irrelevent now
* Add the Maven POM to the package,
@@ -38,7 +37,7 @@
* Update of the URLs
* Rename Jakarta Commons to Apache Commons
- -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 10 May 2009 13:24:03 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 07 Jul 2009 13:24:03 +0100
velocity (1.4-5) unstable; urgency=low
Modified: trunk/velocity/debian/control
===================================================================
--- trunk/velocity/debian/control 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/control 2009-07-07 23:06:34 UTC (rev 8931)
@@ -4,12 +4,12 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>,
Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 6), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+Build-Depends: debhelper (>= 6), cdbs, default-jdk, quilt
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 5), ant, ant-optional,
junit, liblogkit-java, libservlet2.5-java,
liblog4j1.2-java, libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java,
- libwerken.xpath-java, libbcel-java, liboro-java
-Standards-Version: 3.8.1
+ libwerken.xpath-java, liboro-java
+Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/velocity
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/velocity
Homepage: http://velocity.apache.org/
@@ -17,9 +17,9 @@
Package: velocity
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless,
- libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java,
- liboro-java, libbcel-java, libxerces2-java
-Recommends: velocity-ant, liblogkit-java, liblog4j1.2-java, libservlet2.5-java, libwerken.xpath-java
+ libcommons-lang-java, libcommons-collections3-java, liboro-java
+Recommends: ant, libcommons-logging-java, liblogkit-java, liblog4j1.2-java,
+ libservlet2.5-java, libjdom1-java, libwerken.xpath-java, libxerces2-java
Suggests: velocity-doc
Description: Java-based template engine for web application
Velocity is a Java-based template engine. It permits anyone to use
@@ -34,26 +34,6 @@
the long run and providing a viable alternative to Java Server Pages
(JSPs) or PHP.
-Package: velocity-ant
-Architecture: all
-Depends: ${misc:Depends}, ant, velocity, liblogkit-java, libwerken.xpath-java
-Description: Java-based template engine for web application
- Velocity is a Java-based template engine. It permits anyone to use
- the simple yet powerful template language to reference objects
- defined in Java code.
- When Velocity is used for web development, Web designers can work in
- parallel with Java programmers to develop web sites according to the
- Model-View-Controller (MVC) model, meaning that web page designers
- can focus solely on creating a site that looks good, and programmers
- can focus solely on writing top-notch code. Velocity separates Java
- code from the web pages, making the web site more maintainable over
- the long run and providing a viable alternative to Java Server Pages
- (JSPs) or PHP.
- .
- This package provides the following Ant tasks: anakia and texen.
- Those Ant tasks are made available under the following Antlib namespace:
- xmlns:velocity="antlib:org.apache.velocity"
-
Package: velocity-doc
Architecture: all
Section: doc
Deleted: trunk/velocity/debian/patches/01_RemoveMailConfiguration.patch
===================================================================
--- trunk/velocity/debian/patches/01_RemoveMailConfiguration.patch 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/patches/01_RemoveMailConfiguration.patch 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,18 +0,0 @@
---- src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java.orig 2005-03-20 14:41:33.891187784 +0100
-+++ src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java 2005-03-20 14:17:27.003148200 +0100
-@@ -190,6 +190,7 @@
- private void configureEmail()
- throws Exception
- {
-+/*
- String smtpHost =
- rsvc.getString(RuntimeConstants.LOGSYSTEM_LOG4J_EMAIL_SERVER);
- String emailFrom =
-@@ -222,6 +223,7 @@
- appender.setLayout(layout);
- appender.activateOptions();
- logger.addAppender(appender);
-+*/
- }
-
- /**
Deleted: trunk/velocity/debian/patches/02_VelocityServletTest_Servlet2.3_Compatibility.patch
===================================================================
--- trunk/velocity/debian/patches/02_VelocityServletTest_Servlet2.3_Compatibility.patch 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/patches/02_VelocityServletTest_Servlet2.3_Compatibility.patch 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,32 +0,0 @@
---- src/java/org/apache/velocity/test/VelocityServletTest.java.orig 2005-04-19 16:10:50.000000000 +0200
-+++ src/java/org/apache/velocity/test/VelocityServletTest.java 2005-04-19 15:14:57.000000000 +0200
-@@ -130,7 +130,17 @@
- }
-
- static class MockServletContext implements ServletContext
-- {
-+ {
-+ public String getServletContextName()
-+ {
-+ return null;
-+ }
-+
-+ public java.util.Set getResourcePaths(String str)
-+ {
-+ return null;
-+ }
-+
- public Object getAttribute(String ignored)
- {
- return null;
-@@ -290,6 +300,10 @@
-
- public void setContentLength(int i)
- {
-+ }
-+
-+ public void resetBuffer()
-+ {
- }
-
- /**
Deleted: trunk/velocity/debian/patches/03_testcases_runtime.patch
===================================================================
--- trunk/velocity/debian/patches/03_testcases_runtime.patch 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/patches/03_testcases_runtime.patch 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,33 +0,0 @@
---- build/testcases.xml.orig 2005-04-20 17:18:13.000000000 +0200
-+++ build/testcases.xml 2005-04-20 17:16:48.000000000 +0200
-@@ -17,10 +17,15 @@
-
- <!-- Build classpath -->
- <path id="classpath">
-- <fileset dir="./lib">
-- <include name="**/*.jar"/>
-- </fileset>
-- <pathelement location="${build.dest}"/>
-+ <pathelement location="${build.dest}"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
-+ <pathelement location="/usr/share/java/commons-collections.jar"/>
-+ <pathelement location="/usr/share/java/werken.xpath.jar"/>
-+ <pathelement location="/usr/share/java/bcel.jar"/>
-+ <pathelement location="/usr/share/java/servlet-2.3.jar"/>
-+ <pathelement location="/usr/share/java/jdom0.jar"/>
-+ <pathelement location="/usr/share/java/logkit.jar"/>
-+ <pathelement location="/usr/share/java/oro.jar"/>
- </path>
-
- <!-- =================================================================== -->
-@@ -197,7 +202,9 @@
- </target>
-
- <target name="test-anakia">
-- <echo message="Running Anakia tests..."/>
-+ <echo message="Running Anakia tests..."/>
-+ <!-- needed to get the test running -->
-+ <mkdir dir="${test.home}/anakia/results"/>
-
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath>
Deleted: trunk/velocity/debian/patches/04_buildxml.patch
===================================================================
--- trunk/velocity/debian/patches/04_buildxml.patch 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/patches/04_buildxml.patch 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,36 +0,0 @@
---- build/build.xml.orig 2005-04-19 16:15:53.000000000 +0200
-+++ build/build.xml 2005-04-19 16:21:36.000000000 +0200
-@@ -186,7 +186,7 @@
- destdir="${build.dest}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}" target="1.3">
-
- <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java"/>
-
-@@ -205,7 +205,7 @@
- destdir="${build.dest}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}" target="1.3">
-
- <classpath refid="classpath"/>
- </javac>
-@@ -292,6 +292,7 @@
- <fileset dir="${build.dest}">
- <exclude name="**/package.html"/>
- <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
-+ <exclude name="org/apache/velocity/test/**"/>
- </fileset>
-
- </jar>
-@@ -466,6 +467,7 @@
- <javadoc
- sourcepath="${build.src}"
- packagenames="org.apache.velocity.*"
-+ excludepackagenames="org.apache.velocity.test.*"
- destdir="${javadoc.destdir}"
- author="true"
- private="true"
Added: trunk/velocity/debian/patches/build.patch
===================================================================
--- trunk/velocity/debian/patches/build.patch (rev 0)
+++ trunk/velocity/debian/patches/build.patch 2009-07-07 23:06:34 UTC (rev 8931)
@@ -0,0 +1,30 @@
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -139,7 +139,6 @@
+ <!-- sets up the build environment (classpath and libs) -->
+ <!-- =================================================================== -->
+ <target name="build-prepare">
+- <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
+
+ <!-- Build classpath -->
+ <path id="velocity.build.classpath">
+@@ -918,7 +917,7 @@
+ <!-- Make HTML version of Velocity documentation -->
+ <!-- =================================================================== -->
+
+- <target name="docs" depends="build-prepare,jar"
++ <target name="docs" depends="build-prepare"
+ description="Generates the Velocity HTML documentation">
+
+ <taskdef name="anakia"
+--- a/build/build.properties
++++ b/build/build.properties
+@@ -35,7 +35,7 @@
+
+ velocity.build.dir= build
+
+-build.dir= ${velocity.dir}/bin
++build.dir= ${velocity.dir}/target
+
+ # The source tree runs through a filter copy task to
+ # allow substitution of version, date etc. and will
Added: trunk/velocity/debian/patches/series
===================================================================
--- trunk/velocity/debian/patches/series (rev 0)
+++ trunk/velocity/debian/patches/series 2009-07-07 23:06:34 UTC (rev 8931)
@@ -0,0 +1 @@
+build.patch
Modified: trunk/velocity/debian/rules
===================================================================
--- trunk/velocity/debian/rules 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/rules 2009-07-07 23:06:34 UTC (rev 8931)
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
@@ -16,12 +17,28 @@
-rm -rf debian/tmp
makebuilddir/velocity::
- install -d build/classes/org/apache/velocity
- install -m 644 debian/antlib.xml build/classes/org/apache/velocity/antlib.xml
+ install -d src/resources/org/apache/velocity/runtime/defaults
+ install -m 644 src/java/org/apache/velocity/runtime/defaults/directive.properties src/resources/org/apache/velocity/runtime/defaults/directive.properties
+ install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties src/resources/org/apache/velocity/runtime/defaults/velocity.properties
+ install -m 644 debian/antlib.xml src/resources/org/apache/velocity/antlib.xml
+ install -d target/lib
+ install -m 644 /usr/share/java/logkit.jar target/lib/
+ install -m 644 /usr/share/java/commons-collections3.jar target/lib/
+ install -m 644 /usr/share/java/commons-lang.jar target/lib/
+ install -m 644 /usr/share/java/commons-logging.jar target/lib/
+ install -m 644 /usr/share/java/jdom1.jar target/lib/
+ install -m 644 /usr/share/java/log4j-1.2.jar target/lib/
+ install -m 644 /usr/share/java/oro.jar target/lib/
+ install -m 644 /usr/share/java/werken.xpath.jar target/lib/
+build/velocity-doc::
+ cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ $(ANT_OPTS) -Dant.home=$(ANT_HOME) -Dbuild.docs=target/docs \
+ org.apache.tools.ant.Main -buildfile $(CURDIR)/build/build.xml docs
+
install/velocity::
mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l pom.xml build/$(PACKAGE)-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l pom.xml target/$(PACKAGE)-$(VERSION).jar
install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties debian/velocity/etc/velocity
get-orig-source:
Deleted: trunk/velocity/debian/velocity-ant.links
===================================================================
--- trunk/velocity/debian/velocity-ant.links 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/velocity-ant.links 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,2 +0,0 @@
-usr/share/java/velocity.jar usr/share/ant/lib/velocity.jar
-
Modified: trunk/velocity/debian/velocity-doc.docs
===================================================================
--- trunk/velocity/debian/velocity-doc.docs 2009-07-07 22:51:56 UTC (rev 8930)
+++ trunk/velocity/debian/velocity-doc.docs 2009-07-07 23:06:34 UTC (rev 8931)
@@ -1,21 +1,5 @@
-build/docs/api
-docs/anakia.html
-docs/code-standards.html
-docs/contributors.html
-docs/design.html
-docs/developer-guide.html
-docs/differences.html
-docs/getting-started.html
-docs/index.html
-docs/install.html
-docs/license.html
-docs/migration.html
-docs/specification-ast.html
-docs/specification-bnf.html
-docs/specification.html
-docs/texen.html
-docs/todo.html
-docs/user-guide.html
-docs/vtl-reference-guide.html
-docs/images
-docs/ymtd
\ No newline at end of file
+target/docs/api
+target/docs/*.html
+target/docs/*.css
+target/docs/images
+target/docs/translations
Added: trunk/velocity/debian/velocity.links
===================================================================
--- trunk/velocity/debian/velocity.links (rev 0)
+++ trunk/velocity/debian/velocity.links 2009-07-07 23:06:34 UTC (rev 8931)
@@ -0,0 +1,2 @@
+usr/share/java/velocity.jar usr/share/ant/lib/velocity.jar
+
More information about the pkg-java-commits
mailing list