debian/0000775000000000000000000000000012001011213007145 5ustar debian/rules0000775000000000000000000000142112001011156010231 0ustar #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/el-api-2.2.jar DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p') MAVEN_REPO := http://repo1.maven.org/maven2 %: dh $@ --with maven_repo_helper,javahelper override_dh_auto_build: ant -propertyfile debian/ant.properties -f standard/build.xml get-orig-source: uscan --force-download --rename get-orig-pom: mkdir -p debian/poms wget -U NoSuchBrowser/1.0 -O debian/poms/jstl.pom \ $(MAVEN_REPO)/javax/servlet/jstl/$(DEB_UPSTREAM_VERSION)/jstl-$(DEB_UPSTREAM_VERSION).pom wget -U NoSuchBrowser/1.0 -O debian/poms/standard.pom \ $(MAVEN_REPO)/taglibs/standard/$(DEB_UPSTREAM_VERSION)/standard-$(DEB_UPSTREAM_VERSION).pom debian/poms/0000775000000000000000000000000011770243143010150 5ustar debian/poms/jstl.pom0000664000000000000000000000054611770243143011646 0ustar 4.0.0 javax.servlet jstl 1.1.2 javax.servlet jsp-api 2.0 provided debian/poms/standard.pom0000664000000000000000000000022511770177434012475 0ustar 4.0.0 taglibs standard 1.1.2 debian/libjstl1.1-java.classpath0000664000000000000000000000013111770243143013673 0ustar usr/share/java/jstl1.1.jar servlet-api-2.5.jar jsp-api-2.1.jar el-api-2.1.jar xalan2.jar debian/maven.rules0000664000000000000000000000015211770243143011352 0ustar # Remap JSTL to 1.1 as this is the version of the API # Implemented javax.servlet jstl jar s/.*/1.1/ * * debian/control0000664000000000000000000000314312001011115010552 0ustar Source: jakarta-taglibs-standard Section: java Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Onkar Shinde , James Page Build-Depends: ant, debhelper (>= 7.0.50~), javahelper, maven-repo-helper (>= 1.5~) Build-Depends-Indep: default-jdk, libservlet3.0-java, libxalan2-java Standards-Version: 3.9.3 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/git/pkg-java/jakarta-taglibs-standard.git Vcs-Browser: http://git.debian.org/?p=pkg-java/jakarta-taglibs-standard.git Homepage: http://tomcat.apache.org/taglibs/standard/ Package: libjakarta-taglibs-standard-java Architecture: all Depends: ${java:Depends}, ${misc:Depends} Description: Implementation of JSP Standard Tag Library (JSTL) JSTL can be used to embed logic in JSP pages without using embedded java code. Various tags are defined for common tasks such as conditional execution, loops, internationalization, XML processing etc. . This package is Apache implementation of JSTL specification. Package: libjstl1.1-java Architecture: all Depends: ${java:Depends}, ${misc:Depends} Description: JSP Standard Tag Library API v1.1 Reference Implementation JSTL can be used to embed logic in JSP pages without using embedded java code. Various tags are defined for common tasks such as conditional execution, loops, internationalization, XML processing etc. . This package is the reference implementation of JSTL 1.1 specification based on Jakarta taglibs standard.. debian/copyright0000664000000000000000000000074711770243143011135 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: jakarta-taglibs-standard Source: http://tomcat.apache.org/taglibs/standard/ Files: * Copyright: 1999-2004, The Apache Software Foundation License: Apache-2.0 Files: debian/* Copyright: 2010, Onkar Shinde License: Apache-2.0 License: Apache-2.0 On Debian systems the full text of the Apache-2.0 license can be found in the `/usr/share/common-licenses/Apache-2.0' file. debian/libjakarta-taglibs-standard-java.poms0000664000000000000000000000014111770177434016343 0ustar debian/poms/standard.pom --java-lib --artifact=standard/build/standard/standard/lib/standard.jar debian/orig-tar.sh0000775000000000000000000000040311770243143011252 0ustar #!/bin/sh -e # called by uscan with '--upstream-version' DIR=jakarta-taglibs-standard-$2 TAR=../jakarta-taglibs-standard_$2.orig.tar.gz # clean up the upstream tarball tar zxvf $3 mv $DIR-src $DIR tar -c -z -f $TAR $DIR rm -rf $DIR exit 0 debian/watch0000664000000000000000000000021411770243143010220 0ustar version=3 http://archive.apache.org/dist/jakarta/taglibs/standard/source jakarta-taglibs-standard-(.*)-src.tar.gz debian debian/orig-tar.sh debian/libjakarta-taglibs-standard-java.classpath0000664000000000000000000000013211770243143017336 0ustar usr/share/java/standard.jar servlet-api-2.5.jar jsp-api-2.1.jar el-api-2.1.jar xalan2.jar debian/changelog0000664000000000000000000000426712001011213011030 0ustar jakarta-taglibs-standard (1.1.2-2ubuntu1) quantal; urgency=low * Merge from Debian unstable. Remaining changes: - Transition from servlet 2.5 -> 3.0. -- James Page Mon, 16 Jul 2012 14:09:09 +0100 jakarta-taglibs-standard (1.1.2-2) unstable; urgency=low [ James Page ] * Fix FTBFS with openjdk-7 (Closes: #678166, LP: #888941): - d/patches/java7-compat.patch: Compatibility patch for compilation with Java 7 API. * Bumped Standards-Version: 3.9.3: - d/copyright: Tidied deprecated field names and referenced released version of DEP-5. * Switch to debhelper >= 7 style rules: - d/control: Drop cdbs Build-Depends, specify minimum versions for debhelper and maven-repo-helper. - d/rules: Refactor to use minimal overrides. * Provide taglibs:standard maven artifacts (Closes: #673119): - d/libjakarta-taglibs-standard-java.poms: Specify location of pom file and artifacts to install. - d/libjakarta-taglibs-standard-java.jlibs: Dropped - no longer required. - d/rules,d/poms/standard.pom: Grab pom file from maven central. [ Niels Thykier ] * Set DMUA to yes. -- James Page Wed, 20 Jun 2012 00:38:32 +0200 jakarta-taglibs-standard (1.1.2-1ubuntu2) quantal; urgency=low * Transition from servlet 2.5 -> 3.0: - d/control: Switch BDI from libservlet2.5-java to libservlet3.0-java. - d/rules: Use el-api-2.2 jar for build. - d/ant.properties: Update jar file names for libservlet3.0-java. * d/control: Bumped Standards-Version to 3.9.3 - d/copyright: Reference released version of DEP-5, tidy lintian warnings for deprecated field names. -- James Page Sun, 17 Jun 2012 21:28:08 +0100 jakarta-taglibs-standard (1.1.2-1ubuntu1) quantal; urgency=low * Fix FTBFS with openjdk-7 as default-jdk (LP: #888941): - d/patches/java7-compat.patch: Compatibility patch for compilation with Java 7 API. -- James Page Tue, 12 Jun 2012 21:42:00 +0100 jakarta-taglibs-standard (1.1.2-1) unstable; urgency=low * Initial version. (Closes: #630112) -- Onkar Shinde Thu, 09 Jun 2011 12:03:00 +0530 debian/ant.properties0000664000000000000000000000032511770243143012072 0ustar build.dir=build dist.dir=dist ant.build.javac.source=1.4 ant.build.javac.target=1.4 servlet24.jar=/usr/share/java/servlet-api-3.0.jar jsp20.jar=/usr/share/java/jsp-api-2.2.jar xalan.jar=/usr/share/java/xalan2.jar debian/compat0000664000000000000000000000000211770243143010370 0ustar 7 debian/source/0000775000000000000000000000000011770243143010472 5ustar debian/source/format0000664000000000000000000000001411770243143011700 0ustar 3.0 (quilt) debian/patches/0000775000000000000000000000000011770243143010621 5ustar debian/patches/01_fix_build.diff0000664000000000000000000000301311770243143013715 0ustar Description: Added method stubs to fix compilation against servlet-api-2.5. Forwarded: not-needed Author: Onkar Shinde --- a/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2011-06-09 11:41:17.000000000 +0530 +++ b/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2011-06-09 11:41:22.000000000 +0530 @@ -111,5 +111,18 @@ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); } + /** + * Placeholder method to fix compilation. + */ + public boolean isWrapperFor(Class iface) throws SQLException { + return true; + } + + /** + * Placeholder method to fix compilation. + */ + public Object unwrap(Class iface) throws SQLException { + return null; + } } --- a/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java 2011-06-09 11:41:17.000000000 +0530 +++ b/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java 2011-06-09 11:41:22.000000000 +0530 @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; +import javax.el.ELContext; import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -297,5 +298,7 @@ public void include(java.lang.String relativeUrlPath, boolean flush) {} public ExpressionEvaluator getExpressionEvaluator() { return null; } public VariableResolver getVariableResolver() { return null; } + + public ELContext getELContext() { return null; } } debian/patches/java7-compat.patch0000664000000000000000000000165111767432640014146 0ustar Index: jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java =================================================================== --- jakarta-taglibs-standard.orig/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-12 21:40:55.049170000 +0100 +++ jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-12 21:41:52.171712718 +0100 @@ -25,6 +25,9 @@ import org.apache.taglibs.standard.resources.Resources; +import java.sql.SQLFeatureNotSupportedException; +import java.util.logging.Logger; + /** *

A simple DataSource wrapper for the standard @@ -125,4 +128,10 @@ return null; } + /* + * JDBC 4.1 + */ + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException(); + } } debian/patches/series0000664000000000000000000000004511770243143012035 0ustar 01_fix_build.diff java7-compat.patch debian/libjstl1.1-java.poms0000664000000000000000000000015411770243143012674 0ustar debian/poms/jstl.pom --java-lib --usj-name=jstl1.1 --artifact=standard/build/standard/standard/lib/jstl.jar