[Jpackage-commits] dist/velocity14/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 velocity-1.4.pom, NONE, 1.1 velocity14-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch, NONE, 1.1 velocity14-AnakiaTask-jdom-XMLOutputter.patch, NONE, 1.1 velocity14-build.patch, NONE, 1.1 velocity14-servletapi5.patch, NONE, 1.1 velocity14.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 22:13:01 CEST 2008


Update of /home/projects/jpackage/cvs/dist/velocity14/devel
In directory ryu.zarb.org:/tmp/cvs-serv18367/devel

Modified Files:
	.cvsignore sources 
Added Files:
	velocity-1.4.pom 
	velocity14-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch 
	velocity14-AnakiaTask-jdom-XMLOutputter.patch 
	velocity14-build.patch velocity14-servletapi5.patch 
	velocity14.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/velocity14/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 20:12:41 -0000	1.1
--- .cvsignore	28 May 2008 20:12:59 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ velocity-1.4.tar.gz

--- NEW FILE: velocity-1.4.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>velocity</groupId>
  <artifactId>velocity</artifactId>
  <name>Velocity</name>
  <version>1.4</version>
  <description>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.</description>
  <url>http://jakarta.apache.org/velocity/</url>
  <issueManagement>
    <url>http://nagoya.apache.org/scarab/servlet/scarab/</url>
  </issueManagement>
  <inceptionYear>2000</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Maven User List</name>
      <subscribe>velocity-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>velocity-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://www.mail-archive.com/velocity-user@jakarta.apache.org/</archive>
    </mailingList>
    <mailingList>
      <name>Maven Developer List</name>
      <subscribe>velocity-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>velocity-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://www.mail-archive.com/velocity-dev@jakarta.apache.org/</archive>
    </mailingList>
  </mailingLists>
  <scm>
    <connection>scm:cvs:pserver:anoncvs at cvs.apache.org:/home/cvspublic:jakarta-velocity</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</url>
  </scm>
  <organization>
    <name>Apache Software Foundation</name>
    <url>http://jakarta.apache.org/</url>
  </organization>

  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>

  <dependencies>
    <dependency>
      <groupId>velocity</groupId>
      <artifactId>velocity-dep</artifactId>
      <version>1.4</version>
      <scope>runtime</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-velocity/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/velocity/</url>
    </site>
  </distributionManagement>
</project>
--- NEW FILE: velocity14-AnakiaTask-jdom-XMLOutputter.patch ---
--- 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 );

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/velocity14/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 20:12:41 -0000	1.1
--- sources	28 May 2008 20:12:59 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ f280fee7ddb5eac5b354f6dea39a2f51  velocity-1.4.tar.gz

--- NEW FILE: velocity14-servletapi5.patch ---
--- velocity-1.4/src/java/org/apache/velocity/test/VelocityServletTest.java~	2004-04-14 13:26:41.000000000 +0100
+++ velocity-1.4/src/java/org/apache/velocity/test/VelocityServletTest.java	2005-06-06 11:54:53.000000000 +0100
@@ -22,6 +22,7 @@
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Properties;
+import java.util.Set;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
@@ -237,6 +238,16 @@
         public void setAttribute(String name, Object value)
         {
         }
+
+        public Set getResourcePaths(String path)
+        {
+            return null;
+        }
+
+        public String getServletContextName()
+        {
+            return null;
+        }
     }
 
     static class MockHttpServletResponse implements HttpServletResponse
@@ -391,5 +402,18 @@
         public void setStatus(int i , String s)
         {
         }
+
+	public void setCharacterEncoding(String charset)
+	{
+	}
+
+        public String getContentType()
+        {
+            return null;
+        }
+
+        public void resetBuffer()
+        {
+        }
     }
 }

--- NEW FILE: velocity14-build.patch ---
--- build/build.xml.sav	2008-02-10 22:30:13.000000000 +0100
+++ build/build.xml	2008-02-10 22:31:44.000000000 +0100
@@ -183,6 +183,7 @@
   <target name="compile" depends="prepare">
       
     <javac srcdir="${build.src}"
+      source="1.4"
       destdir="${build.dest}"
       debug="${debug}"
       deprecation="${deprecation}"
