[pkg-java] r11596 - trunk/tomcat6/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Feb 14 20:22:37 UTC 2010 

Author: ludovicc-guest
Date: 2010-02-14 20:22:32 +0000 (Sun, 14 Feb 2010)
New Revision: 11596

Modified:
   trunk/tomcat6/debian/README.Debian
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/libtomcat6-java.poms
   trunk/tomcat6/debian/maven.rules
   trunk/tomcat6/debian/rules
Log:
Remove poms from the Debian packaging, use upstream pom files

Modified: trunk/tomcat6/debian/README.Debian
===================================================================
--- trunk/tomcat6/debian/README.Debian	2010-02-13 07:37:58 UTC (rev 11595)
+++ trunk/tomcat6/debian/README.Debian	2010-02-14 20:22:32 UTC (rev 11596)
@@ -6,12 +6,11 @@
       <role rolename="manager"/>
       <user username="tomcat" password="s3cret" roles="manager"/>
     Tomcat administration will be accessible on http://localhost:8080/manager/
-  * Tomcat is NOT secured by default. Before exposing your Tomcat instance to
-    the internet, please change the passwords in 
-    /etc/tomcat6/tomcat-users.xml and turn on Java security: edit your 
-    /etc/default/tomcat6 file and set TOMCAT6_SECURITY="yes".
-    After you may need to change the policy files in /etc/tomcat6/policy.d/
-    if the application doesn't start or produces new Exceptions. 
+  * Tomcat is not running under a Java security manager by default. If you
+    expose your Tomcat instance to the internet, please consider editing
+    your /etc/default/tomcat6 file and set TOMCAT6_SECURITY="yes", then
+    adjust policy files in /etc/tomcat6/policy.d/ as explained in
+    http://tomcat.apache.org/tomcat-6.0-doc/security-manager-howto.html
   * To run more than one Tomcat instance on your server, install the package
     tomcat6-user and run the tomcat6-instance-create utility.
     You should remove the tomcat6 package if you don't want Tomcat to

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-02-13 07:37:58 UTC (rev 11595)
+++ trunk/tomcat6/debian/changelog	2010-02-14 20:22:32 UTC (rev 11596)
@@ -1,4 +1,4 @@
-tomcat6 (6.0.24-1) UNRELEASED; urgency=low
+tomcat6 (6.0.24-1) unstable; urgency=low
 
   [ Ludovic Claude ]
   * New upstream version
@@ -14,6 +14,7 @@
     /usr/share/doc/tomcat6/README.Debian to include a minimum of
     documentation in the tomcat6 package and add some useful notes. 
     (Closes: #563937, #563939)
+  * Remove poms from the Debian packaging, use upstream pom files
 
   [ Jason Brittain ]
   * Fixed a bug in the init script: When a start fails, the PID file was

Modified: trunk/tomcat6/debian/libtomcat6-java.poms
===================================================================
--- trunk/tomcat6/debian/libtomcat6-java.poms	2010-02-13 07:37:58 UTC (rev 11595)
+++ trunk/tomcat6/debian/libtomcat6-java.poms	2010-02-14 20:22:32 UTC (rev 11596)
@@ -1,9 +1,9 @@
 debian/poms/annotations-api.pom
 debian/poms/catalina.pom
 debian/poms/catalina-ha.pom
-debian/poms/catalina-tribes.pom
+debian/poms/coyote.pom
 debian/poms/jasper.pom
 debian/poms/jasper-el.pom
 debian/poms/juli.pom
-debian/poms/tomcat-coyote.pom
+debian/poms/tribes.pom
 

Modified: trunk/tomcat6/debian/maven.rules
===================================================================
--- trunk/tomcat6/debian/maven.rules	2010-02-13 07:37:58 UTC (rev 11595)
+++ trunk/tomcat6/debian/maven.rules	2010-02-14 20:22:32 UTC (rev 11596)
@@ -1,7 +1,7 @@
-# Keep the version of the javax apis
-javax.servlet servlet-api jar *
-javax.servlet.jsp jsp-api jar *
-javax.el el-api jar *
+# Force the version of the javax apis
+javax.servlet servlet-api jar 2.5
+javax.servlet.jsp jsp-api jar 2.1
+javax.el el-api jar 2.1
 # Convert tomcat version of the standard apis to the javax apis
 s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
 s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.1/

Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules	2010-02-13 07:37:58 UTC (rev 11595)
+++ trunk/tomcat6/debian/rules	2010-02-14 20:22:32 UTC (rev 11596)
@@ -20,9 +20,7 @@
 T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
 	| cut -f 2 -d ' ' | cut -f 2 -d ' '|sed 's/-[^-]*$$//')
 T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
