[pkg-java] r12714 - in tags/red5: . 0.9.1-2/debian 0.9.1-2/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Jun 30 22:53:07 UTC 2010
Author: drazzib
Date: 2010-06-30 22:53:07 +0000 (Wed, 30 Jun 2010)
New Revision: 12714
Added:
tags/red5/0.9.1-2/
tags/red5/0.9.1-2/debian/changelog
tags/red5/0.9.1-2/debian/control
tags/red5/0.9.1-2/debian/orig-tar.exclude
tags/red5/0.9.1-2/debian/patches/14_document_removed_stuff.diff
tags/red5/0.9.1-2/debian/patches/series
tags/red5/0.9.1-2/debian/red5-server.README.Debian
tags/red5/0.9.1-2/debian/red5-server.default
tags/red5/0.9.1-2/debian/red5-server.init
tags/red5/0.9.1-2/debian/red5-server.install
Removed:
tags/red5/0.9.1-2/debian/README.Debian
tags/red5/0.9.1-2/debian/changelog
tags/red5/0.9.1-2/debian/control
tags/red5/0.9.1-2/debian/orig-tar.exclude
tags/red5/0.9.1-2/debian/patches/series
tags/red5/0.9.1-2/debian/red5-server.default
tags/red5/0.9.1-2/debian/red5-server.init
tags/red5/0.9.1-2/debian/red5-server.install
Log:
[svn-buildpackage] Tagging red5 0.9.1-2
Deleted: tags/red5/0.9.1-2/debian/README.Debian
===================================================================
--- trunk/red5/debian/README.Debian 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/README.Debian 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,43 +0,0 @@
-Red5 for Debian
-===============
-
-NOTE: Red5 in Debian doesn't use spring framework 3.0 (as red5's upstream authors)
-as this version is not yet available as Debian package.
-As replacement, we use spring framework 2.5.x.
-Please be aware if this change when you use some custom webapps (especially regarding
-XML Schema declaration in applicationContext.xml files).
-
-Packaging
----------
-Red5 debian package is divided into:
-- libred5-java: contains jar which can be used to embed Red5
-- red5-doc: contains Javadoc API and other documentations about Red5
-- red5-server: contains configuration and init script for Red5
-
-Directories
------------
-This debian package installs red5 into /usr/share/red5/
-The configuration of the server is in /etc/red5/
-Webapps can be deployed by placing them in /var/lib/red5/webapps/
-(linked from /usr/share/red5/webapps)
-Logs can be found in /var/log/red5/
-
-Documentation
--------------
-- Javadoc API is in /usr/share/doc/red5/api/index.html
-- Red5 Reference Manual is in /usr/share/doc/red5/html/index.html
-
-Startup
--------
-You can customize Red5 startup parameters by editing /etc/default/red5-server file.
-For example, you can set JAVA_OPTS=-Xmx512m for applications with extended memory needs.
-
-Ports
------
-By default, Red5 open the following ports :
-- 5080 (HTTP port - embedded Tomcat)
-- 1935 (RTMP port)
-- 8443 (RTMPS port)
-- 9980 (JMX port - admin and shutdown)
-
-You can edit port mapping in /etc/red5/red5.properties
Deleted: tags/red5/0.9.1-2/debian/changelog
===================================================================
--- trunk/red5/debian/changelog 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/changelog 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,34 +0,0 @@
-red5 (0.9.1-1) unstable; urgency=low
-
- * New upstream release (Closes: #576355):
- - Refresh patches.
- * Bump Standards-Version to 3.8.4: no changes needed.
- * Switch to 3.0 (quilt) source format:
- - d/source/format: Set 3.0 (quilt)
- - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk
- - d/control: Remove B-D on quilt
- - d/README.source: Removed
- - Use multi-orig-tarball support: create new "orig-doc.tar.gz".
- * Add Build-Conflicts: liblogback-java (= 0.9.20-1)
- (Closes: #577859)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Fri, 23 Apr 2010 20:35:14 +0200
-
-red5 (0.9~svn3968-2) unstable; urgency=low
-
- * Upload to unstable distribution
- * Red5 API documentation:
- - Build-Depends and use default-jdk-doc instead of openjdk-6-doc
- - red5-doc now Recommends default-jdk-doc
- * red5-server.init: Add dependency on $remote_fs
- * Add debian/patches/13_jaudiotagger2.diff to fix compatibility
- with libjaudiotagger-java 2.0
- * Fix debian/watch to track only stable release
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 17 Jan 2010 22:04:48 +0100
-
-red5 (0.9~svn3968-1) experimental; urgency=low
-
- * Initial release. (Closes: #503594)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 30 Nov 2009 23:29:23 +0100
Copied: tags/red5/0.9.1-2/debian/changelog (from rev 12713, trunk/red5/debian/changelog)
===================================================================
--- tags/red5/0.9.1-2/debian/changelog (rev 0)
+++ tags/red5/0.9.1-2/debian/changelog 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,48 @@
+red5 (0.9.1-2) unstable; urgency=low
+
+ * /etc/init.d/red5-server:
+ - set NAME before using it for /etc/default/$NAME (Closes: #585530)
+ - export JAVA_HOME, JAVA_OPTS, RED5_HOME and RED5_OPTS for red5.sh usage
+ * Bump Standards-Version to 3.9.0: no changes needed.
+ * d/red5-server.install: Also install red5 logo to root webapp
+ * d/README.Debian:
+ - Describe how to install demos applications (Closes: #585946).
+ - Install it in red5-server package.
+ * d/orig-tar.exclude: Document removed stuffs
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 01 Jul 2010 00:42:55 +0200
+
+red5 (0.9.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #576355):
+ - Refresh patches.
+ * Bump Standards-Version to 3.8.4: no changes needed.
+ * Switch to 3.0 (quilt) source format:
+ - d/source/format: Set 3.0 (quilt)
+ - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk
+ - d/control: Remove B-D on quilt
+ - d/README.source: Removed
+ - Use multi-orig-tarball support: create new "orig-doc.tar.gz".
+ * Add Build-Conflicts: liblogback-java (= 0.9.20-1)
+ (Closes: #577859)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 23 Apr 2010 20:35:14 +0200
+
+red5 (0.9~svn3968-2) unstable; urgency=low
+
+ * Upload to unstable distribution
+ * Red5 API documentation:
+ - Build-Depends and use default-jdk-doc instead of openjdk-6-doc
+ - red5-doc now Recommends default-jdk-doc
+ * red5-server.init: Add dependency on $remote_fs
+ * Add debian/patches/13_jaudiotagger2.diff to fix compatibility
+ with libjaudiotagger-java 2.0
+ * Fix debian/watch to track only stable release
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 17 Jan 2010 22:04:48 +0100
+
+red5 (0.9~svn3968-1) experimental; urgency=low
+
+ * Initial release. (Closes: #503594)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 30 Nov 2009 23:29:23 +0100
Deleted: tags/red5/0.9.1-2/debian/control
===================================================================
--- trunk/red5/debian/control 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/control 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,79 +0,0 @@
-Source: red5
-Section: java
-Priority: optional
-Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant
-Build-Depends-Indep: libsaxon-java, docbook-xsl, ant-optional,
- libmina2-java, libslf4j-java (>= 1.5.5), liblogback-java (>= 0.9.17),
- libcommons-lang-java, libcommons-collections3-java, libcommons-beanutils-java,
- libcommons-codec-java, libcommons-httpclient-java, libxerces2-java, groovy,
- libspring-core-2.5-java, libspring-beans-2.5-java, libspring-context-2.5-java,
- libspring-web-2.5-java, libbcprov-java, libehcache-java, libquartz-java,
- libjaudiotagger-java, libmx4j-java (>> 3.0.2-4), libxmlrpc3-server-java,
- libtomcat6-java (>= 6.0.20-7), libservlet2.5-java, junit4 (>= 4.5),
- libhamcrest-java, libspring-test-2.5-java,
- libgroboutils-java, libcommons-logging-java, libjetty-java, jython,
- libbackport-util-concurrent-java,
- default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
-Build-Conflicts: liblogback-java (= 0.9.20-1)
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/
-Homepage: http://www.red5.org/
-
-Package: libred5-java
-Architecture: all
-Depends: ${misc:Depends},
- libmina2-java, libslf4j-java (>= 1.5.5), liblogback-java (>= 0.9.17),
- libcommons-lang-java, libcommons-collections3-java, libcommons-beanutils-java,
- libcommons-httpclient-java, libxerces2-java, groovy,
- libspring-core-2.5-java, libspring-beans-2.5-java, libspring-context-2.5-java,
- libspring-web-2.5-java, libbcprov-java, libehcache-java, libquartz-java,
- libjaudiotagger-java, libmx4j-java (>> 3.0.2-4), libxmlrpc3-server-java,
- libtomcat6-java (>= 6.0.20-7), libservlet2.5-java, libantlr-java, libasm3-java,
- libcommons-codec-java, libcommons-modeler-java, libcommons-logging-java,
- libcommons-pool-java, libaopalliance-java, jython, libjetty-java,
- libspring-aop-2.5-java, libspring-context-support-2.5-java,
- libbackport-util-concurrent-java
-Description: remote API for Red5 flash streaming server
- Red5 is a Java implementation of a Flash Media Server based on
- reverse engineering of RTMP and AMF protocols.
- .
- It support streaming video/audio/data to a Flash client and
- recording audio/video broadcast from a Flash client.
- .
- This package contains library for Java client library to query
- a remote Red5 server.
-
-Package: red5-server
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre-headless | java6-runtime-headless,
- adduser (>= 3.11), libred5-java (= ${source:Version})
-Conflicts: red5
-Description: flash streaming server
- Red5 is a Java implementation of a Flash Media Server based on
- reverse engineering of RTMP and AMF protocols.
- .
- It support streaming video/audio/data to a Flash client and
- recording audio/video broadcast from a Flash client.
- .
- Any flash client is supported, including Gnash flash client and
- Adobe Flash Player.
-
-Package: red5-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
-Suggests: libred5-java (= ${source:Version})
-Description: flash streaming server - documentation
- Red5 is a Java implementation of a Flash Media Server based on
- reverse engineering of RTMP and AMF protocols.
- .
- It support streaming video/audio/data to a Flash client and
- recording audio/video broadcast from a Flash client.
- .
- Any flash client is supported, including Gnash flash client and
- Adobe Flash Player.
- .
- This package contains documentation about Red5.
Copied: tags/red5/0.9.1-2/debian/control (from rev 12713, trunk/red5/debian/control)
===================================================================
--- tags/red5/0.9.1-2/debian/control (rev 0)
+++ tags/red5/0.9.1-2/debian/control 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,79 @@
+Source: red5
+Section: java
+Priority: optional
+Maintainer: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant
+Build-Depends-Indep: libsaxon-java, docbook-xsl, ant-optional,
+ libmina2-java, libslf4j-java (>= 1.5.5), liblogback-java (>= 0.9.17),
+ libcommons-lang-java, libcommons-collections3-java, libcommons-beanutils-java,
+ libcommons-codec-java, libcommons-httpclient-java, libxerces2-java, groovy,
+ libspring-core-2.5-java, libspring-beans-2.5-java, libspring-context-2.5-java,
+ libspring-web-2.5-java, libbcprov-java, libehcache-java, libquartz-java,
+ libjaudiotagger-java, libmx4j-java (>> 3.0.2-4), libxmlrpc3-server-java,
+ libtomcat6-java (>= 6.0.20-7), libservlet2.5-java, junit4 (>= 4.5),
+ libhamcrest-java, libspring-test-2.5-java,
+ libgroboutils-java, libcommons-logging-java, libjetty-java, jython,
+ libbackport-util-concurrent-java,
+ default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
+Build-Conflicts: liblogback-java (= 0.9.20-1)
+Standards-Version: 3.9.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/
+Homepage: http://www.red5.org/
+
+Package: libred5-java
+Architecture: all
+Depends: ${misc:Depends},
+ libmina2-java, libslf4j-java (>= 1.5.5), liblogback-java (>= 0.9.17),
+ libcommons-lang-java, libcommons-collections3-java, libcommons-beanutils-java,
+ libcommons-httpclient-java, libxerces2-java, groovy,
+ libspring-core-2.5-java, libspring-beans-2.5-java, libspring-context-2.5-java,
+ libspring-web-2.5-java, libbcprov-java, libehcache-java, libquartz-java,
+ libjaudiotagger-java, libmx4j-java (>> 3.0.2-4), libxmlrpc3-server-java,
+ libtomcat6-java (>= 6.0.20-7), libservlet2.5-java, libantlr-java, libasm3-java,
+ libcommons-codec-java, libcommons-modeler-java, libcommons-logging-java,
+ libcommons-pool-java, libaopalliance-java, jython, libjetty-java,
+ libspring-aop-2.5-java, libspring-context-support-2.5-java,
+ libbackport-util-concurrent-java
+Description: remote API for Red5 flash streaming server
+ Red5 is a Java implementation of a Flash Media Server based on
+ reverse engineering of RTMP and AMF protocols.
+ .
+ It support streaming video/audio/data to a Flash client and
+ recording audio/video broadcast from a Flash client.
+ .
+ This package contains library for Java client library to query
+ a remote Red5 server.
+
+Package: red5-server
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre-headless | java6-runtime-headless,
+ adduser (>= 3.11), libred5-java (= ${source:Version})
+Conflicts: red5
+Description: flash streaming server
+ Red5 is a Java implementation of a Flash Media Server based on
+ reverse engineering of RTMP and AMF protocols.
+ .
+ It support streaming video/audio/data to a Flash client and
+ recording audio/video broadcast from a Flash client.
+ .
+ Any flash client is supported, including Gnash flash client and
+ Adobe Flash Player.
+
+Package: red5-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
+Suggests: libred5-java (= ${source:Version})
+Description: flash streaming server - documentation
+ Red5 is a Java implementation of a Flash Media Server based on
+ reverse engineering of RTMP and AMF protocols.
+ .
+ It support streaming video/audio/data to a Flash client and
+ recording audio/video broadcast from a Flash client.
+ .
+ Any flash client is supported, including Gnash flash client and
+ Adobe Flash Player.
+ .
+ This package contains documentation about Red5.
Deleted: tags/red5/0.9.1-2/debian/orig-tar.exclude
===================================================================
--- trunk/red5/debian/orig-tar.exclude 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/orig-tar.exclude 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,8 +0,0 @@
-lib
-webapps/root/demos/*
-webapps/installer/*
-doc/reference/pdf/*
-src/conf/PolicyFileSocket.xsd
-*.psd
-test/www/streams/*
-test/fixtures/*
Copied: tags/red5/0.9.1-2/debian/orig-tar.exclude (from rev 12713, trunk/red5/debian/orig-tar.exclude)
===================================================================
--- tags/red5/0.9.1-2/debian/orig-tar.exclude (rev 0)
+++ tags/red5/0.9.1-2/debian/orig-tar.exclude 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,13 @@
+# Binary files
+lib
+# Generated files
+doc/reference/pdf/*
+src/conf/PolicyFileSocket.xsd
+# Contains non-DFSG binary files
+# *.swf binary-only (Flash Player) files
+# *.flv movies trailers
+webapps/root/demos/*
+webapps/installer/*
+*.psd
+test/www/streams/*
+test/fixtures/*
Copied: tags/red5/0.9.1-2/debian/patches/14_document_removed_stuff.diff (from rev 12713, trunk/red5/debian/patches/14_document_removed_stuff.diff)
===================================================================
--- tags/red5/0.9.1-2/debian/patches/14_document_removed_stuff.diff (rev 0)
+++ tags/red5/0.9.1-2/debian/patches/14_document_removed_stuff.diff 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,15 @@
+Description: Describe removed /demos and /installer webapp
+ in index.html
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Last-Update: 2010-07-01
+--- a/webapps/root/index.html
++++ b/webapps/root/index.html
+@@ -92,6 +92,7 @@
+ <br />
+ If you prefer to jump right in, follow these steps:
+ <ul>
++<li>Follow instructions in "Demos" section of <a href="file:///usr/share/doc/red5-server/README.Debian">/usr/share/doc/red5-server/README.Debian</a> to install /demos or /installer webapp.</li>
+ <li><a href="installer" target="_blank">Install</a> a ready-made application</li>
+ <li>Launch a <a href="demos">demo</a></li>
+ </ul>
Deleted: tags/red5/0.9.1-2/debian/patches/series
===================================================================
--- trunk/red5/debian/patches/series 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/patches/series 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,8 +0,0 @@
-02_no_lib_dir.diff
-04_build_html_docs.diff
-06_use_xmlrpc3.diff
-#10_remove_red5_bootstrap_classloader.diff
-11_change_red5_bootstrap.diff
-11_change_jmx_port.diff
-12_javadoc_links.diff
-13_jaudiotagger2.diff
Copied: tags/red5/0.9.1-2/debian/patches/series (from rev 12713, trunk/red5/debian/patches/series)
===================================================================
--- tags/red5/0.9.1-2/debian/patches/series (rev 0)
+++ tags/red5/0.9.1-2/debian/patches/series 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,9 @@
+02_no_lib_dir.diff
+04_build_html_docs.diff
+06_use_xmlrpc3.diff
+#10_remove_red5_bootstrap_classloader.diff
+11_change_red5_bootstrap.diff
+11_change_jmx_port.diff
+12_javadoc_links.diff
+13_jaudiotagger2.diff
+14_document_removed_stuff.diff
Copied: tags/red5/0.9.1-2/debian/red5-server.README.Debian (from rev 12713, trunk/red5/debian/red5-server.README.Debian)
===================================================================
--- tags/red5/0.9.1-2/debian/red5-server.README.Debian (rev 0)
+++ tags/red5/0.9.1-2/debian/red5-server.README.Debian 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,64 @@
+Red5 for Debian
+===============
+
+NOTE: Red5 in Debian doesn't use spring framework 3.0 (as red5's upstream authors)
+as this version is not yet available as Debian package.
+As replacement, we use spring framework 2.5.x.
+Please be aware if this change when you use some custom webapps (especially regarding
+XML Schema declaration in applicationContext.xml files).
+
+Packaging
+---------
+Red5 debian package is divided into:
+- libred5-java: contains jar which can be used to embed Red5
+- red5-doc: contains Javadoc API and other documentations about Red5
+- red5-server: contains configuration and init script for Red5
+
+Directories
+-----------
+This debian package installs red5 into /usr/share/red5/
+The configuration of the server is in /etc/red5/
+Webapps can be deployed by placing them in /var/lib/red5/webapps/
+(linked from /usr/share/red5/webapps)
+Logs can be found in /var/log/red5/
+
+Documentation
+-------------
+- Javadoc API is in /usr/share/doc/red5/api/index.html
+- Red5 Reference Manual is in /usr/share/doc/red5/html/index.html
+
+Startup
+-------
+You can customize Red5 startup parameters by editing /etc/default/red5-server file.
+For example, you can set JAVA_OPTS=-Xmx512m for applications with extended memory needs.
+
+Ports
+-----
+By default, Red5 open the following ports :
+- 5080 (HTTP port - embedded Tomcat)
+- 1935 (RTMP port)
+- 8443 (RTMPS port)
+- 9980 (JMX port - admin and shutdown)
+
+You can edit port mapping in /etc/red5/red5.properties
+
+Demos
+-----
+Current red5-server package doesn't contains /demos or /installer webapps.
+They contains non-free stuffs :
+- *.swf binary-only (Flash Player) files
+- *.flv movies trailers like Avatar / Toy Story 3
+
+As root, you can install /demos (SWF files) and /installer webapp, by issuing :
+ wget http://www.red5.org/downloads/0_9/red5-0.9.1.tar.gz
+ tar xvzf red5-*.tar.gz
+ cd red5-*
+ cp -R webapps/root/demos/* /var/lib/red5/webapps/root/demos/*
+ cp -R webapps/installer/* /var/lib/red5/webapps/installer/*
+ find /var/lib/red5/webapps/ -type d -exec chown _red5 {} \;
+ cd ..
+ rm -rf red5-*
+
+Then, you can point your favorite browser to
+<http://127.0.0.1:5080/installer/>
+and install demos of your choice (Java application's parts).
Deleted: tags/red5/0.9.1-2/debian/red5-server.default
===================================================================
--- trunk/red5/debian/red5-server.default 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/red5-server.default 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,24 +0,0 @@
-# Whether to start Red5 (as a daemon or not)
-#NO_START=0
-
-# Time to wait for the server to die, in seconds
-#DIETIME=30
-
-# Time to wait for the server to start, in seconds
-#STARTTIME=5
-
-# Users to run the daemons as. If this value
-# is set start-stop-daemon will chuid the server
-#DAEMONUSER=_red5
-
-# JVM to use to start Red5
-#JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
-
-# JVM options for startup
-#JAVA_OPTS=
-
-# Home of Red5 server
-#RED5_HOME=/usr/share/red5/
-
-# Options for Red5 server
-#RED5_OPTS=
Copied: tags/red5/0.9.1-2/debian/red5-server.default (from rev 12713, trunk/red5/debian/red5-server.default)
===================================================================
--- tags/red5/0.9.1-2/debian/red5-server.default (rev 0)
+++ tags/red5/0.9.1-2/debian/red5-server.default 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,25 @@
+# Whether to start Red5 (as a daemon or not)
+#NO_START=0
+
+# Time to wait for the server to die, in seconds
+#DIETIME=30
+
+# Time to wait for the server to start, in seconds
+#STARTTIME=5
+
+# Users to run the daemons as. If this value
+# is set start-stop-daemon will chuid the server
+#DAEMONUSER=_red5
+
+# JVM to use to start Red5 (use OpenJDK6 by default)
+# If you leave it blank, will use alternative system (ie. /usr/bin/java symlink)
+#JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+
+# JVM options for startup
+#JAVA_OPTS=
+
+# Home of Red5 server
+#RED5_HOME=/usr/share/red5/
+
+# Options for Red5 server
+#RED5_OPTS=
Deleted: tags/red5/0.9.1-2/debian/red5-server.init
===================================================================
--- trunk/red5/debian/red5-server.init 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/red5-server.init 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,257 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs at debian.org>
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL; if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-#
-### BEGIN INIT INFO
-# Provides: red5-server
-# Required-Start: $local_fs $remote_fs $network
-# Required-Stop: $local_fs $remote_fs $network
-# Should-Start: $named
-# Should-Stop: $named
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Red5
-# Description: Flash streaming server
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-# Default options, these can be overriden by the information
-# at /etc/default/red5
-
-# Whether to start Red5 (as a daemon or not)
-NO_START=0
-
-# Time to wait for the server to die, in seconds
-DIETIME=30
-
-# Time to wait for the server to start, in seconds
-STARTTIME=5
-
-# Users to run the daemons as. If this value
-# is set start-stop-daemon will chuid the server
-DAEMONUSER=_red5
-
-# JVM to use to start Red5
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
-
-# JVM options for startup
-JAVA_OPTS=
-
-# Home of Red5 server
-RED5_HOME=/usr/share/red5/
-
-# Options for Red5 server
-RED5_OPTS=
-
-# End of variables that can be overwritten
-
-# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
-fi
-
-#Others configuration options not overrideable
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/share/red5/red5.sh
-DAEMON_STOP=/usr/share/red5/red5-shutdown.sh
-RED5_MAINCLASS=org.red5.server.Bootstrap
-NAME=red5-server
-DESC="Flash streaming server"
-PIDFILE=/var/run/$NAME.pid
-
-test -x $DAEMON || exit 0
-
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -n "$DAEMONUSER" ] ; then
- if getent passwd | grep -q "^$DAEMONUSER:"; then
- # Obtain the uid and gid
- DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
- DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
- else
- log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
- exit 1
- fi
-fi
-
-# Check whether startup has been disabled
-if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
- [ "$VERBOSE" != "no" ] && log_failure_msg "Not starting $NAME - edit /etc/default/$NAME and change NO_START to be 0 (or comment it out)."
- exit 0
-fi
-
-set -e
-
-running_pid() {
-# Check if a given process pid's cmdline matches a given name
- pid=$1
- [ -z "$pid" ] && return 1
- [ ! -d /proc/$pid ] && return 1
- cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|tail -n 1 |cut -d : -f 1`
- exe=`basename $cmd`
- # Is this the expected server
- [ "x$exe" != "x$RED5_MAINCLASS" ] && return 1
- return 0
-}
-
-running() {
-# Check if the process is running looking at /proc
-# (works for all users)
- # No pidfile, probably no daemon present
- [ ! -f "$PIDFILE" ] && return 1
- pid=`cat $PIDFILE`
- running_pid $pid || return 1
- return 0
-}
-
-start_server() {
-# Start the process using the wrapper
- start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
- --chuid $DAEMONUSER --background \
- --chdir $RED5_HOME \
- --name java --startas $DAEMON -- $RED5_OPTS
- errcode=$?
- return $errcode
-}
-
-stop_server() {
-# Stop the process using the wrapper
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --user $DAEMONUSER \
- --chdir $RED5_HOME \
- --name java --startas $DAEMON_STOP -- $RED5_OPTS
- errcode=$?
- return $errcode
-}
-
-reload_server() {
- [ ! -f "$PIDFILE" ] && return 1
- pid=pidofproc $PIDFILE # This is the daemon's pid
- # Send a SIGHUP
- kill -1 $pid
- return $?
-}
-
-force_stop() {
-# Force the process to die killing it manually
- [ ! -e "$PIDFILE" ] && return
- if running ; then
- kill -15 $pid
- # Is it really dead?
- sleep "$DIETIME"s
- if running ; then
- kill -9 $pid
- sleep "$DIETIME"s
- if running ; then
- echo "Cannot kill $NAME (pid=$pid)!"
- exit 1
- fi
- fi
- fi
- rm -f $PIDFILE
-}
-
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC " "$NAME"
- # Check if it's running first
- if running ; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if start_server ; then
- # NOTE: Some servers might die some time after they start,
- # this code will detect this issue if STARTTIME is set
- # to a reasonable value
- [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
- if running ; then
- # It's ok, the server started and is running
- log_end_msg 0
- else
- # It is not running after we did start
- log_end_msg 1
- fi
- else
- # Either we could not start it
- log_end_msg 1
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- if running ; then
- # Only stop the server if we see it running
- errcode=0
- stop_server || errcode=$?
- log_end_msg $errcode
- else
- # If it's not running don't do anything
- log_progress_msg "apparently not running"
- log_end_msg 0
- exit 0
- fi
- ;;
- force-stop)
- # First try to stop gracefully the program
- $0 stop
- if running; then
- # If it's still running try to kill it more forcefully
- log_daemon_msg "Stopping (force) $DESC" "$NAME"
- errcode=0
- force_stop || errcode=$?
- log_end_msg $errcode
- fi
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- errcode=0
- stop_server || errcode=$?
- # Wait some sensible amount, some server need this
- [ -n "$DIETIME" ] && sleep $DIETIME
- start_server || errcode=$?
- [ -n "$STARTTIME" ] && sleep $STARTTIME
- running || errcode=$?
- log_end_msg $errcode
- ;;
- status)
-
- log_daemon_msg "Checking status of $DESC" "$NAME"
- if running ; then
- log_progress_msg "running"
- log_end_msg 0
- else
- log_progress_msg "apparently not running"
- log_end_msg 1
- exit 1
- fi
- ;;
- reload)
- log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
- log_warning_msg "cannot re-read the config file (use restart)."
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Copied: tags/red5/0.9.1-2/debian/red5-server.init (from rev 12713, trunk/red5/debian/red5-server.init)
===================================================================
--- tags/red5/0.9.1-2/debian/red5-server.init (rev 0)
+++ tags/red5/0.9.1-2/debian/red5-server.init 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,259 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs at debian.org>
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL; if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+#
+### BEGIN INIT INFO
+# Provides: red5-server
+# Required-Start: $local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
+# Should-Start: $named
+# Should-Stop: $named
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Red5
+# Description: Flash streaming server
+### END INIT INFO
+
+# Configuration options not overrideable
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=red5-server
+DAEMON=/usr/share/red5/red5.sh
+DAEMON_STOP=/usr/share/red5/red5-shutdown.sh
+RED5_MAINCLASS=org.red5.server.Bootstrap
+DESC="Flash streaming server"
+PIDFILE=/var/run/$NAME.pid
+DEFAULT=/etc/default/$NAME
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/red5-server
+
+# Whether to start Red5 (as a daemon or not)
+NO_START=0
+
+# Time to wait for the server to die, in seconds
+DIETIME=30
+
+# Time to wait for the server to start, in seconds
+STARTTIME=5
+
+# Users to run the daemons as. If this value
+# is set start-stop-daemon will chuid the server
+DAEMONUSER=_red5
+
+# JVM to use to start Red5
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+
+# JVM options for startup
+JAVA_OPTS=
+
+# Home of Red5 server
+RED5_HOME=/usr/share/red5/
+
+# Options for Red5 server
+RED5_OPTS=
+
+# End of variables that can be overwritten
+
+# Include defaults if available
+[ -r $DEFAULT ] && . $DEFAULT
+
+# Export variable used by red5.sh
+export JAVA_HOME JAVA_OPTS RED5_HOME RED5_OPTS
+
+# Exit now if daemon binary is not installed
+test -x $DAEMON || exit 0
+
+# Check that the user exists (if we set a user)
+# Does the user exist?
+if [ -n "$DAEMONUSER" ] ; then
+ if getent passwd | grep -q "^$DAEMONUSER:"; then
+ # Obtain the uid and gid
+ DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
+ DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
+ else
+ log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
+ exit 1
+ fi
+fi
+
+# Check whether startup has been disabled
+if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
+ [ "$VERBOSE" != "no" ] && log_failure_msg "Not starting $NAME - edit /etc/default/$NAME and change NO_START to be 0 (or comment it out)."
+ exit 0
+fi
+
+set -e
+
+running_pid() {
+# Check if a given process pid's cmdline matches a given name
+ pid=$1
+ [ -z "$pid" ] && return 1
+ [ ! -d /proc/$pid ] && return 1
+ cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|tail -n 1 |cut -d : -f 1`
+ exe=`basename $cmd`
+ # Is this the expected server
+ [ "x$exe" != "x$RED5_MAINCLASS" ] && return 1
+ return 0
+}
+
+running() {
+# Check if the process is running looking at /proc
+# (works for all users)
+ # No pidfile, probably no daemon present
+ [ ! -f "$PIDFILE" ] && return 1
+ pid=`cat $PIDFILE`
+ running_pid $pid || return 1
+ return 0
+}
+
+start_server() {
+# Start the process using the wrapper
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
+ --chuid $DAEMONUSER --background \
+ --chdir $RED5_HOME \
+ --name java --startas $DAEMON -- $RED5_OPTS
+ errcode=$?
+ return $errcode
+}
+
+stop_server() {
+# Stop the process using the wrapper
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER \
+ --chdir $RED5_HOME \
+ --name java --startas $DAEMON_STOP -- $RED5_OPTS
+ errcode=$?
+ return $errcode
+}
+
+reload_server() {
+ [ ! -f "$PIDFILE" ] && return 1
+ pid=pidofproc $PIDFILE # This is the daemon's pid
+ # Send a SIGHUP
+ kill -1 $pid
+ return $?
+}
+
+force_stop() {
+# Force the process to die killing it manually
+ [ ! -e "$PIDFILE" ] && return
+ if running ; then
+ kill -15 $pid
+ # Is it really dead?
+ sleep "$DIETIME"s
+ if running ; then
+ kill -9 $pid
+ sleep "$DIETIME"s
+ if running ; then
+ echo "Cannot kill $NAME (pid=$pid)!"
+ exit 1
+ fi
+ fi
+ fi
+ rm -f $PIDFILE
+}
+
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC " "$NAME"
+ # Check if it's running first
+ if running ; then
+ log_progress_msg "apparently already running"
+ log_end_msg 0
+ exit 0
+ fi
+ if start_server ; then
+ # NOTE: Some servers might die some time after they start,
+ # this code will detect this issue if STARTTIME is set
+ # to a reasonable value
+ [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
+ if running ; then
+ # It's ok, the server started and is running
+ log_end_msg 0
+ else
+ # It is not running after we did start
+ log_end_msg 1
+ fi
+ else
+ # Either we could not start it
+ log_end_msg 1
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ if running ; then
+ # Only stop the server if we see it running
+ errcode=0
+ stop_server || errcode=$?
+ log_end_msg $errcode
+ else
+ # If it's not running don't do anything
+ log_progress_msg "apparently not running"
+ log_end_msg 0
+ exit 0
+ fi
+ ;;
+ force-stop)
+ # First try to stop gracefully the program
+ $0 stop
+ if running; then
+ # If it's still running try to kill it more forcefully
+ log_daemon_msg "Stopping (force) $DESC" "$NAME"
+ errcode=0
+ force_stop || errcode=$?
+ log_end_msg $errcode
+ fi
+ ;;
+ restart|force-reload)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ errcode=0
+ stop_server || errcode=$?
+ # Wait some sensible amount, some server need this
+ [ -n "$DIETIME" ] && sleep $DIETIME
+ start_server || errcode=$?
+ [ -n "$STARTTIME" ] && sleep $STARTTIME
+ running || errcode=$?
+ log_end_msg $errcode
+ ;;
+ status)
+
+ log_daemon_msg "Checking status of $DESC" "$NAME"
+ if running ; then
+ log_progress_msg "running"
+ log_end_msg 0
+ else
+ log_progress_msg "apparently not running"
+ log_end_msg 1
+ exit 1
+ fi
+ ;;
+ reload)
+ log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+ log_warning_msg "cannot re-read the config file (use restart)."
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Deleted: tags/red5/0.9.1-2/debian/red5-server.install
===================================================================
--- trunk/red5/debian/red5-server.install 2010-06-29 22:09:20 UTC (rev 12708)
+++ tags/red5/0.9.1-2/debian/red5-server.install 2010-06-30 22:53:07 UTC (rev 12714)
@@ -1,36 +0,0 @@
-boot.jar usr/share/red5/
-
-src/conf/web.xml etc/red5/
-src/conf/context.xml etc/red5/
-
-src/conf/red5.xml etc/red5/
-src/conf/red5.properties etc/red5/
-src/conf/red5.policy etc/red5/
-src/conf/red5.globals etc/red5/
-src/conf/red5-common.xml etc/red5/
-src/conf/red5-core.xml etc/red5/
-
-src/conf/ehcache.xml etc/red5/
-src/conf/quartz.properties etc/red5/
-src/conf/realm.properties etc/red5/
-debian/logback.xml etc/red5/
-src/conf/log4j.properties etc/red5/
-src/conf/access.properties etc/red5/
-src/conf/password.properties etc/red5/
-src/conf/tomcat-users.xml etc/red5/
-src/conf/catalina.policy etc/red5/
-src/conf/build_standalone.properties etc/red5/
-src/conf/keystore etc/red5/
-src/conf/truststore.jmx etc/red5/
-src/conf/keystore.jmx etc/red5/
-
-red5.sh usr/share/red5/
-red5-debug.sh usr/share/red5/
-red5-highperf.sh usr/share/red5/
-red5-shutdown.sh usr/share/red5/
-
-webapps/red5-default.xml var/lib/red5/webapps/
-webapps/root/crossdomain.xml var/lib/red5/webapps/root/
-webapps/root/index.html var/lib/red5/webapps/root/
-webapps/root/favicon.ico var/lib/red5/webapps/root/
-webapps/root/WEB-INF/* var/lib/red5/webapps/root/WEB-INF/
Copied: tags/red5/0.9.1-2/debian/red5-server.install (from rev 12713, trunk/red5/debian/red5-server.install)
===================================================================
--- tags/red5/0.9.1-2/debian/red5-server.install (rev 0)
+++ tags/red5/0.9.1-2/debian/red5-server.install 2010-06-30 22:53:07 UTC (rev 12714)
@@ -0,0 +1,37 @@
+boot.jar usr/share/red5/
+
+src/conf/web.xml etc/red5/
+src/conf/context.xml etc/red5/
+
+src/conf/red5.xml etc/red5/
+src/conf/red5.properties etc/red5/
+src/conf/red5.policy etc/red5/
+src/conf/red5.globals etc/red5/
+src/conf/red5-common.xml etc/red5/
+src/conf/red5-core.xml etc/red5/
+
+src/conf/ehcache.xml etc/red5/
+src/conf/quartz.properties etc/red5/
+src/conf/realm.properties etc/red5/
+debian/logback.xml etc/red5/
+src/conf/log4j.properties etc/red5/
+src/conf/access.properties etc/red5/
+src/conf/password.properties etc/red5/
+src/conf/tomcat-users.xml etc/red5/
+src/conf/catalina.policy etc/red5/
+src/conf/build_standalone.properties etc/red5/
+src/conf/keystore etc/red5/
+src/conf/truststore.jmx etc/red5/
+src/conf/keystore.jmx etc/red5/
+
+red5.sh usr/share/red5/
+red5-debug.sh usr/share/red5/
+red5-highperf.sh usr/share/red5/
+red5-shutdown.sh usr/share/red5/
+
+webapps/red5-default.xml var/lib/red5/webapps/
+webapps/root/crossdomain.xml var/lib/red5/webapps/root/
+webapps/root/index.html var/lib/red5/webapps/root/
+webapps/root/*.ico var/lib/red5/webapps/root/
+webapps/root/*.png var/lib/red5/webapps/root/
+webapps/root/WEB-INF/* var/lib/red5/webapps/root/WEB-INF/
More information about the pkg-java-commits
mailing list