[pkg-java] r8618 - trunk/jetty/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sat Jun 27 21:08:19 UTC 2009


Author: ludovicc-guest
Date: 2009-06-27 21:08:18 +0000 (Sat, 27 Jun 2009)
New Revision: 8618

Added:
   trunk/jetty/debian/README.source
Modified:
   trunk/jetty/debian/TODO
   trunk/jetty/debian/control
   trunk/jetty/debian/copyright
   trunk/jetty/debian/jetty.default
   trunk/jetty/debian/jetty.init
   trunk/jetty/debian/libjetty-extra-java.dirs
   trunk/jetty/debian/libjetty-extra-java.links
   trunk/jetty/debian/libjetty-java.links
   trunk/jetty/debian/orig-tar.sh
Log:
* Fix copyright, rotatelogs dependency and remote access

Added: trunk/jetty/debian/README.source
===================================================================
--- trunk/jetty/debian/README.source	                        (rev 0)
+++ trunk/jetty/debian/README.source	2009-06-27 21:08:18 UTC (rev 8618)
@@ -0,0 +1,21 @@
+Building the source tarball
+---------------------------
+
+The source tarball was created from the upstream Subversion repository
+[1]. The following files and directories were removed because they are
+likely to contain non-free code, code under too many or unclear licenses
+or unstable code:
+
+* modules/jsp-api-2.0
+* extras/win32service
+* contrib/cometd
+* contrib/rpms
+* contrib/debian
+* contrib/grizzly
+* contrib/maven-beanshell-plugin
+
+None of those sources are necessary for the core Jetty functionality.
+
+[1] http://svn.codehaus.org/jetty/
+
+ -- Marcus Better <marcus at better.se>, Wed, 13 May 2009 10:49:17 +0200

Modified: trunk/jetty/debian/TODO
===================================================================
--- trunk/jetty/debian/TODO	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/TODO	2009-06-27 21:08:18 UTC (rev 8618)
@@ -6,9 +6,6 @@
 
 Modules to add:
 
-jetty-jsp-2.1
- - glassfish jsp source + jetty-jsp source needs to be compiled/built to generate a separate deb package
-
 jetty-plus
  - geronimo-jta must be available as a deb package (build & runtime dependency)
 

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/control	2009-06-27 21:08:18 UTC (rev 8618)
@@ -50,7 +50,7 @@
 
 Package: jetty
 Architecture: all
-Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), adduser, jsvc
+Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), adduser, jsvc, apache2-utils
 Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-setuid-java (>= ${source:Version})
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.

Modified: trunk/jetty/debian/copyright
===================================================================
--- trunk/jetty/debian/copyright	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/copyright	2009-06-27 21:08:18 UTC (rev 8618)
@@ -7,15 +7,55 @@
 Copyright: 2004-2009, Mortbay Consulting
 License: Apache-2.0
 
