Author: solomax
Date: Wed Jun 18 11:45:02 2014
New Revision: 1603417
URL: http://svn.apache.org/r1603417
Log:
[OPENMEETINGS-984] Recording autorepair is added
Modified:
openmeetings/branches/3.0.x/.classpath
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/ivysettings.xml
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Modified: openmeetings/branches/3.0.x/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/.classpath?rev=1603417&r1=1603416&r2=1603417&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/.classpath (original)
+++ openmeetings/branches/3.0.x/.classpath Wed Jun 18 11:45:02 2014
@@ -37,7 +37,7 @@
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings+3.0.x&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+3.0.x%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
- <classpathentry kind="lib"
path="build/red5/server/dist/lib/red5-io-1.0.3.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/red5-io-jar-1.0.4-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/red5-server.jar"
sourcepath="build/red5/server/src/main/java"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-core-4.0.3.RELEASE.jar"/>
@@ -62,6 +62,6 @@
<classpathentry kind="lib"
path="build/red5/server/dist/plugins/tomcat-embed-core-7.0.50.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/bcprov-jdk15on-1.47.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/cglib-nodep-2.2.2.jar"/>
- <classpathentry kind="lib"
path="build/red5/client/dist/red5-client-1.0.2-RC2.jar"
sourcepath="build/red5/client/src/main/java"/>
+ <classpathentry kind="lib"
path="build/red5/client/dist/red5-client-jar-1.0.2-RC2.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1603417&r1=1603416&r2=1603417&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Wed Jun 18 11:45:02 2014
@@ -1205,24 +1205,28 @@
<delete>
<fileset dir="${red5.server.lib}"
includes="jaudiotagger*.jar" />
</delete>
+ <!-- FIXME need to be removed as soon as red5 1.0.3 will be
released -->
+ <delete>
+ <fileset dir="${red5.server.lib}"
includes="red5-io*.jar" />
+ </delete>
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="red5-io" />
+ <param name="ivy.lib.location"
value="${red5.server.lib}" />
+ <param name="ivy.transitive" value="false" />
+ </antcall>
<antcall target="-patch-red5-server-start-script"/>
</target>
<!-- Check for the Red5 client libraries -->
<target name="-retrieve-red5-client" unless="red5.client.installed"
description="Retrieves the libraries if needed"
depends="-retrieve-red5-server,-jgit-task">
- <!-- Needs an empty dir to checkout to -->
- <delete dir="${red5.client.dir}"></delete>
- <git-clone uri="https://github.com/Red5/red5-client.git";
dest="${red5.client.dir}" branch="v${red5.client.version}"/>
- <artifact:mvn pom="${red5.client.dir}/pom.xml"
mavenVersion="${maven.version}" fork="true" dir="${red5.client.dir}">
- <jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
- <!--jvmarg value="-Dassembly.skipAssembly=true" /-->
- <arg value="clean"/>
- <arg value="install"/>
- <jvmarg value="-Dmaven.test.skip=true" />
- </artifact:mvn>
- <copy todir="${red5.client.lib}" overwrite="true" force="true">
- <fileset dir="${red5.client.dir}/target"
includes="red5-client-${red5.client.version}.jar" />
- </copy>
+ <delete>
+ <fileset dir="${red5.client.lib}" includes="*" />
+ </delete>
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="red5-client" />
+ <param name="ivy.lib.location"
value="${red5.client.lib}" />
+ <param name="ivy.transitive" value="false" />
+ </antcall>
<echo message="Red5 Client build" />
</target>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1603417&r1=1603416&r2=1603417&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Wed Jun 18 11:45:02 2014
@@ -39,6 +39,7 @@
<conf name="mysql" description="MySQL JDBC driver" />
<conf name="mvn" description="Maven Ant task to build Red5" />
<conf name="red5-client" description="Red5 Client/Server for
screensharing" />
+ <conf name="red5-io" description="Red5 io library" />
<conf name="jgit" description="JGit Ant task to retirieve Red5"
/>
</configurations>
<dependencies>
@@ -405,6 +406,16 @@
<exclude org="org.apache.ant"/>
</dependency>
+ <!-- red5-client -->
+ <dependency org="org.red5" name="red5-client"
conf="red5-client->*" rev="1.0.2-RC2" transitive="false" >
+ <include type="jar" />
+ </dependency>
+
+ <!-- red5-io -->
+ <dependency org="org.red5" name="red5-io" conf="red5-io->*"
rev="1.0.4-SNAPSHOT" transitive="false" >
+ <include type="jar" />
+ </dependency>
+
<exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
<exclude org="cglib" module="cglib-nodep" type="*" ext="*"
conf="*" matcher="exact"/>
<exclude org="pull-parser" module="pull-parser" type="*"
ext="*" conf="*" matcher="exact"/>
Modified: openmeetings/branches/3.0.x/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivysettings.xml?rev=1603417&r1=1603416&r2=1603417&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivysettings.xml (original)
+++ openmeetings/branches/3.0.x/ivysettings.xml Wed Jun 18 11:45:02 2014
@@ -28,7 +28,7 @@
<url name="svnkit" m2compatible="true">
<artifact
pattern="http://maven.tmatesoft.com/content/repositories/releases/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
</url>
- <url name="googlecode">
+ <url name="googlecode" m2compatible="true">
<artifact
pattern="https://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
<artifact
pattern="https://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
<artifact
pattern="https://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1603417&r1=1603416&r2=1603417&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Wed Jun 18 11:45:02 2014
@@ -42,6 +42,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
+import org.red5.io.flv.impl.FLVWriter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -194,8 +195,7 @@ public abstract class BaseConverter {
maxTimestamp =
metaSer.lastModified();
}
if (maxTimestamp +
TIME_TO_WAIT_FOR_FRAME < System.currentTimeMillis()) {
- // long time without
any update, closing
- /*
+ log.debug("### long
time without any update, closing ... ");
try {
if
(FLVWriter.repair(metaSer.getCanonicalPath(), null, null) && !metaSer.exists())
{
metaData.setStreamStatus(Status.STOPPED);
@@ -204,7 +204,6 @@ public abstract class BaseConverter {
} catch (IOException e)
{
log.error("###
Error while file repairing ... ", e);
}
- */
}
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1603417&r1=1603416&r2=1603417&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Wed Jun 18 11:45:02 2014
@@ -194,8 +194,8 @@ public abstract class BaseConverter {
maxTimestamp =
metaSer.lastModified();
}
if (maxTimestamp +
TIME_TO_WAIT_FOR_FRAME < System.currentTimeMillis()) {
- // long time without
any update, closing
/*
+ log.debug("### long
time without any update, closing ... ");
try {
if
(FLVWriter.repair(metaSer.getCanonicalPath(), null, null) && !metaSer.exists())
{
metaData.setStreamStatus(Status.STOPPED);
