Author: drazzib Date: 2010-04-20 07:03:22 +0000 (Tue, 20 Apr 2010) New Revision: 12183
Added: trunk/red5/debian/source/ trunk/red5/debian/source/format Modified: trunk/red5/debian/changelog trunk/red5/debian/control trunk/red5/debian/orig-tar.sh trunk/red5/debian/patches/06_use_xmlrpc3.diff trunk/red5/debian/patches/11_change_jmx_port.diff trunk/red5/debian/patches/12_javadoc_links.diff trunk/red5/debian/patches/13_jaudiotagger2.diff trunk/red5/debian/rules Log: TODO: Test with Spring 2.5 (instead of Spring 3.0) TODO: Fix FTBFS with new Logback 0.9.20 / #577859 * New upstream release (Closes: #576355): - Refresh patches. * Bump Standards-Version to 3.8.4: no changes needed. * Switch to 3.0 (quilt) source format: - d/source/format: Set 3.0 (quilt) - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk - d/control: Remove B-D on quilt - Use multi-orig-tarball support: create new "orig-doc.tar.gz". Modified: trunk/red5/debian/changelog =================================================================== --- trunk/red5/debian/changelog 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/changelog 2010-04-20 07:03:22 UTC (rev 12183) @@ -1,3 +1,18 @@ +red5 (0.9.1-1) UNRELEASED; urgency=low + + TODO: Test with Spring 2.5 (instead of Spring 3.0) + TODO: Fix FTBFS with new Logback 0.9.20 / #577859 + * New upstream release (Closes: #576355): + - Refresh patches. + * Bump Standards-Version to 3.8.4: no changes needed. + * Switch to 3.0 (quilt) source format: + - d/source/format: Set 3.0 (quilt) + - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk + - d/control: Remove B-D on quilt + - Use multi-orig-tarball support: create new "orig-doc.tar.gz". + + -- Damien Raude-Morvan <[email protected]> Tue, 20 Apr 2010 08:25:23 +0200 + red5 (0.9~svn3968-2) unstable; urgency=low * Upload to unstable distribution Modified: trunk/red5/debian/control =================================================================== --- trunk/red5/debian/control 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/control 2010-04-20 07:03:22 UTC (rev 12183) @@ -2,7 +2,7 @@ Section: java Priority: optional Maintainer: Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant, quilt +Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant Build-Depends-Indep: libsaxon-java, docbook-xsl, ant-optional, libmina2-java, libslf4j-java (>= 1.5.5), liblogback-java (>= 0.9.17), libcommons-lang-java, libcommons-collections3-java, libcommons-beanutils-java, @@ -15,7 +15,7 @@ libgroboutils-java, libcommons-logging-java, libjetty-java, jython, libbackport-util-concurrent-java, default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/ Homepage: http://www.red5.org/ Modified: trunk/red5/debian/orig-tar.sh =================================================================== --- trunk/red5/debian/orig-tar.sh 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/orig-tar.sh 2010-04-20 07:03:22 UTC (rev 12183) @@ -1,23 +1,30 @@ #!/bin/sh -e # $1 version -TAR=../red5_$1.orig.tar.gz +MAINTAR=../red5_$1.orig.tar.gz +DOCTAR=../red5_$1.orig-doc.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//'` +# 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 +# main tarball +svn export http://red5.googlecode.com/svn/java/server/tags/$VERSION $DIR +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 +rm -rf $DIR + # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" + mv $MAINTAR $origDir + mv $DOCTAR $origDir + echo "moved tarballs to $origDir" fi exit 0 Modified: trunk/red5/debian/patches/06_use_xmlrpc3.diff =================================================================== --- trunk/red5/debian/patches/06_use_xmlrpc3.diff 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/patches/06_use_xmlrpc3.diff 2010-04-20 07:03:22 UTC (rev 12183) @@ -4,101 +4,95 @@ Author: Damien Raude-Morvan <[email protected]> Forwarded: yes Bug: http://trac.red5.org/ticket/572 -Last-Update: 2009-07-16 +Last-Update: 2010-04-19 --- 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 ([email protected]) - * @author Joachim Bauch ([email protected]) - */ --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; -+ } - } +@@ -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 ([email protected]) + * @author Joachim Bauch ([email protected]) + */ +-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; + } + } Modified: trunk/red5/debian/patches/11_change_jmx_port.diff =================================================================== --- trunk/red5/debian/patches/11_change_jmx_port.diff 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/patches/11_change_jmx_port.diff 2010-04-20 07:03:22 UTC (rev 12183) @@ -17,15 +17,15 @@ 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 - - +@@ -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 + + Modified: trunk/red5/debian/patches/12_javadoc_links.diff =================================================================== --- trunk/red5/debian/patches/12_javadoc_links.diff 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/patches/12_javadoc_links.diff 2010-04-20 07:03:22 UTC (rev 12183) @@ -1,6 +1,6 @@ Description: Change javadocs links to use local Javadocs Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-12-12 +Last-Update: 2010-04-19 Forwarded: not-needed --- a/build.xml +++ b/build.xml @@ -9,15 +9,15 @@ <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://jetty.codehaus.org/jetty/jetty-6/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://static.springsource.org/spring/docs/2.5.x/api"/> +- <link href="http://www.quartz-scheduler.org/docs/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="http://ehcache.org/apidocs"/> + <link href="/usr/share/doc/default-jdk-doc/api/"/> + <link href="/usr/share/doc/libmina2-java/api/"/> + <link href="/usr/share/doc/liblog4j1.2-java/api/"/> Modified: trunk/red5/debian/patches/13_jaudiotagger2.diff =================================================================== --- trunk/red5/debian/patches/13_jaudiotagger2.diff 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/patches/13_jaudiotagger2.diff 2010-04-20 07:03:22 UTC (rev 12183) @@ -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 <[email protected]> -Last-Update: 2010-01-17 +Last-Update: 2010-04-19 Forwarded: no --- 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: trunk/red5/debian/rules =================================================================== --- trunk/red5/debian/rules 2010-04-19 20:41:12 UTC (rev 12182) +++ trunk/red5/debian/rules 2010-04-20 07:03:22 UTC (rev 12183) @@ -1,7 +1,6 @@ #!/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 Added: trunk/red5/debian/source/format =================================================================== --- trunk/red5/debian/source/format (rev 0) +++ trunk/red5/debian/source/format 2010-04-20 07:03:22 UTC (rev 12183) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