+Files: contrib/jboss/src/main/java/org/jboss/jetty/JettyDeployer.java
+Copyright: 2006, Mort Bay Consulting Pty. Ltd.
+License: LGPL-2
+
+Files: contrib/jetty-ant/src/main/java/org/mortbay/jetty/ant/*
+Copyright: 2006-2007, Sabre Holdings
+License: Apache-2.0
+
+Files: examples/test-webapp/src/main/webapp/WEB-INF/tags/panel.tag
+Copyright: 2002, The Apache Software Foundation
+License: Apache-2.0
+
+Files: examples/test-webapp/src/test/java/com/acme/DispatchServletTest.java
+Copyright: 2009, Webtide LLC
+License: Apache-2.0
+
+Files: extras/xbean/*
+Copyright: 2005-2006, The Apache Software Foundation
+License: Apache-2.0
+
+Files: extras/gwt/src/main/java/org/mortbay/gwt/AsyncRemoteServiceServlet.java,
+  extras/gwt/src/main/java/com/google/gwt/user/server/rpc/OpenRemoteServiceServlet.java
+Copyright: 2006, Google Inc
+Copyright: 2006, Craig Day <craig at alderaan.com.au>
+License: Apache-2.0
+
 Files: modules/jetty/src/main/java/org/mortbay/jetty/security/UnixCrypt.java
 Copyright: 1996, Aki Yoshida,
 Copyright: 2001, Iris Van den Broeke, Daniel Deville.
 License: BSD
-  Permission to use, copy, modify and distribute UnixCrypt 
+
+Files: modules/jetty/src/test/java/org/mortbay/jetty/servlet/SessionManagerTest.java,
+  modules/util/src/main/java/org/mortbay/servlet/ThrottlingFilter.java
+Copyright: 2006, Tim Vernum
+License: Apache-2.0
+
+Files: modules/jetty/src/main/java/org/mortbay/jetty/security/PKCS12Import.java
+Copyright: 1999, Jason Gilbert
+License: Apache-2.0
+
+Files: modules/jetty/src/main/java/org/mortbay/jetty/security/HTAccessHandler.java
+Copyright: 2001, Deville Daniel
+License:
+  Unspecified BSD style license.
+  .
+  Permission to use, copy, modify and distribute this software
   for non-commercial or commercial purposes and without fee is
-  granted provided that the copyright notice appears in all copies.
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'.
+  hereby granted provided that this copyright notice appears in
+  all copies.
 
 Files: debian/*
 Copyright: 2003, Philipp Meier <meier at meisterbohne.de>
@@ -27,3 +67,14 @@
   On Debian GNU/Linux system you can find the complete text of the
   Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
 
+License: BSD
+  Permission to use, copy, modify and distribute UnixCrypt 
+  for non-commercial or commercial purposes and without fee is
+  granted provided that the copyright notice appears in all copies.
+  On Debian GNU/Linux system you can find the complete text of the
+  BSD license in '/usr/share/common-licenses/BSD'.
+
+License: LGPL-2
+  On Debian GNU/Linux system you can find the complete text of the
+  GPL 2 license in '/usr/share/common-licenses/GPL-2'.
+

Modified: trunk/jetty/debian/jetty.default
===================================================================
--- trunk/jetty/debian/jetty.default	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/jetty.default	2009-06-27 21:08:18 UTC (rev 8618)
@@ -10,8 +10,9 @@
 # Set this to an empty string to prevent Jetty from starting automatically
 #JETTY_USER=jetty
 
-# The network host            
-#JETTY_HOST=localhost
+# Listen to connections from this network host (leave empty to accept all connections)
+#Uncomment to restrict access to localhost
+#JETTY_HOST=$(uname -n)
 
 # The network port used by Jetty
 #JETTY_PORT=8080

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/jetty.init	2009-06-27 21:08:18 UTC (rev 8618)
@@ -99,8 +99,9 @@
 # Set this to an empty string to prevent Jetty from starting automatically
 JETTY_USER=jetty
             
-# The network host            
-JETTY_HOST=$(uname -n)
+# Listen to connections from this network host (leave empty to accept all connections)
+#JETTY_HOST=$(uname -n)
+JETTY_HOST=
 
 # The network port used by Jetty
 JETTY_PORT=8080
@@ -194,6 +195,7 @@
 WEBAPPDIR="$JETTY_HOME/webapps"
 BOOTSTRAP_CLASS=org.mortbay.start.Bootstrap
 JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$START_JAR:$JAVA_HOME/lib/tools.jar"
+ROTATELOGS=/usr/sbin/rotatelogs
 
 ##################################################
 # Check for JAVA_HOME
@@ -259,13 +261,6 @@
 	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
 	                --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then 
 
-	    # Look for rotatelogs/rotatelogs2
-	    if [ -x /usr/sbin/rotatelogs ]; then
-			ROTATELOGS=/usr/sbin/rotatelogs
-	    else
-			ROTATELOGS=/usr/sbin/rotatelogs2
-	    fi
-
 	    if [ -f $PIDFILE ]
 		then
 			log_warning_msg "$PIDFILE exists, but jetty was not running. Ignoring $PIDFILE"

Modified: trunk/jetty/debian/libjetty-extra-java.dirs
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.dirs	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/libjetty-extra-java.dirs	2009-06-27 21:08:18 UTC (rev 8618)
@@ -2,4 +2,4 @@
 usr/share/jetty/lib/management
 usr/share/jetty/lib/management/mx4j
 usr/share/jetty/lib/naming
-usr/share/jetty/lib/jsp-2.0
+usr/share/jetty/lib/jsp-2.1

Modified: trunk/jetty/debian/libjetty-extra-java.links
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.links	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/libjetty-extra-java.links	2009-06-27 21:08:18 UTC (rev 8618)
@@ -3,6 +3,7 @@
 usr/share/java/activation.jar      usr/share/jetty/lib/naming/activation.jar
 usr/share/java/gnumail.jar         usr/share/jetty/lib/naming/mail.jar
 usr/share/java/ant.jar             usr/share/jetty/lib/jsp-2.1/ant.jar
+usr/share/java/ant-launcher.jar    usr/share/jetty/lib/jsp-2.1/ant-launcher.jar
 usr/share/java/jasper.jar          usr/share/jetty/lib/jsp-2.1/jasper.jar
 usr/share/java/jsp-api-2.1.jar     usr/share/jetty/lib/jsp-2.1/jsp-api.jar
 usr/share/java/el-api-2.1.jar      usr/share/jetty/lib/jsp-2.1/el-api.jar

Modified: trunk/jetty/debian/libjetty-java.links
===================================================================
--- trunk/jetty/debian/libjetty-java.links	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/libjetty-java.links	2009-06-27 21:08:18 UTC (rev 8618)
@@ -1,4 +1,4 @@
-usr/share/java/servlet-api-2.5.jar                            usr/share/jetty/lib/servlet-api-2.5.jar
+usr/share/java/servlet-api-2.5.jar                           usr/share/jetty/lib/servlet-api-2.5.jar
 usr/share/jetty/lib/jetty-util-$VERSION.jar                  usr/share/java/jetty-util.jar
 usr/share/jetty/lib/util5/jetty-util5-$VERSION.jar           usr/share/java/jetty-util5.jar
 usr/share/jetty/lib/jetty-$VERSION.jar                       usr/share/java/jetty.jar

Modified: trunk/jetty/debian/orig-tar.sh
===================================================================
--- trunk/jetty/debian/orig-tar.sh	2009-06-27 00:04:35 UTC (rev 8617)
+++ trunk/jetty/debian/orig-tar.sh	2009-06-27 21:08:18 UTC (rev 8618)
@@ -5,6 +5,14 @@
 TAG=$(echo jetty-$2 | sed 's,~alpha,-alpha-,')
 
 svn export http://svn.codehaus.org/jetty/jetty/tags/$TAG/ $DIR
+rm -r modules/jsp-api-2.0
+rm -r extras/win32service
+rm -r contrib/cometd
+rm -r contrib/rpms
+rm -r contrib/debian
+rm -r contrib/grizzly
+rm -r contrib/maven-beanshell-plugin
+
 tar -c -z -f $TAR $DIR
 rm -rf $DIR ../$TAG
 




More information about the pkg-java-commits mailing list