r501 - in /packages/red5/trunk/debian: ./ patches/
drazzib at users.alioth.debian.org
drazzib at users.alioth.debian.org
Sat Mar 5 17:38:24 UTC 2011
Author: drazzib
Date: Sat Mar 5 17:38:23 2011
New Revision: 501
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=501
Log:
* New upstream release (1.0 RC1).
- d/orig-tar.sh: add "plugins" component for tomcatplugin.
- d/orig-tar.exclude: exclude vod/ from tarball.
- d/{build.xml,rules}: new d/build.xml to build red5 + plugins.
* d/{control,ant.properties}: use Spring Framework 3.x (Closes: #579150).
* d/patches/*: all refreshed.
* d/patches/16_plugins_build_lib.diff: use debian.build.classpath property
for classpath of javac.
* d/control:
- drop Depends on libaopalliance-java, libspring-aop-java, libjetty-java,
libmx4-java and libbackport-util-concurrent-java.
- add Depends on rhino and libstax-java.
- move Depends on libtomcat6-java to red5-server.
Added:
packages/red5/trunk/debian/build.xml
packages/red5/trunk/debian/patches/16_plugins_build_lib.diff
Modified:
packages/red5/trunk/debian/ant.properties
packages/red5/trunk/debian/changelog
packages/red5/trunk/debian/control
packages/red5/trunk/debian/orig-tar.exclude
packages/red5/trunk/debian/orig-tar.sh
packages/red5/trunk/debian/patches/02_no_lib_dir.diff
packages/red5/trunk/debian/patches/04_build_html_docs.diff
packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff
packages/red5/trunk/debian/patches/11_change_jmx_port.diff
packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff
packages/red5/trunk/debian/patches/12_javadoc_links.diff
packages/red5/trunk/debian/patches/13_jaudiotagger2.diff
packages/red5/trunk/debian/patches/14_document_removed_stuff.diff
packages/red5/trunk/debian/patches/series
packages/red5/trunk/debian/red5-server.README.Debian
packages/red5/trunk/debian/red5-server.dirs
packages/red5/trunk/debian/red5-server.install
packages/red5/trunk/debian/red5-server.links
packages/red5/trunk/debian/rules
Modified: packages/red5/trunk/debian/ant.properties
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/ant.properties?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/ant.properties (original)
+++ packages/red5/trunk/debian/ant.properties Sat Mar 5 17:38:23 2011
@@ -13,35 +13,32 @@
/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/spring3-core.jar;\
+/usr/share/java/spring3-beans.jar;\
+/usr/share/java/spring3-context.jar;\
+/usr/share/java/spring3-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
+/usr/share/java/glassfish-javaee.jar;\
+/usr/share/java/jython.jar;\
+/usr/share/java/xercesImpl.jar
debian.test.classpath = /usr/share/java/junit4.jar;\
/usr/share/java/hamcrest-core.jar;\
-/usr/share/java/spring-test.jar;\
+/usr/share/java/spring3-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
+/usr/share/tomcat6/lib/catalina.jar;\
+/usr/share/java/tomcat-juli.jar;\
+/usr/share/tomcat6/lib/annotations-api.jar;\
+/usr/share/tomcat6/lib/el-api.jar
+
+# For plugins
+red5.root = ../../
Added: packages/red5/trunk/debian/build.xml
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/build.xml?rev=501&op=file
==============================================================================
--- packages/red5/trunk/debian/build.xml (added)
+++ packages/red5/trunk/debian/build.xml Sat Mar 5 17:38:23 2011
@@ -1,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" name="red5 and plugins" basedir="../">
+
+ <target name="clean" description="Clean all">
+ <ant dir="${basedir}" target="clean"/>
+ <ant dir="${basedir}/plugins/tomcat" target="clean"/>
+ </target>
+
+ <target name="jar" description="Build all">
+ <ant dir="${basedir}">
+ <target name="jar"/>
+ <target name="remote-jar"/>
+ <target name="javadoc"/>
+ <target name="doc-html"/>
+ </ant>
+ <ant dir="${basedir}/plugins/tomcat" target="all"/>
+ </target>
+
+</project>
Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/changelog?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog (original)
+++ packages/red5/trunk/debian/changelog Sat Mar 5 17:38:23 2011
@@ -1,3 +1,21 @@
+red5 (1.0~svn4198-1) unstable; urgency=low
+
+ * New upstream release (1.0 RC1).
+ - d/orig-tar.sh: add "plugins" component for tomcatplugin.
+ - d/orig-tar.exclude: exclude vod/ from tarball.
+ - d/{build.xml,rules}: new d/build.xml to build red5 + plugins.
+ * d/{control,ant.properties}: use Spring Framework 3.x (Closes: #579150).
+ * d/patches/*: all refreshed.
+ * d/patches/16_plugins_build_lib.diff: use debian.build.classpath property
+ for classpath of javac.
+ * d/control:
+ - drop Depends on libaopalliance-java, libspring-aop-java, libjetty-java,
+ libmx4-java and libbackport-util-concurrent-java.
+ - add Depends on rhino and libstax-java.
+ - move Depends on libtomcat6-java to red5-server.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 04 Mar 2011 23:21:45 +0100
+
red5 (0.9.1-4) unstable; urgency=low
* Fix typo in d/README.Debian and d/patches/14_document_removed_stuff.diff.
Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/control?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/control (original)
+++ packages/red5/trunk/debian/control Sat Mar 5 17:38:23 2011
@@ -4,18 +4,16 @@
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),
+ libmina2-java, libslf4j-java (>= 1.6.1), liblogback-java (>= 0.9.28),
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,
+ libcommons-codec-java, libcommons-httpclient-java, libxerces2-java,
+ libspring-core-java, libspring-beans-java, libspring-context-java,
+ libspring-web-java, libbcprov-java, libehcache-java, libquartz-java,
+ libjaudiotagger-java, libxmlrpc3-server-java, groovy,jython,
+ libtomcat6-java (>= 6.0.20-7), glassfish-javaee, junit4 (>= 4.5),
+ libhamcrest-java, libspring-test-java,
+ libgroboutils-java, libcommons-logging-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.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-flash/packages/red5/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/
@@ -24,17 +22,15 @@
Package: libred5-java
Architecture: all
Depends: ${misc:Depends},
- libmina2-java, libslf4j-java (>= 1.5.5), liblogback-java (>= 0.9.17),
+ libmina2-java, libslf4j-java (>= 1.6.1), liblogback-java (>= 0.9.28),
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
+ libcommons-httpclient-java, libxerces2-java, groovy, rhino,
+ libspring-core-java, libspring-beans-java, libspring-context-java,
+ libspring-web-java, libbcprov-java, libehcache-java, libquartz-java,
+ libjaudiotagger-java, libxmlrpc3-server-java, glassfish-javaee,
+ libantlr-java, libasm3-java, libcommons-codec-java, libcommons-modeler-java,
+ libcommons-logging-java, libcommons-pool-java, jython,
+ libspring-context-support-java, libstax-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.
@@ -48,7 +44,8 @@
Package: red5-server
Architecture: all
Depends: ${misc:Depends}, openjdk-6-jre-headless | java6-runtime-headless,
- adduser (>= 3.11), libred5-java (= ${source:Version})
+ adduser (>= 3.11), libred5-java (= ${source:Version}),
+ libtomcat6-java (>= 6.0.20-7)
Conflicts: red5
Description: flash streaming server
Red5 is a Java implementation of a Flash Media Server based on
Modified: packages/red5/trunk/debian/orig-tar.exclude
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/orig-tar.exclude?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/orig-tar.exclude (original)
+++ packages/red5/trunk/debian/orig-tar.exclude Sat Mar 5 17:38:23 2011
@@ -1,5 +1,8 @@
# Binary files
-lib
+project.zip
+lib/*.jar
+plugins/*.jar
+plugins/*/lib/*.jar
# Generated files
doc/reference/pdf/*
src/conf/PolicyFileSocket.xsd
@@ -8,6 +11,9 @@
# *.flv movies trailers
webapps/root/demos/*
webapps/installer/*
+webapps/vod/miniplayer.swf
+webapps/vod/*.swz
+webapps/vod/streams/*
*.psd
test/www/streams/*
test/fixtures/*
Modified: packages/red5/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/orig-tar.sh?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/orig-tar.sh (original)
+++ packages/red5/trunk/debian/orig-tar.sh Sat Mar 5 17:38:23 2011
@@ -3,20 +3,32 @@
# $1 version
MAINTAR=../red5_$1.orig.tar.gz
DOCTAR=../red5_$1.orig-doc.tar.gz
-DIR=red5-$1.orig
+PLUGINSTAR=../red5_$1.orig-plugins.tar.gz
-VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'`
-# Extract everything after "svn" in $1
-# REVISION=`echo $1 | sed 's/.*svn//'`
+# 1) Extract tag from package version
+# VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'`
+# 2) Extract everything after "svn" in $1
+REVISION=`echo $1 | sed 's/.*svn//'`
+
+SVN="svn export --ignore-externals -r $REVISION"
# main tarball
-svn export http://red5.googlecode.com/svn/java/server/tags/$VERSION $DIR
+DIR=red5-$1.orig
+$SVN http://red5.googlecode.com/svn/java/server/trunk/ $DIR
+rm -rf $DIR/plugins
GZIP=--best tar -c -z -f $MAINTAR -X debian/orig-tar.exclude $DIR
rm -rf $DIR
# doc tarball
-svn export http://red5.googlecode.com/svn/doc/trunk/ $DIR
-GZIP=--best tar -c -z -f $DOCTAR $DIR
+DIR=red5-$1.orig-doc
+$SVN http://red5.googlecode.com/svn/doc/trunk/ $DIR
+GZIP=--best tar -c -z -f $DOCTAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+# plugins tarball
+DIR=red5-$1.orig-plugins
+$SVN http://red5.googlecode.com/svn/java/plugins/trunk/ $DIR
+GZIP=--best tar -c -z -f $PLUGINSTAR -X debian/orig-tar.exclude $DIR
rm -rf $DIR
# move to directory 'tarballs'
Modified: packages/red5/trunk/debian/patches/02_no_lib_dir.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/02_no_lib_dir.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/02_no_lib_dir.diff (original)
+++ packages/red5/trunk/debian/patches/02_no_lib_dir.diff Sat Mar 5 17:38:23 2011
@@ -1,10 +1,10 @@
Description: build.xml: remove usage of lib/ directory.
Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: not-needed
-Last-Update: 2009-10-03
+Last-Update: 2011-03-04
--- a/build.xml
+++ b/build.xml
-@@ -59,27 +59,31 @@
+@@ -60,27 +60,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"/>
@@ -45,7 +45,7 @@
</path>
<!-- Build Targets -->
<target name="-java6.check">
-@@ -459,9 +463,11 @@
+@@ -482,9 +486,11 @@
</macrodef>
<!-- Determine classpath for jar file -->
<target name="jar-determine-classpath" depends="compile" unless="jar.classpath">
@@ -57,7 +57,7 @@
</target>
<target name="jar" description="Make Archive" depends="jar-determine-classpath">
<jar destfile="${red5.filename}.jar">
-@@ -503,13 +509,6 @@
+@@ -526,14 +532,6 @@
</jar>
</target>
<target name="dist" description="Create binary distribution" depends="jar">
@@ -66,6 +66,7 @@
- <exclude name="ivy*.jar"/>
- <exclude name="junit*.jar"/>
- <exclude name="grobo*.jar"/>
+- <exclude name="*-sources*.jar"/>
- </fileset>
- </copy>
<copy todir="${dist.dir}/conf">
Modified: packages/red5/trunk/debian/patches/04_build_html_docs.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/04_build_html_docs.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/04_build_html_docs.diff (original)
+++ packages/red5/trunk/debian/patches/04_build_html_docs.diff Sat Mar 5 17:38:23 2011
@@ -8,7 +8,7 @@
Last-Update: 2009-10-03
--- a/build.xml
+++ b/build.xml
-@@ -1032,9 +1032,14 @@
+@@ -1060,9 +1060,14 @@
else="">
<equals arg1="@{xincludes}" arg2="true"/>
</condition>
Modified: packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff (original)
+++ packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff Sat Mar 5 17:38:23 2011
@@ -4,95 +4,88 @@
Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: yes
Bug: http://trac.red5.org/ticket/572
-Last-Update: 2010-04-19
+Last-Update: 2011-03-04
--- a/src/org/red5/server/net/servlet/StatisticsServlet.java
+++ b/src/org/red5/server/net/servlet/StatisticsServlet.java
-@@ -21,13 +21,20 @@
-
- import java.io.IOException;
- import java.io.OutputStream;
-+import java.net.URL;
-
- 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.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.red5.server.api.IContext;
- import org.red5.server.statistics.XmlRpcScopeStatistics;
- import org.springframework.web.context.WebApplicationContext;
-@@ -39,15 +46,13 @@
- * @author The Red5 Project (red5 at osflash.org)
- * @author Joachim Bauch (jojo at 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 +60,7 @@
- /** {@inheritDoc} */
- @Override
- public void init() throws ServletException {
-+ super.init();
- webAppCtx = WebApplicationContextUtils
- .getWebApplicationContext(getServletContext());
- if (webAppCtx == null) {
-@@ -67,22 +73,27 @@
- }
-
- webContext = (IContext) webAppCtx.getBean("web.context");
-+ }
-
-- // Register handlers in XML-RPC server
-- server.addHandler("scopes", new XmlRpcScopeStatistics(webContext
-- .getGlobalScope()));
-+ public IContext getContext() {
-+ return this.webContext;
- }
-
-- /** {@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();
-+ 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;
- }
- }
+@@ -21,13 +21,19 @@
+
+ import java.io.IOException;
+ import java.io.OutputStream;
++import java.net.URL;
+
+ 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.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.red5.server.api.IContext;
+ import org.red5.server.statistics.XmlRpcScopeStatistics;
+ import org.springframework.web.context.WebApplicationContext;
+@@ -39,12 +45,10 @@
+ * @author The Red5 Project (red5 at osflash.org)
+ * @author Joachim Bauch (jojo at 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;
+@@ -52,6 +56,7 @@
+ /** {@inheritDoc} */
+ @Override
+ public void init() throws ServletException {
++ super.init();
+ webAppCtx = WebApplicationContextUtils.getWebApplicationContext(getServletContext());
+ if (webAppCtx == null) {
+ webAppCtx = (WebApplicationContext) getServletContext().getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
+@@ -61,20 +66,26 @@
+ }
+
+ webContext = (IContext) webAppCtx.getBean("web.context");
++ }
+
+- // Register handlers in XML-RPC server
+- server.addHandler("scopes", new XmlRpcScopeStatistics(webContext.getGlobalScope()));
++ public IContext getContext() {
++ return this.webContext;
+ }
+
+- /** {@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();
++ 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;
+ }
+ }
Modified: packages/red5/trunk/debian/patches/11_change_jmx_port.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/11_change_jmx_port.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/11_change_jmx_port.diff (original)
+++ packages/red5/trunk/debian/patches/11_change_jmx_port.diff Sat Mar 5 17:38:23 2011
@@ -2,7 +2,7 @@
(9999 may conflict with approx proxy server)
Also change JMX listner to bind on loopback only.
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-11-07
+Last-Update: 2011-03-04
Forwarded: not-needed
--- a/red5-shutdown.sh
@@ -18,14 +18,14 @@
--- a/src/conf/red5.properties
+++ b/src/conf/red5.properties
@@ -62,9 +62,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
-
-
+ 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
+
+
Modified: packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff (original)
+++ packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff Sat Mar 5 17:38:23 2011
@@ -1,16 +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 <drazzib at debian.org>
-Last-Update: 2009-11-07
+Last-Update: 2011-03-04
Forwarded: not-needed
--- a/src/org/red5/classloading/ClassLoaderBuilder.java
+++ b/src/org/red5/classloading/ClassLoaderBuilder.java
-@@ -176,7 +176,7 @@
+@@ -175,7 +175,7 @@
}
-
+
//look over the libraries and remove the old versions
- scrubURLList(urlList);
+ //scrubURLList(urlList);
-
+
//get config dir
String conf = System.getProperty("red5.config_root");
Modified: packages/red5/trunk/debian/patches/12_javadoc_links.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/12_javadoc_links.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/12_javadoc_links.diff (original)
+++ packages/red5/trunk/debian/patches/12_javadoc_links.diff Sat Mar 5 17:38:23 2011
@@ -4,7 +4,7 @@
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -434,16 +434,10 @@
+@@ -457,16 +457,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.*"/>
Modified: packages/red5/trunk/debian/patches/13_jaudiotagger2.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/13_jaudiotagger2.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/13_jaudiotagger2.diff (original)
+++ packages/red5/trunk/debian/patches/13_jaudiotagger2.diff Sat Mar 5 17:38:23 2011
@@ -2,41 +2,41 @@
TagFieldKey as been renamed to FieldKey
<https://jaudiotagger.dev.java.net/issues/show_bug.cgi?id=313>
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-19
+Last-Update: 2011-03-04
Forwarded: http://trac.red5.org/ticket/752
--- a/src/org/red5/io/mp3/impl/MP3Reader.java
+++ b/src/org/red5/io/mp3/impl/MP3Reader.java
@@ -38,7 +38,7 @@
- import org.jaudiotagger.audio.mp3.MP3File;
- import org.jaudiotagger.tag.TagException;
- import org.jaudiotagger.tag.TagField;
--import org.jaudiotagger.tag.TagFieldKey;
-+import org.jaudiotagger.tag.FieldKey;
- import org.jaudiotagger.tag.datatype.DataTypes;
- import org.jaudiotagger.tag.id3.AbstractID3v2Frame;
- import org.jaudiotagger.tag.id3.ID3v24Tag;
+ import org.jaudiotagger.audio.mp3.MP3File;
+ import org.jaudiotagger.tag.TagException;
+ import org.jaudiotagger.tag.TagField;
+-import org.jaudiotagger.tag.TagFieldKey;
++import org.jaudiotagger.tag.FieldKey;
+ import org.jaudiotagger.tag.datatype.DataTypes;
+ import org.jaudiotagger.tag.id3.AbstractID3v2Frame;
+ import org.jaudiotagger.tag.id3.ID3v24Tag;
@@ -174,15 +174,15 @@
- if (idTag != null) {
- // create meta data holder
- metaData = new MetaData();
-- metaData.setAlbum(idTag.getFirstAlbum());
-- metaData.setArtist(idTag.getFirstArtist());
-- metaData.setComment(idTag.getFirstComment());
-- metaData.setGenre(idTag.getFirstGenre());
-- metaData.setSongName(idTag.getFirstTitle());
-- metaData.setTrack(idTag.getFirstTrack());
-- metaData.setYear(idTag.getFirstYear());
-+ metaData.setAlbum(idTag.getFirst(FieldKey.ALBUM));
-+ metaData.setArtist(idTag.getFirst(FieldKey.ARTIST));
-+ metaData.setComment(idTag.getFirst(FieldKey.COMMENT));
-+ metaData.setGenre(idTag.getFirst(FieldKey.GENRE));
-+ metaData.setSongName(idTag.getFirst(FieldKey.TITLE));
-+ metaData.setTrack(idTag.getFirst(FieldKey.TRACK));
-+ metaData.setYear(idTag.getFirst(FieldKey.YEAR));
- //send album image if included
-- List<TagField> tagFieldList = mp3file.getTag().get(TagFieldKey.COVER_ART);
-+ List<TagField> tagFieldList = mp3file.getTag().getFields(FieldKey.COVER_ART);
- //fix for APPSERVER-310
- if (tagFieldList == null || tagFieldList.isEmpty()) {
- log.debug("No cover art was found");
+ if (idTag != null) {
+ // create meta data holder
+ metaData = new MetaData();
+- metaData.setAlbum(idTag.getFirstAlbum());
+- metaData.setArtist(idTag.getFirstArtist());
+- metaData.setComment(idTag.getFirstComment());
+- metaData.setGenre(idTag.getFirstGenre());
+- metaData.setSongName(idTag.getFirstTitle());
+- metaData.setTrack(idTag.getFirstTrack());
+- metaData.setYear(idTag.getFirstYear());
++ metaData.setAlbum(idTag.getFirst(FieldKey.ALBUM));
++ metaData.setArtist(idTag.getFirst(FieldKey.ARTIST));
++ metaData.setComment(idTag.getFirst(FieldKey.COMMENT));
++ metaData.setGenre(idTag.getFirst(FieldKey.GENRE));
++ metaData.setSongName(idTag.getFirst(FieldKey.TITLE));
++ metaData.setTrack(idTag.getFirst(FieldKey.TRACK));
++ metaData.setYear(idTag.getFirst(FieldKey.YEAR));
+ //send album image if included
+- List<TagField> tagFieldList = mp3file.getTag().get(TagFieldKey.COVER_ART);
++ List<TagField> tagFieldList = mp3file.getTag().getFields(FieldKey.COVER_ART);
+ //fix for APPSERVER-310
+ if (tagFieldList == null || tagFieldList.isEmpty()) {
+ log.debug("No cover art was found");
Modified: packages/red5/trunk/debian/patches/14_document_removed_stuff.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/14_document_removed_stuff.diff?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/14_document_removed_stuff.diff (original)
+++ packages/red5/trunk/debian/patches/14_document_removed_stuff.diff Sat Mar 5 17:38:23 2011
@@ -2,42 +2,42 @@
in index.html
Author: Damien Raude-Morvan <drazzib at drazzib.com>
Forwarded: not-needed
-Last-Update: 2010-07-31
+Last-Update: 2011-03-04
--- a/webapps/root/index.html
+++ b/webapps/root/index.html
-@@ -92,6 +92,35 @@
- <br />
- If you prefer to jump right in, follow these steps:
- <ul>
-+<li>
-+<p>
-+Debian "red5-server" package doesn't contains /demos or /installer webapps.
-+Please note that /installer and /demos webapps are for demonstration purpose
-+only and should never be installed on a public red5 server
-+(no security at all in those applications).
-+</p>
-+<p>
-+Furthermore, they contains non-free stuffs :
-+<ul>
-+<li> *.swf binary-only (Flash Player) files</li>
-+<li> *.flv movies trailers like Avatar / Toy Story 3</li>
-+</ul>
-+</p>
-+<p>
-+As root, you can install /demos (SWF files) and /installer webapp, by issuing :
-+<pre>
-+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-*
-+</pre>
-+</p>
-+<i>Excerpt from /usr/share/doc/red5-server/README.Debian</i>
-+</li>
- <li><a href="installer" target="_blank">Install</a> a ready-made application</li>
- <li>Launch a <a href="demos">demo</a></li>
- </ul>
+@@ -94,6 +94,35 @@
+ <br />
+ <br />
+ If you prefer to jump right in, follow these steps:
++<li>
++<p>
++Debian "red5-server" package doesn't contains /demos or /installer webapps.
++Please note that /installer and /demos webapps are for demonstration purpose
++only and should never be installed on a public red5 server
++(no security at all in those applications).
++</p>
++<p>
++Furthermore, they contains non-free stuffs :
++<ul>
++<li> *.swf binary-only (Flash Player) files</li>
++<li> *.flv movies trailers like Avatar / Toy Story 3</li>
++</ul>
++</p>
++<p>
++As root, you can install /demos (SWF files) and /installer webapp, by issuing :
++<pre>
++wget http://www.red5.org/downloads/1_0/red5-1.0.0-RC1.zip
++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-*
++</pre>
++</p>
++<i>Excerpt from /usr/share/doc/red5-server/README.Debian</i>
++</li>
+ <ul>
+ <li><a href="installer" target="_blank">Install</a> a ready-made application</li>
+ <li>Launch a <a href="demos">demo</a></li>
Added: packages/red5/trunk/debian/patches/16_plugins_build_lib.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/16_plugins_build_lib.diff?rev=501&op=file
==============================================================================
--- packages/red5/trunk/debian/patches/16_plugins_build_lib.diff (added)
+++ packages/red5/trunk/debian/patches/16_plugins_build_lib.diff Sat Mar 5 17:38:23 2011
@@ -1,0 +1,40 @@
+Description: Use debian.build.classpath property
+ for classpath of javac.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-03-05
+Forwarded: not-needed
+--- a/plugins/tomcat/build.xml
++++ b/plugins/tomcat/build.xml
+@@ -14,14 +14,15 @@
+ <property name="classes.dir" value="bin"/>
+ <property name="dist.dir" value="."/>
+
+- <path id="project.classpath">
+- <fileset dir="${red5.root}/lib"/>
+- <pathelement location="${red5.root}/boot.jar"/>
+- <pathelement location="${red5.root}/red5.jar"/>
+- <!-- project specific libs -->
+- <fileset dir="lib"/>
+- </path>
+-
++ <path id="debian.build.classpath.id">
++ <pathelement path="${debian.build.classpath}"/>
++ </path>
++ <path id="project.classpath">
++ <path refid="debian.build.classpath.id" />
++ <pathelement location="${red5.root}/boot.jar"/>
++ <pathelement location="${red5.root}/red5.jar"/>
++ </path>
++
+ <target name="prepare">
+ <mkdir dir="${classes.dir}"/>
+ </target>
+@@ -39,7 +40,7 @@
+ <ivy:retrieve conf="build" pattern="${basedir}/lib/[artifact](-[revision]).[ext]"/>
+ </target>
+
+- <target name="compile" depends="prepare, retrieve">
++ <target name="compile" depends="prepare">
+ <condition property="java.target_version" value="1.6">
+ <not>
+ <isset property="java.target_version"/>
Modified: packages/red5/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/series?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/series (original)
+++ packages/red5/trunk/debian/patches/series Sat Mar 5 17:38:23 2011
@@ -8,3 +8,4 @@
13_jaudiotagger2.diff
14_document_removed_stuff.diff
15_jython25.diff
+16_plugins_build_lib.diff
Modified: packages/red5/trunk/debian/red5-server.README.Debian
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.README.Debian?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.README.Debian (original)
+++ packages/red5/trunk/debian/red5-server.README.Debian Sat Mar 5 17:38:23 2011
@@ -53,7 +53,7 @@
- *.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
+ wget http://www.red5.org/downloads/1_0/red5-1.0.0-RC1.zip
tar xvzf red5-*.tar.gz
cd red5-*
cp -R webapps/root/demos /var/lib/red5/webapps/root/demos
Modified: packages/red5/trunk/debian/red5-server.dirs
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.dirs?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.dirs (original)
+++ packages/red5/trunk/debian/red5-server.dirs Sat Mar 5 17:38:23 2011
@@ -1,4 +1,5 @@
usr/share/red5/lib/
etc/red5/
var/log/red5/
+var/lib/red5/
var/cache/red5/
Modified: packages/red5/trunk/debian/red5-server.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.install?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.install (original)
+++ packages/red5/trunk/debian/red5-server.install Sat Mar 5 17:38:23 2011
@@ -9,12 +9,13 @@
src/conf/red5.globals etc/red5/
src/conf/red5-common.xml etc/red5/
src/conf/red5-core.xml etc/red5/
+src/conf/jee-container.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/log4j.properties etc/red5/
src/conf/access.properties etc/red5/
src/conf/password.properties etc/red5/
src/conf/tomcat-users.xml etc/red5/
@@ -35,3 +36,5 @@
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/
+
+plugins/tomcat/tomcatplugin-1.0.jar var/lib/red5/plugins/
Modified: packages/red5/trunk/debian/red5-server.links
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.links?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links (original)
+++ packages/red5/trunk/debian/red5-server.links Sat Mar 5 17:38:23 2011
@@ -1,105 +1,58 @@
/etc/red5 usr/share/red5/conf
/var/lib/red5/webapps usr/share/red5/webapps
+/var/lib/red5/plugins usr/share/red5/plugins
/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
+# Core Dependencies
+/usr/share/java/bcprov.jar usr/share/red5/lib/bcprov-jdk16.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/stax-api.jar usr/share/red5/lib/com.springsource.javax.xml.stream.jar
+/usr/share/java/antlr.jar usr/share/red5/lib/com.springsource.org.antlr.jar
+/usr/share/java/commons-codec.jar usr/share/red5/lib/com.springsource.org.apache.commons.codec.jar
+/usr/share/java/commons-collections3.jar usr/share/red5/lib/com.springsource.org.apache.commons.collections.jar
+/usr/share/java/commons-httpclient.jar usr/share/red5/lib/com.springsource.org.apache.commons.httpclient.jar
+/usr/share/java/commons-lang.jar usr/share/red5/lib/com.springsource.org.apache.commons.lang.jar
+/usr/share/java/commons-modeler.jar usr/share/red5/lib/com.springsource.org.apache.commons.modeler.jar
+/usr/share/java/commons-pool.jar usr/share/red5/lib/com.springsource.org.apache.commons.pool.jar
+/usr/share/java/xercesImpl.jar usr/share/red5/lib/com.springsource.org.apache.xerces.jar
+/usr/share/java/groovy.jar usr/share/red5/lib/com.springsource.org.codehaus.groovy.jar
+/usr/share/java/js.jar usr/share/red5/lib/com.springsource.org.mozilla.javascript.jar
+/usr/share/java/asm3.jar usr/share/red5/lib/com.springsource.org.objectweb.asm.jar
+/usr/share/java/asm3-commons.jar usr/share/red5/lib/com.springsource.org.objectweb.asm.commons.jar
+/usr/share/java/slf4j-api.jar usr/share/red5/lib/com.springsource.slf4j.api.jar
+# com.springsource.slf4j.bridge-1.6.1.jar: NOP
/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
-/usr/share/java/jasper.jar usr/share/red5/lib/jasper.jar
-# jasper-el-6.0.20.jar
-/usr/share/java/jasper-el.jar usr/share/red5/lib/jasper-el.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/glassfish-javaee.jar usr/share/red5/lib/javaee-api.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
+# jruby-complete-1.1.6.jar: NON-FREE
/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/mina2-core.jar usr/share/red5/lib/mina-core.jar
+/usr/share/java/mina2-integration-beans.jar usr/share/red5/lib/mina-integration-beans.jar
+/usr/share/java/mina2-integration-jmx.jar usr/share/red5/lib/mina-integration-jmx.jar
+# org.springframework.asm-3.0.5.RELEASE.jar: see asm3
+/usr/share/java/spring3-beans.jar usr/share/red5/lib/org.springframework.beans.jar
+/usr/share/java/spring3-context.jar usr/share/red5/lib/org.springframework.context.jar
+/usr/share/java/spring3-context.support.jar usr/share/red5/lib/org.springframework.context.support.jar
+/usr/share/java/spring3-core.jar usr/share/red5/lib/org.springframework.core.jar
+/usr/share/java/spring3-expression.jar usr/share/red5/lib/org.springframework.expression.jar
+/usr/share/java/spring3-web.jar usr/share/red5/lib/org.springframework.web.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
+/usr/share/java/xmlrpc-server-3.1.jar usr/share/red5/lib/xmlrpc-server.jar
+/usr/share/java/xmlrpc-common-3.1.jar usr/share/red5/lib/xmlrpc-common.jar
+
+
+# Dependencies for Tomcat Plugin
+/usr/share/tomcat6/lib/annotations-api.jar var/lib/red5/plugins/annotations-api.jar
+/usr/share/tomcat6/lib/el-api.jar var/lib/red5/plugins/el-api.jar
+/usr/share/tomcat6/lib/catalina.jar var/lib/red5/plugins/catalina.jar
+/usr/share/tomcat6/lib/jasper.jar var/lib/red5/plugins/jasper.jar
+/usr/share/tomcat6/lib/jasper-el.jar var/lib/red5/plugins/jasper-el.jar
+/usr/share/tomcat6/lib/jasper-jdt.jar var/lib/red5/plugins/jasper-jdt.jar
+/usr/share/tomcat6/lib/tomcat-coyote.jar var/lib/red5/plugins/tomcat-coyote.jar
+/usr/share/java/tomcat-juli.jar var/lib/red5/plugins/tomcat-juli-slf4j.jar
Modified: packages/red5/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/rules?rev=501&op=diff
==============================================================================
--- packages/red5/trunk/debian/rules (original)
+++ packages/red5/trunk/debian/rules Sat Mar 5 17:38:23 2011
@@ -5,12 +5,13 @@
JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+DEB_ANT_BUILDFILE := debian/build.xml
# 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_BUILD_TARGET := jar
#DEB_ANT_CHECK_TARGET := run-tests
DEB_ANT_CLEAN_TARGET := clean
More information about the pkg-flash-devel
mailing list