-T_MAVENIZED_JARS := jasper-el annotations-api catalina-tribes tomcat-coyote jasper catalina-ha catalina
-# Version for the POMs available on the sonatype repository
-P_VER := $(T_VER)
+T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina
 
 ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.source=1.5 \
@@ -72,9 +70,17 @@
 	dh_installexamples
 	dh_installinit --error-handler=true -- defaults 92 08
 	dh_installcron
+	mkdir -p debian/poms
+	cp res/maven/*.pom debian/poms
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.5/' debian/poms/servlet-api.pom
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/el-api.pom
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/jsp-api.pom
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
 	mh_installpoms -plibtomcat6-java
 	for i in $(T_MAVENIZED_JARS); do \
 		mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar usr/share/tomcat6/lib/$$i.jar; done
+	mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom $(BLDLIB)/catalina-tribes.jar
+	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom $(BLDLIB)/tomcat-coyote.jar
 	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-juli debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
 	for i in $(T_JARS); do \
 		mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
@@ -90,6 +96,7 @@
 	mh_installjar -plibservlet2.5-java -l -s debian/poms/servlet-api.pom output/build/lib/servlet-api.jar
 	mh_installjar -plibservlet2.5-java -l -s debian/poms/jsp-api.pom output/build/lib/jsp-api.jar
 	mh_installjar -plibservlet2.5-java -l -s debian/poms/el-api.pom output/build/lib/el-api.jar
+	rm -r debian/poms
 	rm -rf debian/tomcat6/usr/share/tomcat6/webapps/default_root/.svn \
 		debian/tomcat6/usr/share/tomcat6/webapps/default_root/META-INF/.svn
 	chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
@@ -109,28 +116,4 @@
 get-orig-source:
 	-uscan --download-version $(VERSION) --force-download --rename
 
-get-orig-pom:
-	wget -O debian/poms/annotations-api.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/annotations-api/$(P_VER)/annotations-api-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/annotations-api.pom
-	wget -O debian/poms/catalina.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/catalina/$(P_VER)/catalina-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/catalina.pom
-	wget -O debian/poms/catalina-ha.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/catalina-ha/$(P_VER)/catalina-ha-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/catalina-ha.pom
-	wget -O debian/poms/tomcat-coyote.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/coyote/$(P_VER)/coyote-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/tomcat-coyote.pom
-	wget -O debian/poms/dbcp.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/dbcp/$(P_VER)/dbcp-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/dbcp.pom
-	wget -O debian/poms/jasper.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/jasper/$(P_VER)/jasper-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/jasper.pom
-	wget -O debian/poms/jasper-el.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/jasper-el/$(P_VER)/jasper-el-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/jasper-el.pom
-	wget -O debian/poms/juli.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/juli/$(P_VER)/juli-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/juli.pom
-	wget -O debian/poms/catalina-tribes.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/tribes/$(P_VER)/tribes-$(P_VER).pom
-	perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/catalina-tribes.pom
-	wget -O debian/poms/servlet-api.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
-	wget -O debian/poms/jsp-api.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.pom
-	wget -O debian/poms/el-api.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/el/el-api/1.0/el-api-1.0.pom
-	perl -p -i -e 's/<version>1\.0/<version>2.1/' debian/poms/el-api.pom
-
 .PHONY: build clean binary-indep binary-arch binary install get-orig-source

More information about the pkg-java-commits mailing list