Author: drazzib Date: 2009-11-29 16:20:39 +0000 (Sun, 29 Nov 2009) New Revision: 11168
Added: trunk/red5/debian/ trunk/red5/debian/README.Debian trunk/red5/debian/README.source trunk/red5/debian/TODO trunk/red5/debian/ant.properties trunk/red5/debian/changelog trunk/red5/debian/compat trunk/red5/debian/control trunk/red5/debian/copyright trunk/red5/debian/libred5-java.install trunk/red5/debian/logback.xml trunk/red5/debian/orig-tar.exclude trunk/red5/debian/orig-tar.sh trunk/red5/debian/patches/ trunk/red5/debian/patches/02_no_lib_dir.diff trunk/red5/debian/patches/04_build_html_docs.diff trunk/red5/debian/patches/06_use_xmlrpc3.diff trunk/red5/debian/patches/10_remove_red5_bootstrap_classloader.diff trunk/red5/debian/patches/11_change_jmx_port.diff trunk/red5/debian/patches/11_change_red5_bootstrap.diff trunk/red5/debian/patches/12_javadoc_links.diff trunk/red5/debian/patches/series trunk/red5/debian/red5-doc.doc-base.api trunk/red5/debian/red5-doc.doc-base.reference trunk/red5/debian/red5-doc.install trunk/red5/debian/red5-server.default trunk/red5/debian/red5-server.dirs trunk/red5/debian/red5-server.init trunk/red5/debian/red5-server.install trunk/red5/debian/red5-server.links trunk/red5/debian/red5-server.postinst trunk/red5/debian/red5-server.postrm trunk/red5/debian/rules trunk/red5/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/red5/debian ___________________________________________________________________ Added: mergeWithUpstream + 1 Added: trunk/red5/debian/README.Debian =================================================================== --- trunk/red5/debian/README.Debian (rev 0) +++ trunk/red5/debian/README.Debian 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,26 @@ +Red5 for Debian +=============== + +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) + +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 edit Red5 startup parameters by customizing /etc/default/red5-server file. +For example, you can set JAVA_OPTS=-Xmx512m for applications with extended memory needs. Added: trunk/red5/debian/README.source =================================================================== --- trunk/red5/debian/README.source (rev 0) +++ trunk/red5/debian/README.source 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,9 @@ +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + Added: trunk/red5/debian/TODO =================================================================== --- trunk/red5/debian/TODO (rev 0) +++ trunk/red5/debian/TODO 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,3 @@ +- Add conffiles for everything in /etc ? +- Create some wrapper script to enable / disable some context +- Cleanup keystore and default passwords Added: trunk/red5/debian/ant.properties =================================================================== --- trunk/red5/debian/ant.properties (rev 0) +++ trunk/red5/debian/ant.properties 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,47 @@ +library.installed = true + +debian.build.classpath = /usr/share/java/mina2-core.jar;\ +/usr/share/java/mina2-integration-jmx.jar;\ +/usr/share/java/mina2-integration-beans.jar;\ +/usr/share/java/slf4j-api.jar;\ +/usr/share/java/jul-to-slf4j.jar;\ +/usr/share/java/logback-core.jar;\ +/usr/share/java/logback-classic.jar;\ +/usr/share/java/commons-lang.jar;\ +/usr/share/java/commons-collections3.jar;\ +/usr/share/java/commons-beanutils.jar;\ +/usr/share/java/commons-httpclient.jar;\ +/usr/share/java/commons-codec.jar;\ +/usr/share/java/groovy.jar;\ +/usr/share/java/spring-core.jar;\ +/usr/share/java/spring-beans.jar;\ +/usr/share/java/spring-context.jar;\ +/usr/share/java/spring-web.jar;\ +/usr/share/java/bcprov.jar;\ +/usr/share/java/ehcache.jar;\ +/usr/share/java/quartz-all.jar;\ +/usr/share/java/jaudiotagger.jar;\ +/usr/share/java/mx4j.jar;\ +/usr/share/java/mx4j-tools.jar;\ +/usr/share/java/xmlrpc-server-3.1.jar;\ +/usr/share/java/xmlrpc-common-3.1.jar;\ +/usr/share/tomcat6/lib/catalina.jar;\ +/usr/share/tomcat6/lib/tomcat-coyote.jar;\ +/usr/share/java/servlet-api-2.5.jar;\ +/usr/share/java/jetty.jar;\ +/usr/share/java/jetty-util.jar;\ +/usr/share/java/jython.jar + +debian.test.classpath = /usr/share/java/junit4.jar;\ +/usr/share/java/hamcrest-core.jar;\ +/usr/share/java/spring-test.jar;\ +/usr/share/java/commons-logging.jar;\ +/usr/share/java/log4j-1.2.jar;\ +/usr/share/java/groboutils-testingjunit-core.jar;\ +/usr/share/java/catalina.jar;\ +/usr/share/tomcat6/bin/tomcat-juli.jar;\ +/usr/share/java/annotations-api.jar;\ +/usr/share/java/el-api-2.1.jar;\ +/usr/share/java/groovy.jar;\ +/usr/share/java/jruby1.1.jar;\ +/usr/share/java/backport-util-concurrent.jar Added: trunk/red5/debian/changelog =================================================================== --- trunk/red5/debian/changelog (rev 0) +++ trunk/red5/debian/changelog 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,5 @@ +red5 (0.9~svn3968-1) UNRELEASED; urgency=low + + * Initial release. (Closes: #503594) + + -- Damien Raude-Morvan <draz...@debian.org> Sun, 29 Nov 2009 17:16:38 +0100 Added: trunk/red5/debian/compat =================================================================== --- trunk/red5/debian/compat (rev 0) +++ trunk/red5/debian/compat 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1 @@ +7 Added: trunk/red5/debian/control =================================================================== --- trunk/red5/debian/control (rev 0) +++ trunk/red5/debian/control 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,77 @@ +Source: red5 +Section: java +Priority: optional +Maintainer: Damien Raude-Morvan <draz...@debian.org> +Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant, quilt +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, ant-optional, libspring-test-2.5-java, + libgroboutils-java, libcommons-logging-java, libjetty-java, jython, + libbackport-util-concurrent-java, + openjdk-6-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc +Standards-Version: 3.8.3 +Vcs-Svn: http://svn.drazzib.com/debian-pkg/red5/trunk/ +Vcs-Browser: http://svn.drazzib.com/wsvn/debian-pkg/red5/trunk/ +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} +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. Added: trunk/red5/debian/copyright =================================================================== --- trunk/red5/debian/copyright (rev 0) +++ trunk/red5/debian/copyright 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,62 @@ +Format-Specification: http://dep.debian.net/deps/dep5 +Upstream-Name: RED5 Open Source Flash Server +Upstream-Maintainer: The Red5 Project (r...@osflash.org) +Upstream-Source: http://www.osflash.org/red5 + +Files: * +Copyright: Copyright 2006-2009 by The Red5 Project (r...@osflash.org) +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your option) any later + version. + + This library 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 Lesser General Public License for more details. + + On Debian systems the full text of the GNU Lesser General Public License + can be found in the `/usr/share/common-licenses/LGPL-2.1' file. + +Files: src/org/red5/io/utils/DOM2Writer.java, + src/org/red5/io/utils/HexDump.java, + src/org/red5/server/pooling/ThreadPoolMBean.java, + src/org/red5/server/pooling/ThreadPool.java, + src/org/red5/server/pooling/Worker.java, + src/org/red5/server/script/groovy/GroovyScriptFactory.java, + src/org/red5/server/script/rhino/RhinoScriptUtils.java, + src/org/red5/server/script/rhino/RhinoScriptFactory.java +Copyright: Copyright 2006-2009 by The Red5 Project (r...@osflash.org) +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + On Debian systems the full text of the GNU Lesser General Public License + can be found in the `/usr/share/common-licenses/Apache-2.0' file. + +Files: debian/* +Copyright: Copyright 2008-2009, Damien Raude-Morvan <draz...@debian.org> +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + On Debian systems the full text of the GNU Lesser General Public License + can be found in the `/usr/share/common-licenses/Apache-2.0' file. Added: trunk/red5/debian/libred5-java.install =================================================================== --- trunk/red5/debian/libred5-java.install (rev 0) +++ trunk/red5/debian/libred5-java.install 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,2 @@ +red5.jar usr/share/red5/ +dist/red5-remoting.jar usr/share/red5/ Added: trunk/red5/debian/logback.xml =================================================================== --- trunk/red5/debian/logback.xml (rev 0) +++ trunk/red5/debian/logback.xml 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration> + <!-- Uncomment if you are using the logback plugin for eclipse + <consolePlugin/> + --> + <appender name="CONSOLE" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>[%p] [%thread] %logger - %msg%n</Pattern> + </layout> + </appender> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <File>/var/log/red5/red5.log</File> + <Append>false</Append> + <Encoding>UTF-8</Encoding> + <BufferedIO>false</BufferedIO> + <ImmediateFlush>true</ImmediateFlush> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%d{ISO8601} [%thread] %-5level %logger{35} - %msg%n</Pattern> + </layout> + </appender> + <appender name="ERRORFILE" class="ch.qos.logback.core.FileAppender"> + <File>/var/log/red5/error.log</File> + <Append>false</Append> + <Encoding>UTF-8</Encoding> + <BufferedIO>false</BufferedIO> + <ImmediateFlush>true</ImmediateFlush> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>WARN</level> + </filter> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%d{ISO8601} [%thread] %-5level %logger{35} - %msg%n</Pattern> + </layout> + </appender> + <root> + <level value="DEBUG" /> + <appender-ref ref="CONSOLE" /> + <appender-ref ref="FILE" /> + <appender-ref ref="ERRORFILE" /> + </root> + <!-- Red5 --> + <logger name="org.red5.io"> + <level value="INFO" /> + </logger> + <logger name="org.red5.logging.DerbyLogInterceptor"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.Client"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.jetty"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.Standalone"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.tomcat"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.api.stream.support"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.cache"> + <level value="WARN" /> + </logger> + <logger + name="org.red5.server.jetty.Red5WebPropertiesConfiguration"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.jmx"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.messaging.InMemoryPushPushPipe"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.net"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.net.servlet.RTMPTServlet"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.net.servlet"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.net.proxy"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.net.remoting"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.net.rtmp"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.net.rtmp.RTMPHandler"> + <level value="OFF" /> + </logger> + <logger name="org.red5.server.net.rtmp.BaseRTMPHandler"> + <level value="OFF" /> + </logger> + <logger name="org.red5.server.net.rtmp.codec"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.net.rtmp.RTMPMinaIoHandler"> + <level value="OFF" /> + </logger> + <logger name="org.red5.server.net.rtmp.RTMPMinaTransport"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.net.rtmp.status"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.net.rtmpt"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.persistence"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.pooling.ThreadObjectFactory"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.script"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.service"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.so"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.stream"> + <level value="INFO" /> + </logger> + <logger name="org.red5.server.stream.consumer"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.net.mrtmp"> + <level value="WARN" /> + </logger> + <logger name="org.red5.server.net.mrtmp.codec"> + <level value="WARN" /> + </logger> + <!-- Mina --> + <logger name="org.apache.mina"> + <level value="WARN" /> + </logger> + <logger name="org.apache.mina.filter"> + <level value="WARN" /> + </logger> + <logger name="org.apache.mina.filter.thread.ThreadPoolFilter"> + <level value="WARN" /> + </logger> + <!-- Apache commons --> + <logger name="org.apache.commons"> + <level value="WARN" /> + </logger> + <logger name="org.apache.commons.modeler"> + <level value="WARN" /> + </logger> + <logger name="org.apache.commons.beanutils"> + <level value="WARN" /> + </logger> + <logger name="org.apache.commons.digester"> + <level value="WARN" /> + </logger> + <logger name="httpclient"> + <level value="WARN" /> + </logger> + <!-- Apache catalina / tomcat --> + <logger name="org.apache.catalina"> + <level value="INFO" /> + </logger> + <logger name="org.apache.catalina.realm"> + <level value="WARN" /> + </logger> + <logger name="org.apache.catalina.session"> + <level value="WARN" /> + </logger> + <logger name="org.apache.jasper"> + <level value="INFO" /> + </logger> + <logger name="org.apache.tomcat"> + <level value="INFO" /> + </logger> + <logger name="org.apache.tomcat.util.net"> + <level value="WARN" /> + </logger> + <logger name="org.apache.coyote.http11"> + <level value="INFO" /> + </logger> + <!-- Jetty --> + <logger name="org.mortbay"> + <level value="WARN" /> + </logger> + <logger name="org.mortbay.log"> + <level value="INFO" /> + </logger> + <!-- Spring --> + <logger name="org.springframework"> + <level value="INFO" /> + </logger> + <logger name="org.springframework.beans.factory"> + <level value="INFO" /> + </logger> + <logger name="org.springframework.beans.factory.xml"> + <level value="WARN" /> + </logger> + <logger name="org.springframework.ui.context.support"> + <level value="WARN" /> + </logger> + <logger name="org.springframework.web.context"> + <level value="INFO" /> + </logger> + <logger name="org.springframework.web.context.support"> + <level value="WARN" /> + </logger> + <logger name="org.quartz"> + <level value="WARN" /> + </logger> + <!-- Caching --> + <logger name="net.sf.ehcache"> + <level value="INFO" /> + </logger> + +</configuration> Added: trunk/red5/debian/orig-tar.exclude =================================================================== --- trunk/red5/debian/orig-tar.exclude (rev 0) +++ trunk/red5/debian/orig-tar.exclude 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,8 @@ +lib +webapps/root/demos/* +webapps/installer/* +doc/reference/pdf/* +src/conf/PolicyFileSocket.xsd +*.psd +test/www/streams/* +test/fixtures/* Added: trunk/red5/debian/orig-tar.sh =================================================================== --- trunk/red5/debian/orig-tar.sh (rev 0) +++ trunk/red5/debian/orig-tar.sh 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,23 @@ +#!/bin/sh -e + +# $1 version +TAR=../red5_$1.orig.tar.gz +DIR=red5-$1.orig + +VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'` +# Extract everything after "svn" in $1 +REVISION=`echo $1 | sed 's/.*svn//'` + +# clean up the upstream tarball +svn export -r $REVISION http://red5.googlecode.com/svn/java/server/trunk/ $DIR +GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 Added: trunk/red5/debian/patches/02_no_lib_dir.diff =================================================================== --- trunk/red5/debian/patches/02_no_lib_dir.diff (rev 0) +++ trunk/red5/debian/patches/02_no_lib_dir.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,73 @@ +Description: build.xml: remove usage of lib/ directory. +Author: Damien Raude-Morvan <draz...@debian.org> +Forwarded: not-needed +Last-Update: 2009-10-03 +--- a/build.xml ++++ b/build.xml +@@ -59,27 +59,31 @@ + <taskdef uri="antlib:org.apache.ivy.ant" resource="org/apache/ivy/ant/antlib.xml" classpath="${lib.dir}/${ivy.version}.jar"/> + <!-- Latest ivy 9/2008 seems to want absolute path --> + <property name="ivy.lib.dir" value="${basedir}/lib"/> ++ ++ <path id="debian.build.classpath.id"> ++ <pathelement path="${debian.build.classpath}"/> ++ </path> ++ <path id="debian.test.classpath.id"> ++ <pathelement path="${debian.test.classpath}"/> ++ </path> ++ + <path id="project.classpath"> +- <fileset dir="${lib.dir}"/> ++ <path refid="debian.build.classpath.id" /> + </path> + <path id="script.classpath"> +- <fileset dir="${lib.dir}"/> ++ <path refid="debian.build.classpath.id" /> + <pathelement location="${classes.dir}"/> + </path> + <path id="full.classpath"> +- <fileset dir="${lib.dir}"/> ++ <path refid="debian.build.classpath.id" /> ++ <path refid="debian.test.classpath.id" /> + <fileset dir="./"> + <filename name="${red5.filename}.jar"/> + <filename name="boot.jar"/> + </fileset> + </path> + <path id="runtime.classpath"> +- <fileset dir="${lib.dir}"> +- <exclude name="Grobo*.jar"/> +- <exclude name="grobo*.jar"/> +- <exclude name="junit*.jar"/> +- <exclude name="ivy*.jar"/> +- </fileset> ++ <path refid="debian.build.classpath.id" /> + </path> + <!-- Build Targets --> + <target name="-java6.check"> +@@ -459,9 +463,11 @@ + </macrodef> + <!-- Determine classpath for jar file --> + <target name="jar-determine-classpath" depends="compile" unless="jar.classpath"> ++<!-- + <manifestclasspath property="jar.classpath" jarfile="${red5.filename}.jar"> + <classpath refid="runtime.classpath"/> + </manifestclasspath> ++--> + </target> + <target name="jar" description="Make Archive" depends="jar-determine-classpath"> + <jar destfile="${red5.filename}.jar"> +@@ -503,13 +509,6 @@ + </jar> + </target> + <target name="dist" description="Create binary distribution" depends="jar"> +- <copy todir="${dist.dir}/lib"> +- <fileset dir="${lib.dir}"> +- <exclude name="ivy*.jar"/> +- <exclude name="junit*.jar"/> +- <exclude name="grobo*.jar"/> +- </fileset> +- </copy> + <copy todir="${dist.dir}/conf"> + <fileset dir="${config.dir}"> + <!-- exclude war config files --> Added: trunk/red5/debian/patches/04_build_html_docs.diff =================================================================== --- trunk/red5/debian/patches/04_build_html_docs.diff (rev 0) +++ trunk/red5/debian/patches/04_build_html_docs.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,49 @@ +Description: build.xml: Building HTML manual + - Use a custom classpath with saxon and xerces (XSLT) from Debian + Debian package: libsaxon-java and libxerces2-java + - Use Debian provided docbook XSL stylesheets + Debian package: docbook-xsl +Author: Damien Raude-Morvan <draz...@debian.org> +Forwarded: no +Last-Update: 2009-10-03 +--- a/build.xml ++++ b/build.xml +@@ -1032,9 +1032,14 @@ + else=""> + <equals arg1="@{xincludes}" arg2="true"/> + </condition> +- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="@{basedir}" classpathref="doc.lib.classpath"> ++ <java classname="com.icl.saxon.StyleSheet" fork="true" dir="@{basedir}"> ++ <classpath> ++ <pathelement location="/usr/share/java/saxon.jar"/> ++ <pathelement location="/usr/share/java/xercesImpl.jar"/> ++ <pathelement location="/usr/share/java/xmlParserAPIs.jar"/> ++ </classpath> + <jvmarg line="${xslt.xincludes}"/> +- <jvmarg value="-Dxslthl.config=file://${basedir}/${doc.ref.dir}/lib/docbook-xsl-ns/highlighting/xslthl-config.xml"/> ++ <jvmarg value="-Dxslthl.config=file:///usr/share/xml/docbook/stylesheet/nwalsh/highlighting/xslthl-config.xml"/> + <jvmarg value="-Xms128m"/> + <jvmarg value="-Xmx512m"/> + <arg line="${xslt.out} @{in} @{style} @{params}"/> +--- a/doc/reference/styles/html_chunk.xsl ++++ b/doc/reference/styles/html_chunk.xsl +@@ -3,7 +3,7 @@ + This is the XSL HTML configuration file for the Spring Reference Documentation. + --> + <!DOCTYPE xsl:stylesheet [ +- <!ENTITY db_xsl_path "../lib/docbook-xsl-ns/"> ++ <!ENTITY db_xsl_path "/usr/share/xml/docbook/stylesheet/nwalsh/"> + <!ENTITY callout_gfx_path "../images/callouts/"> + <!ENTITY admon_gfx_path "../images/admons/"> + ]> +--- a/doc/reference/src/index.xml ++++ b/doc/reference/src/index.xml +@@ -49,7 +49,7 @@ + <toc/> + + +- <xi:include href="Introduction.xml" /> ++ <xi:include href="introduction.xml" /> + + <xi:include href="WhatsNew.xml" /> + Added: trunk/red5/debian/patches/06_use_xmlrpc3.diff =================================================================== --- trunk/red5/debian/patches/06_use_xmlrpc3.diff (rev 0) +++ trunk/red5/debian/patches/06_use_xmlrpc3.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,104 @@ +Description: src/org/red5/server/net/servlet/StatisticsServlet.java: + Use Java XmlRpc 3.1 API + (Debian package libxmlrpc3-server-java). +Author: Damien Raude-Morvan <draz...@debian.org> +Forwarded: yes +Bug: http://trac.red5.org/ticket/572 +Last-Update: 2009-07-16 +--- a/src/org/red5/server/net/servlet/StatisticsServlet.java ++++ b/src/org/red5/server/net/servlet/StatisticsServlet.java +@@ -21,15 +21,21 @@ + + import java.io.IOException; + import java.io.OutputStream; ++import java.net.URL; ++ ++import org.red5.server.api.IContext; ++import org.red5.server.statistics.XmlRpcScopeStatistics; + + import javax.servlet.ServletException; + import javax.servlet.http.HttpServlet; +-import javax.servlet.http.HttpServletRequest; +-import javax.servlet.http.HttpServletResponse; + +-import org.apache.xmlrpc.XmlRpcServer; +-import org.red5.server.api.IContext; +-import org.red5.server.statistics.XmlRpcScopeStatistics; ++import org.apache.xmlrpc.XmlRpcException; ++import org.apache.xmlrpc.XmlRpcRequest; ++import org.apache.xmlrpc.server.PropertyHandlerMapping; ++import org.apache.xmlrpc.server.RequestProcessorFactoryFactory; ++import org.apache.xmlrpc.server.RequestProcessorFactoryFactory.RequestSpecificProcessorFactoryFactory; ++import org.apache.xmlrpc.webserver.XmlRpcServlet; ++ + import org.springframework.web.context.WebApplicationContext; + import org.springframework.web.context.support.WebApplicationContextUtils; + +@@ -39,15 +45,13 @@ + * @author The Red5 Project (r...@osflash.org) + * @author Joachim Bauch (j...@struktur.de) + */ +-public class StatisticsServlet extends HttpServlet { ++public class StatisticsServlet extends XmlRpcServlet { + + /** + * + */ + private static final long serialVersionUID = 5810139109603229027L; + +- private final transient XmlRpcServer server = new XmlRpcServer(); +- + protected transient WebApplicationContext webAppCtx; + + protected transient IContext webContext; +@@ -55,6 +59,7 @@ + /** {...@inheritdoc} */ + @Override + public void init() throws ServletException { ++ super.init(); + webAppCtx = WebApplicationContextUtils + .getWebApplicationContext(getServletContext()); + if (webAppCtx == null) { +@@ -67,22 +72,27 @@ + } + + webContext = (IContext) webAppCtx.getBean("web.context"); +- +- // Register handlers in XML-RPC server +- server.addHandler("scopes", new XmlRpcScopeStatistics(webContext +- .getGlobalScope())); + } + +- /** {...@inheritdoc} */ +- @Override +- public void doPost(HttpServletRequest request, HttpServletResponse response) +- throws ServletException, IOException { +- // Process request with XML-RPC server +- byte[] result = server.execute(request.getInputStream()); +- response.setContentType("text/xml"); +- response.setContentLength(result.length); +- OutputStream out = response.getOutputStream(); +- out.write(result); +- out.close(); ++ public IContext getContext() { ++ return this.webContext; + } ++ ++ protected PropertyHandlerMapping newPropertyHandlerMapping(URL url) throws IOException, XmlRpcException { ++ PropertyHandlerMapping mapping = new PropertyHandlerMapping(); ++ ++ mapping.addHandler("scopes", XmlRpcScopeStatistics.class); ++ ++ RequestProcessorFactoryFactory factory = new RequestSpecificProcessorFactoryFactory(){ ++ protected Object getRequestProcessor(Class pClass, XmlRpcRequest pRequest) throws XmlRpcException { ++ XmlRpcScopeStatistics stats = (XmlRpcScopeStatistics) super.getRequestProcessor(pClass, pRequest); ++ stats.setGlobalScope(StatisticsServlet.this.getContext().getGlobalScope()); ++ return stats; ++ } ++ }; ++ ++ mapping.setRequestProcessorFactoryFactory(factory); ++ mapping.load(Thread.currentThread().getContextClassLoader(), url); ++ return mapping; ++ } + } Added: trunk/red5/debian/patches/10_remove_red5_bootstrap_classloader.diff =================================================================== --- trunk/red5/debian/patches/10_remove_red5_bootstrap_classloader.diff (rev 0) +++ trunk/red5/debian/patches/10_remove_red5_bootstrap_classloader.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,41 @@ +Description: Don't use Red5 internal bootstraping system. + Rely on current classpath only. +Forwarded: no +Origin: vendor +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2009-10-03 +--- a/src/org/red5/server/Bootstrap.java ++++ b/src/org/red5/server/Bootstrap.java +@@ -120,22 +120,25 @@ + */ + + //get current loader +- ClassLoader baseLoader = Thread.currentThread().getContextClassLoader(); ++ //ClassLoader baseLoader = Thread.currentThread().getContextClassLoader(); + + // build a ClassLoader +- ClassLoader loader = ClassLoaderBuilder.build(); ++ //ClassLoader loader = ClassLoaderBuilder.build(); + + //set new loader as the loader for this thread +- Thread.currentThread().setContextClassLoader(loader); ++ //Thread.currentThread().setContextClassLoader(loader); + + // create a new instance of this class using new classloader +- Object boot = Class.forName("org.red5.server.Launcher", true, loader).newInstance(); ++ //Object boot = Class.forName("org.red5.server.Launcher", true, loader).newInstance(); + +- Method m1 = boot.getClass().getMethod("launch", (Class[]) null); +- m1.invoke(boot, (Object[]) null); ++ //Method m1 = boot.getClass().getMethod("launch", (Class[]) null); ++ //m1.invoke(boot, (Object[]) null); + + //not that it matters, but set it back to the original loader +- Thread.currentThread().setContextClassLoader(baseLoader); ++ //Thread.currentThread().setContextClassLoader(baseLoader); ++ ++ org.red5.server.Launcher launcher = new org.red5.server.Launcher(); ++ launcher.launch(); + } + + /** Added: trunk/red5/debian/patches/11_change_jmx_port.diff =================================================================== --- trunk/red5/debian/patches/11_change_jmx_port.diff (rev 0) +++ trunk/red5/debian/patches/11_change_jmx_port.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,31 @@ +Description: Change JMX port from 9999 to 9980 + (9999 may conflict with approx proxy server) + Also change JMX listner to bind on loopback only. +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2009-11-07 +Forwarded: not-needed + +--- a/red5-shutdown.sh ++++ b/red5-shutdown.sh +@@ -8,6 +8,6 @@ + export JAVA_OPTS="-Djavax.net.ssl.keyStore=$RED5_HOME/conf/keystore.jmx -Djavax.net.ssl.keyStorePassword=password" + + # port, username, password +-export RED5_OPTS="9999 red5user changeme" ++export RED5_OPTS="9980 red5user changeme" + export RED5_MAINCLASS=org.red5.server.Shutdown + exec $RED5_HOME/red5.sh +--- a/src/conf/red5.properties ++++ b/src/conf/red5.properties +@@ -65,9 +65,9 @@ + proxy.destination_port=1935 + + # JMX +-jmx.rmi.port.registry=9999 ++jmx.rmi.port.registry=9980 + jmx.rmi.port.remoteobjects= +-jmx.rmi.host=0.0.0.0 ++jmx.rmi.host=127.0.0.1 + jmx.rmi.ssl=false + + Added: trunk/red5/debian/patches/11_change_red5_bootstrap.diff =================================================================== --- trunk/red5/debian/patches/11_change_red5_bootstrap.diff (rev 0) +++ trunk/red5/debian/patches/11_change_red5_bootstrap.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,16 @@ +Description: Don't exclude some JAR's from build classpath. + There is no need for that and it fail with our version-less JARs. +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2009-11-07 +Forwarded: not-needed +--- a/src/org/red5/classloading/ClassLoaderBuilder.java ++++ b/src/org/red5/classloading/ClassLoaderBuilder.java +@@ -176,7 +176,7 @@ + } + + //look over the libraries and remove the old versions +- scrubURLList(urlList); ++ //scrubURLList(urlList); + + //get config dir + String conf = System.getProperty("red5.config_root"); Added: trunk/red5/debian/patches/12_javadoc_links.diff =================================================================== --- trunk/red5/debian/patches/12_javadoc_links.diff (rev 0) +++ trunk/red5/debian/patches/12_javadoc_links.diff 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,27 @@ +Description: Change javadocs links to use local Javadocs +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2009-11-28 +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -434,16 +434,10 @@ + <group title="Streaming" packages="org.red5.server.stream:org.red5.server.stream.*"/> + <group title="IO Packages" packages="org.red5.io:org.red5.io.*"/> + <group title="Scripting" packages="org.red5.server.script:org.red5.server.script.*"/> +- <link href="http://java.sun.com/${javadoc.loc}/docs/api"/> +- <link href="http://jetty.mortbay.org/apidocs"/> +- <link href="http://mina.apache.org/report/trunk/apidocs"/> +- <link href="http://static.springframework.org/spring/docs/2.5.x/api"/> +- <link href="http://www.opensymphony.com/quartz/api"/> +- <link href="http://www.slf4j.org/api"/> +- <link href="http://logging.apache.org/log4j/1.2/apidocs"/> +- <link href="http://groovy.codehaus.org/api"/> +- <link href="http://tomcat.apache.org/tomcat-6.0-doc/api"/> +- <link href="http://ehcache.sourceforge.net/javadoc"/> ++ <link href="/usr/share/doc/openjdk-6-jre/api/"/> ++ <link href="/usr/share/doc/libmina2-java/api/"/> ++ <link href="/usr/share/doc/liblog4j1.2-java/api/"/> ++ <link href="/usr/share/doc/groovy/api/"/> + </javadoc> + <echo message="Javadoc API stub: ${javadoc.loc}"/> + <echo message="Javadoc CSS: ${doc.ref.dir} ${javadoc.style}"/> Added: trunk/red5/debian/patches/series =================================================================== --- trunk/red5/debian/patches/series (rev 0) +++ trunk/red5/debian/patches/series 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,7 @@ +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 Added: trunk/red5/debian/red5-doc.doc-base.api =================================================================== --- trunk/red5/debian/red5-doc.doc-base.api (rev 0) +++ trunk/red5/debian/red5-doc.doc-base.api 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,9 @@ +Document: red5-api +Title: API Javadoc for Red5 +Author: Red5 developers +Abstract: This is the API Javadoc provided by the Red5 server. +Section: Programming + +Format: HTML +Index: /usr/share/doc/red5/api/index.html +Files: /usr/share/doc/red5/api/* Added: trunk/red5/debian/red5-doc.doc-base.reference =================================================================== --- trunk/red5/debian/red5-doc.doc-base.reference (rev 0) +++ trunk/red5/debian/red5-doc.doc-base.reference 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,9 @@ +Document: red5-reference +Title: Reference Documentation for Red5 +Author: Red5 developers +Abstract: This is the Reference Documentation provided by the Red5 server. +Section: Programming + +Format: HTML +Index: /usr/share/doc/red5/html/index.html +Files: /usr/share/doc/red5/html/* Added: trunk/red5/debian/red5-doc.install =================================================================== --- trunk/red5/debian/red5-doc.install (rev 0) +++ trunk/red5/debian/red5-doc.install 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,4 @@ +doc/readme.txt /usr/share/doc/red5/ +doc/examples/ /usr/share/doc/red5/ +doc/api/ /usr/share/doc/red5/ +doc/reference/html/ /usr/share/doc/red5/ Added: trunk/red5/debian/red5-server.default =================================================================== --- trunk/red5/debian/red5-server.default (rev 0) +++ trunk/red5/debian/red5-server.default 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,4 @@ +JAVA_HOME=/usr/lib/jvm/java-6-openjdk/ +JAVA_OPTS= +RED5_HOME=/usr/share/red5/ +RED5_OPTS= Added: trunk/red5/debian/red5-server.dirs =================================================================== --- trunk/red5/debian/red5-server.dirs (rev 0) +++ trunk/red5/debian/red5-server.dirs 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,4 @@ +usr/share/red5/lib/ +etc/red5/ +var/log/red5/ +var/cache/red5/ Added: trunk/red5/debian/red5-server.init =================================================================== --- trunk/red5/debian/red5-server.init (rev 0) +++ trunk/red5/debian/red5-server.init 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,235 @@ +#!/bin/sh +# +# Copyright (c) 2007 Javier Fernandez-Sanguino <j...@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: $network $local_fs +# Required-Stop: +# Should-Start: $named +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Red5 +# Description: Flash streaming server +### END INIT INFO + +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 + +. /lib/lsb/init-functions + +# Default options, these can be overriden by the information +# at /etc/default/red5 + +DIETIME=30 # Time to wait for the server to die, in seconds +STARTTIME=5 # Time to wait for the server to start, in seconds +DAEMONUSER=_red5 # Users to run the daemons as. If this value + # is set start-stop-daemon will chuid the server +JAVA_HOME=/usr/lib/jvm/java-6-openjdk/ +JAVA_OPTS= +RED5_HOME=/usr/share/red5/ +RED5_OPTS= + +# End of variables that can be overwritten + +# Include defaults if available +if [ -f /etc/default/$NAME ] ; then + . /etc/default/$NAME +fi + +# 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 + + +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 Added: trunk/red5/debian/red5-server.install =================================================================== --- trunk/red5/debian/red5-server.install (rev 0) +++ trunk/red5/debian/red5-server.install 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,36 @@ +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/ Added: trunk/red5/debian/red5-server.links =================================================================== --- trunk/red5/debian/red5-server.links (rev 0) +++ trunk/red5/debian/red5-server.links 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,103 @@ +/etc/red5 usr/share/red5/conf +/var/lib/red5/webapps usr/share/red5/webapps +/var/log/red5 usr/share/red5/log +/var/cache/red5 usr/share/red5/work + +# activation-1.1.jar && ejb3-persistence-.jar && jta-1.1.jar && servlet-api-2.5.jar && el-api-.jar +/usr/share/java/glassfish-javaee.jar usr/share/red5/lib/glassfish-javaee.jar +# annotations-api-.jar +/usr/share/java/annotations-api.jar usr/share/red5/lib/annotations-api.jar +# antlr-3.1.3.jar +/usr/share/java/antlr.jar usr/share/red5/lib/antlr.jar +# aopalliance-.jar +/usr/share/java/aopalliance.jar usr/share/red5/lib/aopalliance.jar +# asm-3.1.jar +/usr/share/java/asm3.jar usr/share/red5/lib/asm3.jar +# asm-commons-3.1.jar +/usr/share/java/asm3-commons.jar usr/share/red5/lib/asm3-commons.jar +# bcprov-jdk16-139.jar +/usr/share/java/bcprov.jar usr/share/red5/lib/bcprov.jar +# backport-util-concurrent (for EHCache) +/usr/share/java/backport-util-concurrent.jar usr/share/red5/lib/backport-util-concurrent.jar +# catalina-6.0.20-patched.jar +/usr/share/tomcat6/lib/catalina.jar usr/share/red5/lib/catalina.jar +# commons-beanutils-1.8.0.jar +/usr/share/java/commons-beanutils.jar usr/share/red5/lib/commons-beanutils.jar +# commons-codec-1.3.jar +/usr/share/java/commons-codec.jar usr/share/red5/lib/commons-codec.jar +# commons-collections-3.2.1.jar +/usr/share/java/commons-collections3.jar usr/share/red5/lib/commons-collections3.jar +# commons-httpclient-3.1.jar +/usr/share/java/commons-httpclient.jar usr/share/red5/lib/commons-httpclient.jar +# commons-lang-2.4.jar +/usr/share/java/commons-lang.jar usr/share/red5/lib/commons-lang.jar +# commons-modeler-2.0.1.jar +/usr/share/java/commons-modeler.jar usr/share/red5/lib/commons-modeler.jar +# commons-pool-1.4.jar +/usr/share/java/commons-pool.jar usr/share/red5/lib/commons-pool.jar +# ehcache-1.6.0-beta1.jar +/usr/share/java/ehcache.jar usr/share/red5/lib/ehcache.jar +# el-api-.jar (use glassfish-javaee) +# groovy-all-1.5.7.jar +/usr/share/java/groovy.jar usr/share/red5/lib/groovy.jar +# jasper-6.0.20.jar && jasper-el-6.0.20.jar +/usr/share/java/jasper.jar usr/share/red5/lib/jasper.jar +# jasper-jdt-6.0.20.jar +/usr/share/java/ecj.jar usr/share/red5/lib/jasper-jdt.jar +# jaudiotagger-1.0.8.jar +/usr/share/java/jaudiotagger.jar usr/share/red5/lib/jaudiotagger.jar +# jcl-over-slf4j-1.5.6.jar +/usr/share/java/jcl-over-slf4j.jar usr/share/red5/lib/jcl-over-slf4j.jar +# jetty-6.1.9.jar +/usr/share/java/jetty.jar usr/share/red5/lib/jetty.jar +# jetty-util-6.1.9.jar +/usr/share/java/jetty-util.jar usr/share/red5/lib/jetty-util.jar +# NO jetty-xbean-6.1.9.jar +# jul-to-slf4j-1.5.6.jar +/usr/share/java/jul-to-slf4j.jar usr/share/red5/lib/jul-to-slf4j.jar +# jython-2.5.jar +/usr/share/java/jython.jar usr/share/red5/lib/jython.jar +# log4j-over-slf4j-1.5.6.jar +/usr/share/java/log4j-over-slf4j.jar usr/share/red5/lib/log4j-over-slf4j.jar +# logback-classic-0.9.14.jar +/usr/share/java/logback-classic.jar usr/share/red5/lib/logback-classic.jar +# logback-core-0.9.14.jar +/usr/share/java/logback-core.jar usr/share/red5/lib/logback-core.jar +# mina-core-2.0.0-M6.jar +/usr/share/java/mina2-core.jar usr/share/red5/lib/mina2-core.jar +# mina-integration-jmx-2.0.0-M6.jar +/usr/share/java/mina2-integration-jmx.jar usr/share/red5/lib/mina2-integration-jmx.jar +# mina-integration-beans-2.0.0-M6.jar +/usr/share/java/mina2-integration-beans.jar usr/share/red5/lib/mina2-integration-beans.jar +# naming-factory-.jar && naming-resources-.jar +/usr/share/java/mx4j.jar usr/share/red5/lib/mx4j.jar +/usr/share/java/mx4j-tools.jar usr/share/red5/lib/mx4j-tools.jar +# quartz-1.6.5.jar +/usr/share/java/quartz.jar usr/share/red5/lib/quartz.jar +# servlet-api-2.5.jar (use glassfish-javaee) +# slf4j-api-1.5.6.jar +/usr/share/java/slf4j-api.jar usr/share/red5/lib/slf4j-api.jar +# spring-aop-2.5.6.jar +/usr/share/java/spring-aop.jar usr/share/red5/lib/spring-aop.jar +# spring-beans-2.5.6.jar +/usr/share/java/spring-beans.jar usr/share/red5/lib/spring-beans.jar +# spring-context-2.5.6.jar +/usr/share/java/spring-context.jar usr/share/red5/lib/spring-context.jar +# spring-context-support-2.5.6.jar +/usr/share/java/spring-context-support.jar usr/share/red5/lib/spring-context-support.jar +# spring-core-2.5.6.jar +/usr/share/java/spring-core.jar usr/share/red5/lib/spring-core.jar +# spring-web-2.5.6.jar +/usr/share/java/spring-web.jar usr/share/red5/lib/spring-web.jar +# tomcat-coyote-6.0.20.jar +/usr/share/tomcat6/lib/tomcat-coyote.jar usr/share/red5/lib/tomcat-coyote.jar +# tomcat-juli-slf4j-1.5.0.jar +/usr/share/java/tomcat-juli.jar usr/share/red5/lib/tomcat-juli.jar +# NO wrapper.jar +# xercesImpl-2.9.1.jar +/usr/share/java/xercesImpl.jar usr/share/red5/lib/xercesImpl.jar +# xml-apis-2.9.1.jar +/usr/share/java/xmlParserAPIs.jar usr/share/red5/lib/xmlParserAPIs.jar +# xmlrpc-2.0.1.jar (upgrade to 3.1 API) +/usr/share/java/xmlrpc-server-3.1.jar usr/share/red5/lib/xmlrpc-server-3.1.jar +/usr/share/java/xmlrpc-common-3.1.jar usr/share/red5/lib/xmlrpc-common-3.1.jar Added: trunk/red5/debian/red5-server.postinst =================================================================== --- trunk/red5/debian/red5-server.postinst (rev 0) +++ trunk/red5/debian/red5-server.postinst 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,36 @@ +#!/bin/sh +# Author: Damien Raude-Morvan <draz...@debian.org>. +set -e + +DAEMONUSER=_red5 +DAEMON=/usr/share/red5/red5.sh + +case "$1" in + configure) + if ! id $DAEMONUSER > /dev/null 2>&1 ; then + adduser --system --force-badname --no-create-home \ + --home /usr/share/red5 \ + "$DAEMONUSER" + fi + + chown -R $DAEMONUSER:nogroup /var/log/red5 /var/cache/red5 + chown -R $DAEMONUSER:adm /etc/red5 + chown $DAEMONUSER:adm /var/log/red5 /var/cache/red5 + + chmod -R 770 /etc/red5 + chmod 750 /var/log/red5 /etc/red5 + chmod 700 /var/cache/red5 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 Added: trunk/red5/debian/red5-server.postrm =================================================================== --- trunk/red5/debian/red5-server.postrm (rev 0) +++ trunk/red5/debian/red5-server.postrm 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,30 @@ +#!/bin/sh +# Author: Damien Raude-Morvan <draz...@debian.org>. +set -e + +DAEMONUSER=_red5 + +# Remove cached files +rm -rf /var/cache/red5/* + +case "$1" in + purge) + # Remove user and log files + userdel $DAEMONUSER || true + rm -rf /var/log/red5 /var/cache/red5 + rmdir --ignore-fail-on-non-empty /etc/red5 || true + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + # Nothing to do here + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 Added: trunk/red5/debian/rules =================================================================== --- trunk/red5/debian/rules (rev 0) +++ trunk/red5/debian/rules 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk + +# Build classpath is set via ant.properties +# Here is classpath for ant plugins : +DEB_JARS := ant-trax xercesImpl xmlParserAPIs ant-junit +ANT_ARGS := -Ddoc.prepare=true -Ddoc.wiki2docbook=true + +DEB_ANT_BUILD_TARGET := jar remote-jar javadoc doc-html +#DEB_ANT_CHECK_TARGET := run-tests +DEB_ANT_CLEAN_TARGET := clean + +binary-install/red5-server:: + chmod a+x debian/red5-server/usr/share/red5/red5.sh + chmod a+x debian/red5-server/usr/share/red5/red5-debug.sh + chmod a+x debian/red5-server/usr/share/red5/red5-shutdown.sh + chmod a+x debian/red5-server/usr/share/red5/red5-highperf.sh + +get-orig-source: + sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) Property changes on: trunk/red5/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/red5/debian/watch =================================================================== --- trunk/red5/debian/watch (rev 0) +++ trunk/red5/debian/watch 2009-11-29 16:20:39 UTC (rev 11168) @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/_/\./,dversionmangle=s/[+~]svn.*//" \ +http://red5.googlecode.com/svn/java/server/tags/ ([0-9_].*)/ debian debian/orig-tar.sh \ No newline at end of file _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits