You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/14 14:26:09 UTC
svn commit: r1326094 - in /incubator/openmeetings/trunk/singlewebapp: ./
src/org/openmeetings/app/data/flvrecord/listener/
src/org/openmeetings/app/remote/
Author: sebawagner
Date: Sat Apr 14 12:26:08 2012
New Revision: 1326094
URL: http://svn.apache.org/viewvc?rev=1326094&view=rev
Log:
OPENMEETINGS-170 When you republish your stream while recording or suddenly leave the meeting, the recording has no audio
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/BaseStreamListener.java
- copied, changed from r1326089, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/ListenerAdapter.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/ListenerAdapter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1326094&r1=1326093&r2=1326094&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Sat Apr 14 12:26:08 2012
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="WebContent/WEB-INF"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
- <classpathentry kind="lib" path="build/lib/om/activation-jar-1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-codec-jar-1.3.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-httpclient-jar-3.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-activation_1.1_spec-jar-1.0.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-annotation_1.0_spec-jar-1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-javamail_1.4_spec-bundle-1.6.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-jaxws_2.2_spec-bundle-1.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-jta_1.1_spec-jar-1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-saaj_1.3_spec-jar-1.0.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-stax-api_1.0_spec-bundle-1.0.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-ws-metadata_2.0_spec-jar-1.1.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/ical4j-bundle-1.0.3.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jaxen-jar-1.1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jsr311-api-jar-1.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/openjpa-bundle-2.2.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/stax-api-jar-1.0-2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/wsdl4j-jar-1.6.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/wstx-asl-jar-3.2.9.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xalan-jar-2.7.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xml-resolver-jar-1.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/servlet-api-jar-2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/mainlibs/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/red5.jar" sourcepath="build/red5/src"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/bcprov-jdk16-145.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.antlr-3.1.3.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.apache.xerces-2.9.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.objectweb.asm-3.2.0.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.slf4j.api-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.slf4j.bridge-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/commons-beanutils-1.8.3.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/commons-codec-1.6.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/commons-lang3-3.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/commons-modeler-2.0.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/commons-pool-1.5.6.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/ehcache-core-2.5.0.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/httpclient-4.1.2.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/httpcore-4.1.3.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/javaee-api-5.1.2.om.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/jcl-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/jruby-complete-1.1.6.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/jul-to-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/jython-2.5.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/log4j-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/logback-classic-0.9.28.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/logback-core-0.9.28.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/mina-core-2.0.4.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/mina-integration-beans-2.0.4.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/mina-integration-jmx-2.0.4.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/quartz-1.8.5.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-asm-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-beans-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-support-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-core-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-expression-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-web-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-anim-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-awt-util-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-bridge-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-codec-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-css-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-dom-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-ext-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-extension-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-gui-util-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-gvt-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-parser-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-rasterizer-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-script-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-slideshow-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-squiggle-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-svg-dom-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-svggen-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-svgpp-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-swing-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-transcoder-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-ttf2svg-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-util-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-xml-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/cglib-jar-2.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/com.springsource.org.aopalliance-jar-1.0.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-dbcp-jar-1.4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-digester-jar-2.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-fileupload-jar-1.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-io-jar-2.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-lang-jar-2.6.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-transaction-jar-1.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/derby-jar-10.8.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/derbyclient-jar-10.8.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/dom4j-jar-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/fop-jar-1.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/mail-jar-1.4.4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/mysql-connector-java-jar-5.1.9.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.aop-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.aspects-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.jdbc-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.orm-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.transaction-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.web.servlet-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/postgresql-jar-9.1-901.jdbc4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/serp-jar-1.13.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/velocity-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/velocity-tools-jar-2.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/ws-commons-util-jar-1.0.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xml-apis-ext-jar-1.3.04.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xmlgraphics-commons-jar-1.4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xmlrpc-client-jar-3.1.3.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xmlrpc-common-jar-3.1.3.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xpp3-jar-1.1.4c.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xstream-jar-1.4.2.jar"/>
- <classpathentry kind="lib" path="build/lib/junit/junit-jar-4.9.jar"/>
- <classpathentry kind="lib" path="build/lib/junit/org.springframework.test-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/dtd-generator/trang-jar-20091111.jar"/>
- <classpathentry kind="lib" path="build/lib/om/axis2-kernel-jar-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="build/lib/om/axiom-api-bundle-1.2.13-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/commons-cli-jar-1.2.jar"/>
- <classpathentry kind="output" path="build/classes/eclipse"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent/WEB-INF"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/activation-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-codec-jar-1.3.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-httpclient-jar-3.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-activation_1.1_spec-jar-1.0.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-annotation_1.0_spec-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-javamail_1.4_spec-bundle-1.6.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-jaxws_2.2_spec-bundle-1.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-jta_1.1_spec-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-saaj_1.3_spec-jar-1.0.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-stax-api_1.0_spec-bundle-1.0.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-ws-metadata_2.0_spec-jar-1.1.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/ical4j-bundle-1.0.3.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/jaxen-jar-1.1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/jsr311-api-jar-1.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/openjpa-bundle-2.2.0.jar" sourcepath="C:/Users/swagner/.m2/repository/org/apache/openjpa/openjpa/2.2.0/openjpa-2.2.0-sources.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/stax-api-jar-1.0-2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/wsdl4j-jar-1.6.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/wstx-asl-jar-3.2.9.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xalan-jar-2.7.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xml-resolver-jar-1.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/servlet-api-jar-2.5.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/red5.jar" sourcepath="build/red5/src"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/bcprov-jdk16-145.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.antlr-3.1.3.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.apache.xerces-2.9.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.objectweb.asm-3.2.0.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.slf4j.api-1.6.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/com.springsource.slf4j.bridge-1.6.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/commons-beanutils-1.8.3.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/commons-lang3-3.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/commons-modeler-2.0.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/commons-pool-1.5.6.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/ehcache-core-2.5.0.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/httpclient-4.1.2.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/httpcore-4.1.3.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/javaee-api-5.1.2.om.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/jcl-over-slf4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/jruby-complete-1.1.6.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/jul-to-slf4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/jython-2.5.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/log4j-over-slf4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/logback-classic-0.9.28.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/logback-core-0.9.28.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/mina-core-2.0.4.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/mina-integration-beans-2.0.4.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/mina-integration-jmx-2.0.4.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/quartz-1.8.5.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-asm-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-beans-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-support-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-core-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-expression-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-web-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-anim-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-awt-util-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-bridge-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-codec-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-css-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-dom-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-ext-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-extension-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-gui-util-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-gvt-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-parser-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-rasterizer-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-script-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-slideshow-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-squiggle-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-svg-dom-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-svggen-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-svgpp-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-swing-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-transcoder-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-ttf2svg-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-util-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/batik-xml-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/cglib-jar-2.2.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/com.springsource.org.aopalliance-jar-1.0.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-dbcp-jar-1.4.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-digester-jar-2.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-fileupload-jar-1.2.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-io-jar-2.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-lang-jar-2.6.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/commons-transaction-jar-1.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/derby-jar-10.8.2.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/derbyclient-jar-10.8.2.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/dom4j-jar-1.6.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/fop-jar-1.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/mail-jar-1.4.4.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/mysql-connector-java-jar-5.1.9.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/org.springframework.aop-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/org.springframework.aspects-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/org.springframework.jdbc-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/org.springframework.orm-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/org.springframework.transaction-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/org.springframework.web.servlet-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/postgresql-jar-9.1-901.jdbc4.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/serp-jar-1.13.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/velocity-jar-1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/velocity-tools-jar-2.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/ws-commons-util-jar-1.0.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xml-apis-ext-jar-1.3.04.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xmlgraphics-commons-jar-1.4.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xmlrpc-client-jar-3.1.3.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xmlrpc-common-jar-3.1.3.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xpp3-jar-1.1.4c.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/xstream-jar-1.4.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/junit/junit-jar-4.9.jar"/>
+ <classpathentry kind="lib" path="build/lib/junit/org.springframework.test-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/dtd-generator/trang-jar-20091111.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/axis2-kernel-jar-1.7.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="build/lib/om/axiom-api-bundle-1.2.13-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/commons-cli-jar-1.2.jar"/>
+ <classpathentry kind="output" path="build/classes/eclipse"/>
+</classpath>
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/BaseStreamListener.java (from r1326089, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/ListenerAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/BaseStreamListener.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/BaseStreamListener.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/ListenerAdapter.java&r1=1326089&r2=1326094&rev=1326094&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/ListenerAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/BaseStreamListener.java Sat Apr 14 12:26:08 2012
@@ -36,7 +36,7 @@ import org.red5.server.api.stream.IBroad
import org.red5.server.api.stream.IStreamListener;
import org.red5.server.api.stream.IStreamPacket;
-public abstract class ListenerAdapter implements IStreamListener {
+public abstract class BaseStreamListener implements IStreamListener {
protected ITagWriter writer = null;
@@ -59,7 +59,7 @@ public abstract class ListenerAdapter im
protected boolean isInterview;
- public ListenerAdapter(String streamName, IScope scope,
+ public BaseStreamListener(String streamName, IScope scope,
Long flvRecordingMetaDataId, boolean isScreenData,
boolean isInterview) {
super();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java?rev=1326094&r1=1326093&r2=1326094&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java Sat Apr 14 12:26:08 2012
@@ -31,7 +31,7 @@ import org.red5.server.api.stream.IBroad
import org.red5.server.api.stream.IStreamPacket;
import org.slf4j.Logger;
-public class StreamAudioListener extends ListenerAdapter {
+public class StreamAudioListener extends BaseStreamListener {
private static final Logger log = Red5LoggerFactory.getLogger(
StreamAudioListener.class, OpenmeetingsVariables.webAppRootKey);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java?rev=1326094&r1=1326093&r2=1326094&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java Sat Apr 14 12:26:08 2012
@@ -35,7 +35,7 @@ import org.red5.server.api.stream.IBroad
import org.red5.server.api.stream.IStreamPacket;
import org.slf4j.Logger;
-public class StreamScreenListener extends ListenerAdapter {
+public class StreamScreenListener extends BaseStreamListener {
private int startTimeStamp = -1;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java?rev=1326094&r1=1326093&r2=1326094&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java Sat Apr 14 12:26:08 2012
@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
@@ -39,7 +40,7 @@ import org.openmeetings.app.data.flvreco
import org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverterTask;
import org.openmeetings.app.data.flvrecord.converter.FlvInterviewReConverterTask;
import org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverterTask;
-import org.openmeetings.app.data.flvrecord.listener.ListenerAdapter;
+import org.openmeetings.app.data.flvrecord.listener.BaseStreamListener;
import org.openmeetings.app.data.flvrecord.listener.StreamAudioListener;
import org.openmeetings.app.data.flvrecord.listener.StreamScreenListener;
import org.openmeetings.app.data.user.Usermanagement;
@@ -65,6 +66,16 @@ public class FLVRecorderService implemen
private static final Logger log = Red5LoggerFactory.getLogger(
FLVRecorderService.class, OpenmeetingsVariables.webAppRootKey);
+
+ /**
+ * Stores a reference to all available listeners
+ * we need that reference, as the internal references stored
+ * with the red5 stream object might be gone when the user
+ * closes the browser.
+ * But each listener has an asynchronous component that needs to be closed
+ * no matter how the user leaves the application!
+ */
+ private static final Map<Long,BaseStreamListener> streamListeners = new HashMap<Long,BaseStreamListener>();
// Spring Beans
@Autowired
@@ -312,9 +323,14 @@ public class FLVRecorderService implemen
// Save the stream to disk.
if (isScreenData) {
- stream.addStreamListener(new StreamScreenListener(streamName,
- conn.getScope(), flvRecordingMetaDataId, isScreenData,
- isInterview, flvRecordingMetaDataDao));
+
+ StreamScreenListener streamScreenListener = new StreamScreenListener(streamName,
+ conn.getScope(), flvRecordingMetaDataId, isScreenData,
+ isInterview, flvRecordingMetaDataDao);
+
+ streamListeners.put(flvRecordingMetaDataId, streamScreenListener);
+
+ stream.addStreamListener(streamScreenListener);
} else {
log.debug("### stream " + stream);
@@ -326,17 +342,25 @@ public class FLVRecorderService implemen
log.debug("### isInterview " + isInterview);
if (isInterview) {
+
+ StreamScreenListener streamScreenListener = new StreamScreenListener("AV_"
+ + streamName, conn.getScope(),
+ flvRecordingMetaDataId, isScreenData, isInterview,
+ flvRecordingMetaDataDao);
+
+ streamListeners.put(flvRecordingMetaDataId, streamScreenListener);
// Additionally record the Video Signal
- stream.addStreamListener(new StreamScreenListener("AV_"
- + streamName, conn.getScope(),
- flvRecordingMetaDataId, isScreenData, isInterview,
- flvRecordingMetaDataDao));
+ stream.addStreamListener(streamScreenListener);
}
+
+ StreamAudioListener streamAudioListener = new StreamAudioListener(streamName,
+ conn.getScope(), flvRecordingMetaDataId, isScreenData,
+ isInterview, flvRecordingMetaDeltaDao, flvRecordingMetaDataDao);
+
+ streamListeners.put(flvRecordingMetaDataId, streamAudioListener);
- stream.addStreamListener(new StreamAudioListener(streamName,
- conn.getScope(), flvRecordingMetaDataId, isScreenData,
- isInterview, flvRecordingMetaDeltaDao, flvRecordingMetaDataDao));
+ stream.addStreamListener(streamAudioListener);
}
// Just for Debug Purpose
// stream.saveAs(streamName+"_DEBUG", false);
@@ -346,35 +370,6 @@ public class FLVRecorderService implemen
}
/**
- * @deprecated
- * @param conn
- * @param broadcastId
- */
- @Deprecated
- public void _stopRecordingShowASD(IConnection conn, String broadcastId) {
- try {
-
- log.debug("** stopRecordingShow: " + conn);
- log.debug("### Stop recording show for broadcastId: " + broadcastId
- + " || " + conn.getScope().getContextPath());
-
- Object streamToClose = scopeApplicationAdapter.getBroadcastStream(
- conn.getScope(), broadcastId);
-
- if (streamToClose == null) {
- log.debug("Could not aquire Stream, maybe already closed");
- }
-
- ClientBroadcastStream stream = (ClientBroadcastStream) streamToClose;
- // Stop recording.
- stream.stopRecording();
-
- } catch (Exception err) {
- log.error("[stopRecordingShow]", err);
- }
- }
-
- /**
* Stops recording the publishing stream for the specified IConnection.
*
* @param conn
@@ -396,44 +391,30 @@ public class FLVRecorderService implemen
Object streamToClose = scopeApplicationAdapter.getBroadcastStream(
conn.getScope(), broadcastId);
- if (streamToClose == null) {
- log.debug("Could not aquire Stream, maybe already closed");
+ BaseStreamListener listenerAdapter = streamListeners.get(flvRecordingMetaDataId);
+
+ if (listenerAdapter == null) {
+ new IllegalStateException("Could not find Listener to stop!");
}
+
+ log.debug("Stream Closing :: " + flvRecordingMetaDataId);
+ listenerAdapter.closeStream();
ClientBroadcastStream stream = (ClientBroadcastStream) streamToClose;
- //Iterate through all stream listeners and stop the appropriate
- if (stream.getStreamListeners() != null) {
-
- for (Iterator<IStreamListener> iter = stream
- .getStreamListeners().iterator(); iter.hasNext();) {
-
- IStreamListener iStreamListener = iter.next();
-
- ListenerAdapter listenerAdapter = (ListenerAdapter) iStreamListener;
-
- log.debug("Stream Closing ?? "
- + listenerAdapter.getFlvRecordingMetaDataId() + " "
- + flvRecordingMetaDataId);
-
- if (listenerAdapter.getFlvRecordingMetaDataId().equals(
- flvRecordingMetaDataId)) {
- log.debug("Stream Closing :: " + flvRecordingMetaDataId);
- listenerAdapter.closeStream();
+ //the stream can be null if the user just closes the browser without canceling the
+ //recording before leaving
+ if (stream != null) {
+ //Iterate through all stream listeners and stop the appropriate
+ if (stream.getStreamListeners() != null) {
+
+ for (IStreamListener iStreamListener : stream
+ .getStreamListeners()) {
+ stream.removeStreamListener(iStreamListener);
}
-
}
-
- for (IStreamListener iStreamListener : stream
- .getStreamListeners()) {
- stream.removeStreamListener(iStreamListener);
- }
-
}
- // Just for Debugging
- // stream.stopRecording();
-
} catch (Exception err) {
log.error("[stopRecordingShow]", err);
}