@@ -202,6 +203,7 @@
   <target name="compile-J2EE" depends="prepare, J2EE-error" if="J2EE.present">
       
     <javac srcdir="${build.src}"
+      source="1.4"
       destdir="${build.dest}"
       debug="${debug}"
       deprecation="${deprecation}"
@@ -422,6 +424,7 @@
                   :${example.dir}/logger_example
                   :${example.dir}/xmlapp_example
                   :${example.dir}/event_example"
+      source="1.4"
       debug="${debug}"
       deprecation="${deprecation}"
       optimize="${optimize}">
@@ -464,6 +467,7 @@
     <mkdir dir="${javadoc.destdir}"/>
     
     <javadoc
+      source="1.4"
       sourcepath="${build.src}"
       packagenames="org.apache.velocity.*"
       destdir="${javadoc.destdir}"
@@ -869,6 +873,7 @@
     <mkdir dir="${demo.lib}"/>
 
     <javac srcdir="${demo.src}"
+      source="1.4"
       destdir="${demo.dest}"
       debug="${debug}"
       deprecation="${deprecation}"

--- NEW FILE: velocity14.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section free
%define oname velocity


Name:           velocity14
Version:        1.4
Release:        7jpp
Epoch:          0
Summary:        Java-based template engine
License:        Apache Software License
Source0:        http://jakarta.apache.org/builds/jakarta-velocity/release/v1.4/velocity-1.4.tar.gz
Source1:        http://repo1.maven.org/maven2/velocity/velocity/1.4/velocity-1.4.pom
Patch0:		velocity14-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
Patch1:		velocity14-AnakiaTask-jdom-XMLOutputter.patch
Patch2:		velocity14-servletapi5.patch
Patch3:		velocity14-build.patch
URL:            http://jakarta.apache.org/velocity/
Group:          Development/Libraries/Java
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  antlr
BuildRequires:  junit
BuildRequires:  bcel
BuildRequires:  excalibur-avalon-logkit
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-oro
BuildRequires:  jdom >= 0:1.0-1
BuildRequires:  log4j >= 0:1.1
# Use servletapi5 instead of servletapi3
BuildRequires:  servletapi5
BuildRequires:	werken-xpath

Requires:       java >= 0:1.5.0
Requires:       bcel
Requires:       excalibur-avalon-logkit
Requires:       jakarta-commons-collections
Requires:       jakarta-oro
Requires:       jdom >= 0:1.0-1
Requires:       log4j >= 0:1.1
# Use servletapi5 instead of servletapi3
Requires:       servletapi5
Requires:	werken-xpath
Provides:       %{oname} = %{epoch}:%{version}-%{release}
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}

%if %{gcj_support}
BuildRequires:		java-gcj-compat-devel
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
%endif

Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4


%description
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.
Velocity's capabilities reach well beyond the realm of web sites; for
example, it can generate SQL and PostScript and XML (see Anakia for more
information on XML transformations) from templates. It can be used
either as a standalone utility for generating source code and reports,
or as an integrated component of other systems. Velocity also provides
template services for the Turbine web application framework.
Velocity+Turbine provides a template service that will allow web
applications to be developed according to a true MVC model.

%package        manual
Summary:        Manual for %{name}
Group:          Development/Libraries/Java

%description    manual
Documentation for %{name}.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):		%{__rm}
Requires(post):		/bin/ln
Requires(postun):	%{__rm}

%description    javadoc
Javadoc for %{name}.

%package        demo
Summary:        Demo for %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}

%if %{gcj_support}
BuildRequires:		java-gcj-compat-devel
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
%endif

%description    demo
Demonstrations and samples for %{name}.

%prep
%setup -q -n %{oname}-%{version}
# Remove all binary libs used in compiling the package.
# Note that velocity has some jar files containing macros under
# examples and test that should not be removed.
# find build -name '*.jar' -exec rm -f \{\} \;
for j in $(find . -name "*.jar" | grep -v /test/ | grep -v /examples/); do
    mv $j $j.no
done

%patch0 -b .sav0
%patch1 -b .sav1
#Apply patch to remove explicit dependency on servletapi3
%patch2 -p1
#Introduce source="1.4" for java5+ compile
%patch3 -b .sav3

