r552 - in /packages/red5/trunk/debian: ant.properties changelog control patches/18_tomcat7-compatibility.patch patches/series red5-server.links

ebourg-guest at users.alioth.debian.org ebourg-guest at users.alioth.debian.org
Tue Oct 7 11:30:36 UTC 2014


Author: ebourg-guest
Date: Tue Oct  7 11:30:35 2014
New Revision: 552

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=552
Log:
Depend on libtomcat7-java instead of libtomcat6-java (Closes: #686880)


Added:
    packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch
Modified:
    packages/red5/trunk/debian/ant.properties
    packages/red5/trunk/debian/changelog
    packages/red5/trunk/debian/control
    packages/red5/trunk/debian/patches/series
    packages/red5/trunk/debian/red5-server.links

Modified: packages/red5/trunk/debian/ant.properties
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/ant.properties?rev=552&op=diff
==============================================================================
--- packages/red5/trunk/debian/ant.properties	(original)
+++ packages/red5/trunk/debian/ant.properties	Tue Oct  7 11:30:35 2014
@@ -25,8 +25,8 @@
 /usr/share/java/jaudiotagger.jar;\
 /usr/share/java/xmlrpc-server.jar;\
 /usr/share/java/xmlrpc-common.jar;\
-/usr/share/tomcat6/lib/catalina.jar;\
-/usr/share/tomcat6/lib/tomcat-coyote.jar;\
+/usr/share/java/tomcat-catalina.jar;\
+/usr/share/java/tomcat-coyote.jar;\
 /usr/share/java/glassfish-javaee.jar;\
 /usr/share/java/jython.jar;\
 /usr/share/java/xercesImpl.jar
@@ -37,10 +37,10 @@
 /usr/share/java/commons-logging.jar;\
 /usr/share/java/log4j-1.2.jar;\
 /usr/share/java/groboutils-testingjunit-core.jar;\
-/usr/share/tomcat6/lib/catalina.jar;\
+/usr/share/java/tomcat-catalina.jar;\
 /usr/share/java/tomcat-juli.jar;\
-/usr/share/tomcat6/lib/annotations-api.jar;\
-/usr/share/tomcat6/lib/el-api.jar
+/usr/share/java/tomcat-annotations-api.jar;\
+/usr/share/java/el-api-2.2.jar
 
 # For plugins
 red5.root = ../../

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/changelog?rev=552&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog	(original)
+++ packages/red5/trunk/debian/changelog	Tue Oct  7 11:30:35 2014
@@ -2,6 +2,7 @@
 
   * Team upload.
   * Fixed the build failure with BeanUtils 1.9 (Closes: #733013)
+  * Depend on libtomcat7-java instead of libtomcat6-java (Closes: #686880)
   * Transition to libasm4-java and libcglib3-java
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9 

Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/control?rev=552&op=diff
==============================================================================
--- packages/red5/trunk/debian/control	(original)
+++ packages/red5/trunk/debian/control	Tue Oct  7 11:30:35 2014
@@ -35,7 +35,7 @@
                      libspring-core-java,
                      libspring-test-java,
                      libspring-web-java,
-                     libtomcat6-java (>= 6.0.20-7),
+                     libtomcat7-java,
                      libxerces2-java,
                      libxmlrpc3-server-java
 Standards-Version: 3.9.6
@@ -95,7 +95,7 @@
 Depends: adduser (>= 3.11),
          default-jre-headless (>= 1:1.6) | java6-runtime-headless,
          libred5-java (= ${source:Version}),
-         libtomcat6-java (>= 6.0.20-7),
+         libtomcat7-java,
          ${misc:Depends}
 Conflicts: red5
 Description: flash streaming server

Added: packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch?rev=552&op=file
==============================================================================
--- packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch	(added)
+++ packages/red5/trunk/debian/patches/18_tomcat7-compatibility.patch	Tue Oct  7 11:30:35 2014
@@ -0,0 +1,73 @@
+--- a/plugins/tomcat/src/org/red5/server/security/realm/NoRealm.java
++++ b/plugins/tomcat/src/org/red5/server/security/realm/NoRealm.java
+@@ -83,24 +83,4 @@
+ 		return null;
+ 	}
+ 
+-	/**
+-	 * Prepare for active use of the public methods of this Component.
+-	 *
+-	 * @exception LifecycleException if this component detects a fatal error
+-	 *  that prevents it from being started
+-	 */
+-	public synchronized void start() throws LifecycleException {
+-		super.start();
+-	}
+-
+-	/**
+-	 * Gracefully shut down active use of the public methods of this Component.
+-	 *
+-	 * @exception LifecycleException if this component detects a fatal error
+-	 *  that needs to be reported
+-	 */
+-	public synchronized void stop() throws LifecycleException {
+-		super.stop();
+-	}
+-
+ }
+--- a/plugins/tomcat/src/org/red5/server/tomcat/TomcatVHostLoader.java
++++ b/plugins/tomcat/src/org/red5/server/tomcat/TomcatVHostLoader.java
+@@ -381,13 +381,13 @@
+ 			//seems to require that the domain be appended to the name
+ 			stdHost.setName(name + '.' + domain);
+ 		}
+-		stdHost.setLiveDeploy(liveDeploy);
++		//stdHost.setLiveDeploy(liveDeploy);
+ 		//stdHost.setParent(container);
+ 		stdHost.setStartChildren(startChildren);
+ 		stdHost.setUnpackWARs(unpackWARs);
+ 		//stdHost.setWorkDir(workDir);
+-		stdHost.setXmlNamespaceAware(false);
+-		stdHost.setXmlValidation(false);
++		//stdHost.setXmlNamespaceAware(false);
++		//stdHost.setXmlValidation(false);
+ 		
+ 		return stdHost;
+ 	}
+@@ -454,7 +454,7 @@
+ 			log.error("", e);
+ 		}
+ 
+-		Valve[] valves = ((StandardHost) host).getValves();
++		Valve[] valves = ((StandardHost) host).getPipeline().getValves();
+ 		for (Valve v : valves) {
+ 			log.debug("Valve: {}", v);
+ 			log.debug("Valve info: {}", v.getInfo());
+@@ -567,4 +567,4 @@
+ 	}
+ 
+ 	
+-}
+\ No newline at end of file
++}
+--- a/plugins/tomcat/src/org/red5/server/tomcat/TomcatLoader.java
++++ b/plugins/tomcat/src/org/red5/server/tomcat/TomcatLoader.java
+@@ -521,7 +521,7 @@
+ 				if (cont instanceof StandardContext) {
+ 					if (log.isDebugEnabled()) {
+ 						ContainerBase cb = (ContainerBase) cont;
+-						log.debug("Oname - domain: {} container suffix: {}", new Object[] { cb.getDomain(), cb.getContainerSuffix() });
++						//log.debug("Oname - domain: {} container suffix: {}", new Object[] { cb.getDomain(), cb.getContainerSuffix() });
+ 					}
+ 					final StandardContext ctx = (StandardContext) cont;
+ 					final ServletContext servletContext = ctx.getServletContext();

Modified: packages/red5/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/series?rev=552&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/series	(original)
+++ packages/red5/trunk/debian/patches/series	Tue Oct  7 11:30:35 2014
@@ -8,3 +8,4 @@
 14_document_removed_stuff.diff
 16_plugins_build_lib.diff
 17_beanutils-compatibility.patch
+18_tomcat7-compatibility.patch

Modified: packages/red5/trunk/debian/red5-server.links
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.links?rev=552&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links	(original)
+++ packages/red5/trunk/debian/red5-server.links	Tue Oct  7 11:30:35 2014
@@ -54,14 +54,14 @@
 /usr/share/java/cglib3.jar usr/share/red5/lib/com.springsource.net.sf.cglib.jar
 
 # Dependencies for Tomcat Plugin
-# libservlet2.5-java
-/usr/share/java/el-api-2.1.jar var/lib/red5/plugins/el-api.jar
-# libtomcat6-java
-/usr/share/java/annotations-api.jar var/lib/red5/plugins/annotations-api.jar
-/usr/share/java/catalina.jar var/lib/red5/plugins/catalina.jar
-/usr/share/java/jasper.jar var/lib/red5/plugins/jasper.jar
-/usr/share/java/jasper-el.jar var/lib/red5/plugins/jasper-el.jar
-/usr/share/java/tomcat-coyote.jar var/lib/red5/plugins/tomcat-coyote.jar
-/usr/share/java/tomcat-juli.jar var/lib/red5/plugins/tomcat-juli-slf4j.jar
+# libservlet3.0-java
+/usr/share/java/el-api-2.2.jar var/lib/red5/plugins/el-api.jar
+# libtomcat7-java
+/usr/share/java/tomcat-annotations-api.jar var/lib/red5/plugins/annotations-api.jar
+/usr/share/java/tomcat-catalina.jar        var/lib/red5/plugins/catalina.jar
+/usr/share/java/tomcat-jasper.jar          var/lib/red5/plugins/jasper.jar
+/usr/share/java/tomcat-jasper-el.jar       var/lib/red5/plugins/jasper-el.jar
+/usr/share/java/tomcat-coyote.jar          var/lib/red5/plugins/tomcat-coyote.jar
+/usr/share/java/tomcat-juli.jar            var/lib/red5/plugins/tomcat-juli-slf4j.jar
 # libecj-java
 /usr/share/java/ecj.jar var/lib/red5/plugins/jasper-jdt.jar 




More information about the pkg-flash-devel mailing list