CVS tomcat5/debian
Wolfgang B??r
wbaer-guest@haydn.debian.org
Wed Jun 29 18:11:02 2005
Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv10398/debian
Modified Files:
changelog control libtomcat5-java.install
libtomcat5-java.links rules tomcat5-admin.install
tomcat5-webapps.install tomcat5.init tomcat5.install
Log Message:
import_from_5_0_30-1
--- /cvsroot/pkg-java/tomcat5/debian/changelog 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/changelog 2005/06/29 18:10:40 1.2
@@ -1,5 +1,5 @@
-tomcat5 (5.0.30-1) unstable; urgency=low
+tomcat5 (5.0.30-1) experimental; urgency=low
* Initial release release based on tomcat4 package by Stefan Gybas.
- -- Arnaud Vandyck <avdyk@debian.org> Fri, 25 Mar 2005 11:45:09 +0100
+ -- Arnaud Vandyck <avdyk@debian.org> Sat, 11 Jun 2005 17:00:35 +0200
--- /cvsroot/pkg-java/tomcat5/debian/control 2005/06/03 20:43:28 1.3
+++ /cvsroot/pkg-java/tomcat5/debian/control 2005/06/29 18:10:40 1.4
@@ -62,7 +62,7 @@
Package: tomcat5-admin
Architecture: all
-Depends: tomcat5 (>= ${Source-Version}), libstruts1.1-java
+Depends: tomcat5 (>= ${Source-Version}), libstruts1.2-java
Description: Java Servlet engine -- admin web interfaces
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install 2005/06/29 18:10:40 1.2
@@ -1,10 +1,13 @@
-debian/tmp/usr/share/tomcat5/bin/bootstrap.jar
-debian/tmp/usr/share/tomcat5/common/classes
-debian/tmp/usr/share/tomcat5/common/endorsed
-debian/tmp/usr/share/tomcat5/common/lib/jasper-*.jar
-debian/tmp/usr/share/tomcat5/common/lib/naming-*.jar
-debian/tmp/usr/share/tomcat5/server/classes
-debian/tmp/usr/share/tomcat5/server/lib/catalina*.jar
-debian/tmp/usr/share/tomcat5/server/lib/servlets-*.jar
-debian/tmp/usr/share/tomcat5/server/lib/servlets-*.renametojar
-debian/tmp/usr/share/tomcat5/server/lib/tomcat-*.jar
+jakarta-tomcat-5/build/bin/bootstrap.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/bin/commons-daemon.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/bin/commons-logging.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/bin/jmx.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/common/classes /usr/share/tomcat5/common/
+jakarta-tomcat-5/build/common/endorsed /usr/share/tomcat5/common/
+jakarta-tomcat-5/build/common/lib/jasper-*.jar /usr/share/tomcat5/common/lib/
+jakarta-tomcat-5/build/common/lib/naming-*.jar /usr/share/tomcat5/common/lib/
+jakarta-tomcat-5/build/server/classes /usr/share/tomcat5/server/
+jakarta-tomcat-5/build/server/lib/catalina*.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/servlets-*.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/servlets-*.renametojar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/tomcat-*.jar /usr/share/tomcat5/server/lib/
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links 2005/06/29 18:10:40 1.2
@@ -14,5 +14,5 @@
/usr/share/java/regexp.jar /usr/share/tomcat5/server/lib/jakarta-regexp.jar
/usr/share/java/mx4j.jar /usr/share/tomcat5/server/lib/mx4j.jar
-/usr/share/tomcat5/server/lib/catalina-ant.jar /usr/share/ant/lib/catalina-ant.jar
+/usr/share/tomcat5/server/lib/catalina-ant.jar /usr/share/ant/lib/catalina5-ant.jar
--- /cvsroot/pkg-java/tomcat5/debian/rules 2005/06/03 20:43:28 1.3
+++ /cvsroot/pkg-java/tomcat5/debian/rules 2005/06/29 18:10:40 1.4
@@ -46,7 +46,7 @@
#$(_cdbs_tarball_dir)/jakarta-tomcat:
-mkdir -p jakarta-commons/daemon/target
-ln -s /usr/share/java/commons-daemon.jar jakarta-commons/daemon/target/commons-daemon.jar
- -mkdir debian/tmp
+# -mkdir debian/tmp
# -rm jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13*
-rm -r jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/
# ln -s $(CONNECTORS_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat-connectors
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-admin.install 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-admin.install 2005/06/29 18:10:40 1.2
@@ -1,6 +1,6 @@
debian/webapps/admin.xml /var/lib/tomcat5/webapps/
debian/webapps/manager.xml /var/lib/tomcat5/webapps/
debian/policy/10admin.policy /etc/tomcat5/policy.d/
-debian/tmp/usr/share/tomcat5/server/webapps/admin
-debian/tmp/usr/share/tomcat5/server/webapps/manager
+jakarta-tomcat-5/build/server/webapps/admin /usr/share/tomcat5/server/webapps/
+jakarta-tomcat-5/build/server/webapps/manager /usr/share/tomcat5/server/webapps/
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.install 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.install 2005/06/29 18:10:40 1.2
@@ -1,6 +1,8 @@
-debian/tmp/usr/share/tomcat5/webapps/ROOT /var/lib/tomcat5/webapps/
-debian/tmp/usr/share/tomcat5/webapps/examples /usr/share/tomcat5/server/webapps
-debian/tmp/usr/share/tomcat5/webapps/tomcat-docs /var/lib/tomcat5/webapps/
-debian/tmp/usr/share/tomcat5/webapps/webdav /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/balancer /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/ROOT /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/jsp-examples /usr/share/tomcat5/server/webapps
+jakarta-tomcat-5/build/webapps/servlets-examples /usr/share/tomcat5/server/webapps
+jakarta-tomcat-5/build/webapps/tomcat-docs /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/webdav /var/lib/tomcat5/webapps/
debian/webapps/examples.xml /var/lib/tomcat5/webapps/
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/06/29 18:10:40 1.2
@@ -20,13 +20,15 @@
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /usr/lib/j2sdk1.3 /usr/lib/kaffe"
+JDK_DIRS="/usr/lib/kaffe /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /usr/lib/j2sdk1.3"
# Directory for per-instance configuration files and webapps
CATALINA_BASE=/var/lib/tomcat5
# Use the Java security manager? (yes/no)
-TOMCAT5_SECURITY=yes
+#TOMCAT5_SECURITY=yes
+#Not sure it works with kaffe at the moment
+TOMCAT5_SECURITY=no
# Timeout in seconds for the shutdown of all webapps
TOMCAT5_SHUTDOWN=30
@@ -69,7 +71,7 @@
# Set the JSP compiler to if we are using Kaffe and it is not set
if [ -z "$JSP_COMPILER" -a "$JAVA_HOME" = "/usr/lib/kaffe" ]; then
- JSP_COMPILER=kjc
+ JSP_COMPILER=jikes
fi
if [ -n "$JSP_COMPILER" ]; then
CATALINA_OPTS="$CATALINA_OPTS -Dbuild.compiler=$JSP_COMPILER"
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.install 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.install 2005/06/29 18:10:40 1.2
@@ -1,8 +1,8 @@
-debian/tmp/usr/share/tomcat5/bin/*.sh
-debian/tmp/usr/share/tomcat5/conf/tomcat-users.xml /usr/share/tomcat5/.debian/
-build-tree/jakarta-tomcat/webapps/build/ROOT/WEB-INF/web.xml /usr/share/tomcat5/.debian/
-build-tree/jakarta-tomcat-connectors/jk/conf/jk2.properties /usr/share/tomcat5/.debian/
-debian/tmp/usr/share/tomcat5/conf/web.xml /etc/tomcat5/
+jakarta-tomcat-5/build/bin/*.sh /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/conf/tomcat-users.xml /usr/share/tomcat5/.debian/
+jakarta-tomcat-5/build/webapps/ROOT/WEB-INF/web.xml /usr/share/tomcat5/.debian/
+jakarta-tomcat-connectors/jk/conf/jk2.properties /usr/share/tomcat5/.debian/
+jakarta-tomcat-5/build/conf/web.xml /etc/tomcat5/
debian/policy/0*.policy /etc/tomcat5/policy.d/
debian/policy/9*.policy /etc/tomcat5/policy.d/
debian/server.xml /etc/tomcat5/