debian/0000775000000000000000000000000012213561741007172 5ustar debian/patches/0000775000000000000000000000000012213557451010624 5ustar debian/patches/0005-increase-target-and-source-version-to-1.5.patch0000664000000000000000000000274712213554417021757 0ustar From: Debian Java Maintainers Date: Fri, 2 Sep 2011 22:28:09 +0200 Subject: increase target and source version to 1.5 --- build.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/build.xml b/build.xml index 325fdd8..57d5116 100755 --- a/build.xml +++ b/build.xml @@ -84,6 +84,12 @@ + + + + + + @@ -170,6 +176,8 @@ @@ -185,6 +193,8 @@ description="Compile unit test cases"> -- debian/patches/0001-fix-license-location.patch0000664000000000000000000000264012213554417016240 0ustar From: Debian Java Maintainers Date: Fri, 2 Sep 2011 22:28:09 +0200 Subject: fix license location --- build.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 96e0763..c0a248a 100755 --- a/build.xml +++ b/build.xml @@ -230,7 +230,7 @@ - @@ -242,7 +242,7 @@ description="Create jar"> - @@ -257,7 +257,7 @@ - -- debian/patches/0002-reduce-depends-of-javadoc-target.patch0000664000000000000000000000120312213554417020401 0ustar From: Debian Java Maintainers Date: Fri, 2 Sep 2011 22:28:09 +0200 Subject: reduce depends of javadoc target --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index c0a248a..325fdd8 100755 --- a/build.xml +++ b/build.xml @@ -207,7 +207,7 @@ description="Clean and compile all components"/> - -- debian/patches/0004-add-OSGi-metadata.patch0000664000000000000000000000215412213557451015335 0ustar From: Debian Java Maintainers Date: Fri, 2 Sep 2011 22:28:09 +0200 Subject: add OSGi metadata --- src/conf/MANIFEST.MF | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) --- a/src/conf/MANIFEST.MF +++ b/src/conf/MANIFEST.MF @@ -5,3 +5,16 @@ Implementation-Title: org.apache.commons.el Implementation-Vendor: Apache Software Foundation Implementation-Version: 1.0 +Import-Package: javax.servlet;version="3.0",javax.servlet.http;version + ="3.0",javax.servlet.jsp;version="2.2",javax.servlet.jsp.el;version=" + 2.2",javax.servlet.jsp.resources;version="2.2",javax.servlet.jsp.tage + xt;version="2.2",javax.servlet.resources;version="3.0" +Bundle-ManifestVersion: 2 +Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo + ns.el.parser;version="1.0.0" +Bundle-Version: 1.0.0.v200806031608 +Bundle-SymbolicName: org.apache.commons.el +Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 +Bundle-Localization: plugin +Bundle-Vendor: Apache Software Foundation debian/patches/series0000664000000000000000000000026512213554417012043 0ustar 0001-fix-license-location.patch 0002-reduce-depends-of-javadoc-target.patch 0003-rename-enum.patch 0004-add-OSGi-metadata.patch 0005-increase-target-and-source-version-to-1.5.patch debian/patches/0003-rename-enum.patch0000664000000000000000000000375112213554417014443 0ustar From: Debian Java Maintainers Date: Fri, 2 Sep 2011 22:28:09 +0200 Subject: rename enum --- .../org/apache/commons/el/ImplicitObjects.java | 8 ++++---- .../org/apache/commons/el/parser/ELParser.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/commons/el/ImplicitObjects.java b/src/java/org/apache/commons/el/ImplicitObjects.java index b58e4a4..7a33477 100644 --- a/src/java/org/apache/commons/el/ImplicitObjects.java +++ b/src/java/org/apache/commons/el/ImplicitObjects.java @@ -535,10 +535,10 @@ public class ImplicitObjects if (pKey instanceof String) { // Drain the header enumeration List l = new ArrayList (); - Enumeration enum = request.getHeaders ((String) pKey); - if (enum != null) { - while (enum.hasMoreElements ()) { - l.add (enum.nextElement ()); + Enumeration enum_ = request.getHeaders ((String) pKey); + if (enum_ != null) { + while (enum_.hasMoreElements ()) { + l.add (enum_.nextElement ()); } } String [] ret = (String []) l.toArray (new String [l.size ()]); diff --git a/src/java/org/apache/commons/el/parser/ELParser.java b/src/java/org/apache/commons/el/parser/ELParser.java index 4cc2f04..dbbd954 100644 --- a/src/java/org/apache/commons/el/parser/ELParser.java +++ b/src/java/org/apache/commons/el/parser/ELParser.java @@ -1838,8 +1838,8 @@ public class ELParser implements ELParserConstants { 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 enum_ = jj_expentries.elements(); enum_.hasMoreElements();) { + int[] oldentry = (int[])(enum_.nextElement()); if (oldentry.length == jj_expentry.length) { exists = true; for (int i = 0; i < jj_expentry.length; i++) { -- debian/rules0000775000000000000000000000205112213557074010254 0ustar #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2005 Arnaud Vandyck # based on the work of Stefan Gybas: # Copyright © 2003 Stefan Gybas # # Build commons-el # include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := servlet-api-3.0 jsp-api-2.2 junit DEB_ANT_BUILD_TARGET := jar-only javadoc # Additional options to pass to the Java virtual machine #ANT_OPTS := -verify * # Additional command-line arguments for Ant #ANT_ARGS := -verbose LIBRARY_PACKAGE := commons-el API_VERSION := 1.0 configure/lib$(LIBRARY_PACKAGE)-java:: mkdir -p target/classes mkdir -p dist install/lib$(LIBRARY_PACKAGE)-java:: install -m 644 dist/$(LIBRARY_PACKAGE).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar clean:: rm -fr target dist debian/watch0000664000000000000000000000014312213554417010223 0ustar version=2 http://www.apache.org/dist/commons/el/source/commons-el-(.*)-src\.tar\.gz debian uupdate debian/changelog0000664000000000000000000000570612213561270011051 0ustar libcommons-el-java (1.0-8) unstable; urgency=low * debian/control: - Updated Standards-Version to 3.9.4 (no changes) - Removed Michael Koch from the uploaders (Closes: #654054) - Use canonical URLs for the Vcs-* fields * Transition to libservlet3.0-java -- Emmanuel Bourg Tue, 10 Sep 2013 11:13:19 +0200 libcommons-el-java (1.0-7) unstable; urgency=low * Team upload. * Change Build-Depend-Indep: libservlet2.5-java. * Refresh patches and update OSGi metadata. * Remove Arnaud from Uploaders list. * Remove Java runtime from Depends. * Update Standards-Version: 3.9.1. * Fix the name of the doc-base Document. -- Torsten Werner Fri, 02 Sep 2011 22:38:06 +0200 libcommons-el-java (1.0-6) unstable; urgency=low * Set target version to 1.5. (Closes: #559323) * Bumped Standards-Version to 3.8.4 - no changes required. -- Niels Thykier Fri, 12 Feb 2010 20:00:14 +0100 libcommons-el-java (1.0-5) unstable; urgency=low [ Emmanuel Bourg ] * Update of the URLs * Rename Jakarta Commons to Apache Commons [ Niels Thykier ] * Added myself to uploaders. * Updated Build-Depends(-Indep). - Replace java-gcj-compat with default-jdk - Move default-jdk and ant to Build-Depends. * Made debian/rules respect errors. * Bumped debhelper compat to 7. * Bumped Standards-Version to 3.8.3: - Changed section to java. - Added Vcs-* fields. * Added more alternatives to java and changed to the -headless version of them. * Added missing ${misc:Depends}. * Imported patch from Ubuntu to fix FTBFS. - Thanks to Ilya Barygin for the patch. * Updated existing patches to be "quilt" appliable. * Imported patch from Fedora to add OSGi metadata. (Closes: #558180) * Converted source format to 3.0 (quilt). * Added descriptions to the patches. * Added doc-base for the javadoc. -- Niels Thykier Thu, 26 Nov 2009 23:53:34 +0100 libcommons-el-java (1.0-4) unstable; urgency=low * Use java-gcj-compat intead of kaffe. Closes: #399372. * Moved debhelper and cdbs to Build-Depends. * Use Homepage: field in debian/control instead of homepage url in long description. * Updated debhelper level to 5. * Removed Wolfgang and added myself to Uploaders. * Updated Standards-Version to 3.7.2. -- Michael Koch Sun, 07 Oct 2007 13:09:38 +0200 libcommons-el-java (1.0-3) unstable; urgency=low * kaffe compiler transition * Standards-Version 3.6.2 (no changes) * Bumped debhelper version to fix linda error * Added myself to uploaders -- Wolfgang Baer Sun, 15 Jan 2006 17:22:06 +0100 libcommons-el-java (1.0-2) unstable; urgency=low * libant1.6-java to ant transition -- Arnaud Vandyck Sat, 20 Aug 2005 19:48:07 +0200 libcommons-el-java (1.0-1) unstable; urgency=low * Initial Release. -- Arnaud Vandyck Tue, 1 Jul 2003 17:04:27 +0200 debian/doc-base0000664000000000000000000000052612213554417010577 0ustar Document: libcommons-el-java Title: Javadoc for Apache's JSP2.0 implementation Author: The Commons-El Team Abstract: Programming API for Apache's implemenation of JSP2.0 Expression Language interpreter. Section: Programming Format: HTML Index: /usr/share/doc/libcommons-el-java/api/index.html Files: /usr/share/doc/libcommons-el-java/api/* debian/source/0000775000000000000000000000000012213554417010474 5ustar debian/source/format0000664000000000000000000000001412213554417011702 0ustar 3.0 (quilt) debian/README.Debian0000664000000000000000000000023112213554417011231 0ustar libcommons-el-java for Debian ----------------------------- Nothing special ;) -- Arnaud Vandyck , Wed Jul 2 10:23:55 2003 debian/compat0000664000000000000000000000000212213554417010372 0ustar 7 debian/docs0000664000000000000000000000005412213554417010046 0ustar RELEASE-NOTES.txt PROPOSAL.html dist/docs/* debian/copyright0000664000000000000000000000547412213554417011141 0ustar This package was debianized by Arnaud Vandyck on Tue, 1 Jul 2003 17:04:27 +0200. It was downloaded from http://commons.apache.org/el Upstream Authors: Nathan Abramson Shawn Bayern Pierre Delisle Craig McClanahan Jan Luehe Copyright: The Apache Software License, Version 1.1 Copyright (c) 1999-2002 The Apache Software Foundation. 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. The end-user documentation included with the redistribution, if any, must include the following acknowlegement: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowlegement may appear in the software itself, if and wherever such third-party acknowlegements normally appear. 4. The names "The Jakarta Project", "Commons", and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org. 5. Products derived from this software may not be called "Apache" nor may "Apache" appear in their names without prior written permission of the Apache Group. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS 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. ==================================================================== This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see . debian/dirs0000664000000000000000000000001712213554417010056 0ustar usr/share/java debian/ant.properties0000664000000000000000000000015012213557316012071 0ustar jsp-api.jar=/usr/share/java/servlet-3.0.jar junit.jar=/usr/share/java/junit.jar build.sysclasspath=only debian/control0000664000000000000000000000174012213557131010575 0ustar Source: libcommons-el-java Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: Niels Thykier , Emmanuel Bourg Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant Build-Depends-Indep: junit (>= 3.8.1), libservlet3.0-java Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-el-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-el-java Homepage: http://commons.apache.org/el/ Package: libcommons-el-java Architecture: all Depends: libservlet3.0-java, ${misc:Depends} Description: Implementation of the JSP 2.0 Expression Language interpreter The JSP 2.0 specification provides a portable API for evaluating "EL Expressions": The classes and interfaces in the javax.servlet.jsp.el package describe and define programmatic access to the Expression Language evaluator. This package is an implementation of the API.