[SCM] jakarta-taglibs-standard packaging branch, master, updated. 843eb44f27b4443ead47f07a3003cb0928e0c91d
James Page
jamespage-guest at alioth.debian.org
Mon Jun 27 09:59:37 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jakarta-taglibs-standard packaging".
The branch, master has been updated
via 843eb44f27b4443ead47f07a3003cb0928e0c91d (commit)
via b796ef56be45f47f2e86355b853879e6de74df7f (commit)
from 631bf00b987d06f5b2ffda839742d74dc992502d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 843eb44f27b4443ead47f07a3003cb0928e0c91d
Author: James Page <james.page at canonical.com>
Date: Wed Jun 22 14:24:39 2011 +0100
Update to fix get-orig-pom
commit b796ef56be45f47f2e86355b853879e6de74df7f
Author: James Page <james.page at canonical.com>
Date: Wed Jun 22 14:11:20 2011 +0100
Updates for package split and maven artefact deployment for jstl
-----------------------------------------------------------------------
Summary of changes:
debian/control | 20 +++++++++++++++++---
debian/libjakarta-taglibs-standard-java.classpath | 1 -
debian/libjakarta-taglibs-standard-java.jlibs | 1 -
debian/libjstl1.1-java.classpath | 1 +
debian/libjstl1.1-java.poms | 1 +
debian/maven.rules | 3 +++
debian/poms/jstl.pom | 14 ++++++++++++++
debian/rules | 13 +++++++++++++
debian/watch | 2 +-
9 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index 3c7792b..078c2de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,10 @@ Source: jakarta-taglibs-standard
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: debhelper (>=5), cdbs, javahelper, ant
+Uploaders:
+ Onkar Shinde <onkarshinde at ubuntu.com>,
+ James Page <james.page at ubuntu.com>
+Build-Depends: ant, cdbs, debhelper (>=5), javahelper, maven-repo-helper
Build-Depends-Indep: default-jdk, libservlet2.5-java, libxalan2-java
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-java/jakarta-taglibs-standard.git
@@ -12,9 +14,21 @@ Homepage: http://tomcat.apache.org/taglibs/standard/
Package: libjakarta-taglibs-standard-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
+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..
diff --git a/debian/libjakarta-taglibs-standard-java.classpath b/debian/libjakarta-taglibs-standard-java.classpath
index 63246e6..b10d378 100644
--- a/debian/libjakarta-taglibs-standard-java.classpath
+++ b/debian/libjakarta-taglibs-standard-java.classpath
@@ -1,2 +1 @@
-usr/share/java/jstl.jar servlet-api-2.5.jar jsp-api-2.1.jar el-api-2.1.jar xalan2.jar
usr/share/java/standard.jar servlet-api-2.5.jar jsp-api-2.1.jar el-api-2.1.jar xalan2.jar
diff --git a/debian/libjakarta-taglibs-standard-java.jlibs b/debian/libjakarta-taglibs-standard-java.jlibs
index 1600239..2a9f892 100644
--- a/debian/libjakarta-taglibs-standard-java.jlibs
+++ b/debian/libjakarta-taglibs-standard-java.jlibs
@@ -1,2 +1 @@
-standard/build/standard/standard/lib/jstl.jar
standard/build/standard/standard/lib/standard.jar
diff --git a/debian/libjstl1.1-java.classpath b/debian/libjstl1.1-java.classpath
new file mode 100644
index 0000000..33da5d9
--- /dev/null
+++ b/debian/libjstl1.1-java.classpath
@@ -0,0 +1 @@
+usr/share/java/jstl1.1.jar servlet-api-2.5.jar jsp-api-2.1.jar el-api-2.1.jar xalan2.jar
diff --git a/debian/libjstl1.1-java.poms b/debian/libjstl1.1-java.poms
new file mode 100644
index 0000000..8067f6f
--- /dev/null
+++ b/debian/libjstl1.1-java.poms
@@ -0,0 +1 @@
+debian/poms/jstl.pom --java-lib --usj-name=jstl1.1 --artifact=standard/build/standard/standard/lib/jstl.jar
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..370efd6
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+# Remap JSTL to 1.1 as this is the version of the API
+# Implemented
+javax.servlet jstl jar s/.*/1.1/ * *
diff --git a/debian/poms/jstl.pom b/debian/poms/jstl.pom
new file mode 100644
index 0000000..9e6f9c4
--- /dev/null
+++ b/debian/poms/jstl.pom
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/rules b/debian/rules
index 2c43280..cc29484 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,19 @@ include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME_DIRS := /usr/lib/jvm/default-java
DEB_JARS := el-api-2.1.jar
DEB_ANT_BUILDFILE := standard/build.xml
+PACKAGE := jstl
+MAVEN_REPO := http://repo1.maven.org/maven2
+
+# Override normal javahelper install for jstl1.1
+# package to enable maven artefacts
+install/lib$(PACKAGE)1.1-java::
+ mh_install -plib$(PACKAGE)1.1-java
+ jh_classpath -plib$(PACKAGE)1.1-java
get-orig-source:
uscan --force-download --rename
+
+get-orig-pom:
+ mkdir -p debian/poms
+ wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+ $(MAVEN_REPO)/javax/servlet/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
diff --git a/debian/watch b/debian/watch
index 65a7a4c..bbf957a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://jakarta.apache.org/site/downloads/downloads_taglibs-standard.cgi .*jakarta-taglibs-standard-([\d\.]+)-src\.tar\.gz debian debian/orig-tar.sh
+http://archive.apache.org/dist/jakarta/taglibs/standard/source jakarta-taglibs-standard-(.*)-src.tar.gz debian debian/orig-tar.sh
hooks/post-receive
--
jakarta-taglibs-standard packaging
More information about the pkg-java-commits
mailing list