r561 - in /packages/red5/trunk/debian: changelog patches/18_tomcat7-compatibility.patch

[ebourg-guest at users.alioth.debian.org]

Author: ebourg-guest
Date: Tue May  3 18:50:12 2016
New Revision: 561

URL: http://svn.debian.org/wsvn/?sc=1&rev=561
Log:
Updated the Tomcat 7 compatibility patch


Modified:
    packages/red5/trunk/debian/changelog
    packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/changelog?rev=561&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog	(original)
+++ packages/red5/trunk/debian/changelog	Tue May  3 18:50:12 2016
@@ -4,6 +4,7 @@
   * Transition back to Groovy
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Depend on libcglib-java (>= 3.0) instead of libcglib3-java
+  * Updated the Tomcat 7 compatibility patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 May 2016 19:07:09 +0200
 

Modified: packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch?rev=561&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch	(original)
+++ packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch	Tue May  3 18:50:12 2016
@@ -75,3 +75,17 @@
  					}
  					final StandardContext ctx = (StandardContext) cont;
  					final ServletContext servletContext = ctx.getServletContext();
+--- a/src/org/red5/server/war/WarLoaderServlet.java
++++ b/src/org/red5/server/war/WarLoaderServlet.java
+@@ -172,11 +172,6 @@
+ 
+ 	}
+ 
+-	@Deprecated
+-	public ContextLoader getContextLoader() {
+-		return super.getContextLoader();
+-	}
+-
+ 	/**
+ 	 * Clearing the in-memory configuration parameters, we will receive
+ 	 * notification that the servlet context is about to be shut down