%build
# Use servletapi5 instead of servletapi3 in CLASSPATH
export CLASSPATH=$(build-classpath \
antlr \
jakarta-commons-collections \
servletapi5 \
excalibur/avalon-logkit \
junit \
oro \
log4j \
jdom \
bcel \
werken-xpath)
ant \
  -buildfile build/build.xml \
  -Djunit.jar=%{_javadir}/junit.jar \
  -Dbuild.sysclasspath=first \
  jar javadocs test

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 bin/%{oname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%add_to_maven_depmap org.apache.velocity velocity %{version} JPP %{name}

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE1} \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -rf docs/api

# data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%post demo
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun demo
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%doc LICENSE NOTICE README.txt
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
%attr(-,root,root) %{_libdir}/gcj/%{name}/classloader.*
%endif

%files manual
%defattr(0644,root,root,0755)
%doc docs/*

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}

#FIXME: Generated by spec-convert-gcj-* script. These cant be natively compiled
#since they only contain *.vm files. Check if these are ignored in subsequent versions
#of spec-convert-gcj-* script.
#%if %{gcj_support}
#%attr(-,root,root) %{_libdir}/gcj/%{name}/template.jar.*
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test1.jar.*
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test2.jar.*
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test1.jar.*
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test2.jar.*
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test.jar.*
#%endif

%changelog
* Mon Feb 11 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.4-7jpp
- Rename and downgrade to 1.4 (maven-jxr wants it)
- Add pom and depmap frag

* Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-6jpp
- Add Requires(x) for javadoc subpackage.

* Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-5jpp
- Add conditional native compilation with GCJ.
- Apply patch (Gary Benson - Mon Jun 6 2005 - 0:1.4-3jpp_0fc) for 
  removing explicit dependency on servletapi3.
- Replace dependency on servletapi3 with servletapi5.
- Add NOTICE file as per Apache License version 2.0 
  (Gary Benson - Mon Jun 6 2005 - 0:1.4-3jpp_0fc).

* Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> 0:1.4-4jpp
- Replace avalon-logkit with current excalibur-avalon-logkit

* Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory
  by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java
  as well as using org.jdom.output.Format in AnakiaTask.java
- Therefore require jdom >= 0:1.0-1

* Thu Sep 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-2jpp
- Build with ant-1.6.2

* Mon Jun 07 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.4-1jpp
- 1.4 final
- Patch #0 is unnecessary (upstream)
- We have to build velocity against servletapi3

-* Wed Feb 18 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.4-0.rc1.2jpp
- Fix a few jpackage related .spec typos, oops.

* Wed Feb 18 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.4-0.rc1.1jpp
- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
  build problems.

* Sun May 25 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.3.1-2jpp
- Add Epochs to dependencies.
- Add explicit defattrs.
- Add non-versioned javadoc symlinks.
- Use sed instead of bash 2 extension when symlinking jars during build.
- Use full URL in Source.
- Fix -javadoc Group tag.
- Drop patch in favour of ant options.
- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests).

* Sat May 24 2003 Richard Bullington-McGuire <rbulling at pkrinternet.com> 1.3.1-1jpp
- 1.3.1 stable release

* Fri May 23 2003 Richard Bullington-McGuire <rbulling at pkrinternet.com> 1.3-1jpp
- 1.3 stable release
- Updated for JPackage 1.5
- Run JUnit regression tests as part of the build process
- Added patch file to fix test case classpath for JUnit standard locations

* Mon May 06 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.3-0.rc1.1jpp 
- 1.3.0rc1
- dropped patch
- versioned dir for javadoc
- no dependencies for manual and javadoc packages
- stricter dependency for demo package

* Wed Dec 12 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2-1jpp
- 1.2
- regenerated patch and corrected manifest
- requires and buildrequires jdom >= 1.0-0.b7.1

* Wed Dec 5 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1-4jpp
- javadoc into javadoc package

* Wed Nov 21 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.1-3jpp
- removed packager tag
- new jpp extension

* Thu Nov 1 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1-2jpp
- first unified release
- s/jPackage/JPackage

* Fri Sep 14 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1-1jpp
- first Mandrake release

--- NEW FILE: velocity14-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch ---
--- 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}




More information about the JPackage-commits mailing list