[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.27-1-5-g91960c3
James Page
james.page at ubuntu.com
Fri Jun 22 09:03:07 UTC 2012
The following commit has been merged in the master branch:
commit 91960c379cf7d2d5471b3e64658a0f9431a00f68
Author: James Page <james.page at ubuntu.com>
Date: Fri Jun 22 10:02:52 2012 +0100
Enable test suite during package build:
* Enable test suite during package build:
- d/control: Add junit4, libjstl1.1-java and
libjakarta-taglibs-standard-java to BDI's.
- d/rules:
+ Add ant/junit4 jars files to build classpath.
+ Target java 1.6 to support test suite exection.
+ Specify location of junit jar file.
+ Install jstl jar files to example webapp during build.
+ Conditionally execute test target if required.
+ Purge jar files from example webapp during clean.
* Fix JSTL examples in examples web application:
- d/control: Add dependencies on libjstl1.1-java and
libjakarta-taglibs-standard-java for tomcat7-examples.
- d/tomcat7-examples.links: Add links to jstl and standard jar
files for examples web application.
- d/context/examples.xml: Allow linking to jar files in examples
webapp.
* Fix mapping to javax packages for API jar files:
- d/maven.[rules,publishedRules]: Ensure all javax.[servlet|el] jar files
are published to the correct locations in /usr/share/[maven-repo|java].
- d/libservlet3.0-java.manifest: Update jar file locations for javax
remapping.
- d/libservlet3.0-java.links: Provide backwards compatible links for
deprecated tomcat-*.jar files in /usr/share/java.
diff --git a/debian/changelog b/debian/changelog
index e856128..66b6c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,32 @@ tomcat7 (7.0.28-1) UNRELEASED; urgency=low
[ James Page ]
* New upstream release.
-
- -- James Page <james.page at ubuntu.com> Fri, 22 Jun 2012 08:55:14 +0100
+ * Enable test suite during package build:
+ - d/control: Add junit4, libjstl1.1-java and
+ libjakarta-taglibs-standard-java to BDI's.
+ - d/rules:
+ + Add ant/junit4 jars files to build classpath.
+ + Target java 1.6 to support test suite exection.
+ + Specify location of junit jar file.
+ + Install jstl jar files to example webapp during build.
+ + Conditionally execute test target if required.
+ + Purge jar files from example webapp during clean.
+ * Fix JSTL examples in examples web application:
+ - d/control: Add dependencies on libjstl1.1-java and
+ libjakarta-taglibs-standard-java for tomcat7-examples.
+ - d/tomcat7-examples.links: Add links to jstl and standard jar
+ files for examples web application.
+ - d/context/examples.xml: Allow linking to jar files in examples
+ webapp.
+ * Fix mapping to javax packages for API jar files:
+ - d/maven.[rules,publishedRules]: Ensure all javax.[servlet|el] jar files
+ are published to the correct locations in /usr/share/[maven-repo|java].
+ - d/libservlet3.0-java.manifest: Update jar file locations for javax
+ remapping.
+ - d/libservlet3.0-java.links: Provide backwards compatible links for
+ deprecated tomcat-*.jar files in /usr/share/java.
+
+ -- James Page <james.page at ubuntu.com> Fri, 22 Jun 2012 08:57:38 +0100
tomcat7 (7.0.27-1) unstable; urgency=low
diff --git a/debian/context/examples.xml b/debian/context/examples.xml
index 896057e..4ca91e8 100644
--- a/debian/context/examples.xml
+++ b/debian/context/examples.xml
@@ -1,2 +1,2 @@
<Context path="/examples"
- docBase="/usr/share/tomcat7-examples/examples" />
+ docBase="/usr/share/tomcat7-examples/examples" allowLinking="true"/>
diff --git a/debian/control b/debian/control
index 15b0ca3..4693cc5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: James Page <james.page at ubuntu.com>,
Miguel Landaeta <miguel at miguel.cc>, tony mancill <tmancill at debian.org>,
Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
-Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java, javahelper
+Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java, javahelper,
+ junit4, libjstl1.1-java, libjakarta-taglibs-standard-java
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-java/tomcat7.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/tomcat7.git
@@ -112,7 +113,8 @@ Description: Servlet and JSP engine -- admin web applications
Package: tomcat7-examples
Architecture: all
-Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends}
+Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends},
+ libjstl1.1-java, libjakarta-taglibs-standard-java
Description: Servlet and JSP engine -- example web applications
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Sun Microsystems, and provides a "pure Java" HTTP web
diff --git a/debian/libservlet3.0-java.links b/debian/libservlet3.0-java.links
new file mode 100644
index 0000000..794f24d
--- /dev/null
+++ b/debian/libservlet3.0-java.links
@@ -0,0 +1,3 @@
+/usr/share/java/servlet-api-3.0.jar /usr/share/java/tomcat-servlet-api-3.0.jar
+/usr/share/java/jsp-api-2.2.jar /usr/share/java/tomcat-jsp-api-2.2.jar
+/usr/share/java/el-api-2.2.jar /usr/share/java/tomcat-el-api-2.2.jar
diff --git a/debian/libservlet3.0-java.manifest b/debian/libservlet3.0-java.manifest
index 8ccd9a2..ebb0764 100644
--- a/debian/libservlet3.0-java.manifest
+++ b/debian/libservlet3.0-java.manifest
@@ -1,4 +1,4 @@
-usr/share/java/tomcat-el-api-2.2.jar:
+usr/share/java/el-api-2.2.jar:
Bundle-ManifestVersion: 2
Bundle-Vendor: Apache Software Foundation
Bundle-Version: 2.2.0
@@ -9,7 +9,7 @@ usr/share/java/tomcat-el-api-2.2.jar:
Export-Package: javax.el;version="2.2.0"
Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="2.6.0"
-usr/share/java/tomcat-jsp-api-2.2.jar:
+usr/share/java/jsp-api-2.2.jar:
Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="2.6.0",javax.servlet.resources;version="2.6.0",javax.el;version="2.2.0"
Bundle-ManifestVersion: 2
Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; version=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp.tagext; version=2.2
@@ -20,7 +20,7 @@ usr/share/java/tomcat-jsp-api-2.2.jar:
Bundle-Localization: plugin
Bundle-Vendor: Apache Software Foundation
-usr/share/java/tomcat-servlet-api-3.0.jar:
+usr/share/java/servlet-api-3.0.jar:
Bundle-ManifestVersion: 2
Export-Package: javax.servlet;version="2.6.0",javax.servlet.annotation;version="2.6.0",javax.servlet.descriptor;version="2.6.0",javax.servlet.http;version="2.6.0",javax.servlet.resources;version="2.6.0"
Bundle-Version: 3.0.0.v201103241327
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index f1a5b4c..f2ab371 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1,4 +1,4 @@
# Convert tomcat version of the standard apis to the javax apis
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/3.0/
-s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.2/
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.2/
+s/org.apache.tomcat/javax.servlet/ s/tomcat-servlet-api/servlet-api/ jar s/.*/3.0/
+s/org.apache.tomcat/javax.servlet/ s/tomcat-jsp-api/jsp-api/ jar s/.*/2.2/
+s/org.apache.tomcat/javax.el/ s/tomcat-el-api/el-api/ jar s/.*/2.2/
diff --git a/debian/maven.rules b/debian/maven.rules
index 840fdd1..8641869 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,8 +1,8 @@
# Force the version of the javax apis
-javax.servlet servlet-api jar 3.0
-javax.servlet.jsp jsp-api jar 2.2
-javax.el el-api jar 2.2
+javax.servlet servlet-api jar s/.*/3.0/
+javax.servlet.jsp jsp-api jar s/.*/2.2/
+javax.el el-api jar s/.*/2.2/
# Convert tomcat version of the standard apis to the javax apis
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/3.0/
-s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.2/
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.2/
+s/org.apache.tomcat/javax.servlet/ s/tomcat-servlet-api/servlet-api/ jar s/.*/3.0/
+s/org.apache.tomcat/javax.servlet.jsp/ s/tomcat-jsp-api/jsp-api/ jar s/.*/2.2/
+s/org.apache.tomcat/javax.el/ s/tomcat-el-api/el-api/ jar s/.*/2.2/
diff --git a/debian/rules b/debian/rules
index a85de30..8b8f183 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ JAVA_CMD := $(JAVA_HOME)/bin/java
BLDLIB := output/build/lib
BLDBIN := output/build/bin
DEB_JARS_BASE := /usr/share/java
-DEB_JARS := ant ant-launcher ant-trax ant-nodeps
+DEB_JARS := ant ant-launcher ant-trax ant-nodeps ant-junit4 ant-junit junit4
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
@@ -30,9 +30,10 @@ RWLOC := debian/default_root
RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml
ANT_ARGS := -Dcompile.debug=true \
- -Dant.build.javac.source=1.5 \
- -Dant.build.javac.target=1.5 \
+ -Dant.build.javac.source=1.6 \
+ -Dant.build.javac.target=1.6 \
-Djdt.jar=/usr/share/java/ecj.jar \
+ -Djunit.jar=/usr/share/java/junit4.jar \
-Dversion=$(T_VER) \
-Dversion.major="$(T_VER_MAJOR)" \
-Dversion.minor="$(T_VER_MINOR)" \
@@ -54,7 +55,13 @@ build-arch: build-stamp
build-indep: build-stamp
build-stamp:
dh_testdir
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+ cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
+ cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar
+ $(ANT_INVOKE) deploy test
+else
$(ANT_INVOKE) deploy
+endif
javadoc -subpackages "javax.servlet" -d "output/api" \
-sourcepath "java" -author -version -breakiterator \
-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
@@ -66,6 +73,7 @@ clean:
dh_testroot
-$(ANT_INVOKE) clean
rm -rf "output/"
+ rm -rf webapps/examples/WEB-INF/lib/*.jar
rm -f build-stamp modules/jdbc-pool/output/resources/MANIFEST.MF
dh_clean
mh_clean
diff --git a/debian/tomcat7-examples.links b/debian/tomcat7-examples.links
new file mode 100644
index 0000000..927957b
--- /dev/null
+++ b/debian/tomcat7-examples.links
@@ -0,0 +1,2 @@
+/usr/share/java/jstl1.1.jar /usr/share/tomcat7-examples/examples/WEB-INF/lib/jstl.jar
+/usr/share/java/standard.jar /usr/share/tomcat7-examples/examples/WEB-INF/lib/standard.jar
--
tomcat7: Servlet and JSP engine
More information about the pkg-java-commits
mailing list