Update of /cvsroot/pkg-java/jetty/debian
In directory haydn:/tmp/cvs-serv2346
Modified Files:
changelog files jetty.xml start.config
Log Message:
* New release.
* Fix location of jasper since upgrade to tomcat5. Closes: #333010.
--- /cvsroot/pkg-java/jetty/debian/changelog 2005/09/23 11:26:59 1.7
+++ /cvsroot/pkg-java/jetty/debian/changelog 2005/10/10 11:19:40 1.8
@@ -1,3 +1,9 @@
+jetty (5.1.5rc1-6) unstable; urgency=low
+
+ * Fix location of jasper since upgrade to tomcat5. Closes: #333010.
+
+ -- Philipp Meier <[EMAIL PROTECTED]> Mon, 10 Oct 2005 13:12:59 +0200
+
jetty (5.1.5rc1-5) unstable; urgency=low
Patch from Oyvind Harboe <[EMAIL PROTECTED]>:
--- /cvsroot/pkg-java/jetty/debian/files 2005/09/02 13:37:01 1.4
+++ /cvsroot/pkg-java/jetty/debian/files 2005/10/10 11:19:40 1.5
@@ -1,2 +1,2 @@
-jetty_5.1.5rc1-4_all.deb contrib/web optional
-jetty-extra_5.1.5rc1-4_all.deb contrib/web optional
+jetty_5.1.5rc1-6_all.deb contrib/web optional
+jetty-extra_5.1.5rc1-6_all.deb contrib/web optional
--- /cvsroot/pkg-java/jetty/debian/jetty.xml 2004/11/05 21:24:23 1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/jetty.xml 2005/10/10 11:19:40 1.2
@@ -112,7 +112,7 @@
<Set name="rootWebApp">root</Set>
<Call name="addWebApplications">
<Arg></Arg>
- <Arg><SystemProperty name="jetty.home" default="."/>/webapps/</Arg>
+ <Arg><SystemProperty name="jetty.home"
default="/usr/share/jetty"/>/webapps/</Arg>
<Arg>/etc/jetty/webdefault.xml</Arg>
<Arg type="boolean">true</Arg>
</Call>
--- /cvsroot/pkg-java/jetty/debian/start.config 2005/08/30 12:32:22 1.3
+++ /cvsroot/pkg-java/jetty/debian/start.config 2005/10/10 11:19:40 1.4
@@ -38,15 +38,11 @@
org.apache.commons.logging.LogFactory=org.mortbay.log.Factory AND ! property
org.apache.commons.logging.LogFactory ! property org.apache.commons.logging.Log
# Try different settings of jetty.home until the jetty.jar is found.
-jetty.home=. ! exists
$(jetty.home)/lib/org.mortbay.jetty.jar
-jetty.home=.. ! exists
$(jetty.home)/lib/org.mortbay.jetty.jar
-jetty.home=/home/jetty ! exists
$(jetty.home)/lib/org.mortbay.jetty.jar
-jetty.home=/C:/jetty ! exists
$(jetty.home)/lib/org.mortbay.jetty.jar
-jetty.home=. ! exists
$(jetty.home)/lib/org.mortbay.jetty.jar
+jetty.home=/usr/share/jetty
# Debian jars home
java.lib.home=/usr/share/java always
-tomcat.lib.home=/usr/share/tomcat4/common/lib/ always
+tomcat.lib.home=/usr/share/tomcat5/common/lib/ always
# Do not validate xml files by default.
# Disabled because servlet-2.3.jar references an XSD which is not longer
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
