Author: sebawagner
Date: Tue Jun 12 18:00:54 2012
New Revision: 1349461

URL: http://svn.apache.org/viewvc?rev=1349461&view=rev
Log:
OPENMEETINGS-323 Update Red5 to latest version (r4380) in both server and 
client library to test RTMPT and file not found exceptions 

Modified:
    incubator/openmeetings/trunk/singlewebapp/.classpath
    incubator/openmeetings/trunk/singlewebapp/build.properties
    incubator/openmeetings/trunk/singlewebapp/build.xml
    incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
    incubator/openmeetings/trunk/singlewebapp/ivy.xml
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java

Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1349461&r1=1349460&r2=1349461&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Tue Jun 12 18:00:54 
2012
@@ -29,43 +29,41 @@
        <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/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/jul-to-slf4j-1.6.1.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.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/dist/lib/spring-beans-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/dist/lib/spring-context-support-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/dist/lib/spring-expression-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/dist/lib/spring-web-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" path="build/red5/server/dist/red5.jar" 
sourcepath="build/red5/src"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/bcprov-jdk16-145.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.antlr-3.1.3.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.apache.xerces-2.9.1.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.objectweb.asm-3.2.0.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-beanutils-1.8.3.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-codec-1.6.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-collections-3.2.1.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-lang3-3.1.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-modeler-2.0.1.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-pool-1.5.6.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/ehcache-core-2.5.0.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/httpclient-4.1.2.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/httpcore-4.1.3.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/javaee-api-5.1.2.om.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/jcl-over-slf4j-1.6.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/jul-to-slf4j-1.6.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/log4j-over-slf4j-1.6.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/logback-classic-1.0.3.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/logback-core-1.0.3.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/mina-core-2.0.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/mina-integration-beans-2.0.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/mina-integration-jmx-2.0.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/quartz-1.8.5.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-asm-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-beans-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-context-support-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-expression-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-web-3.1.1.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"/>
@@ -113,8 +111,7 @@
        <classpathentry kind="lib" 
path="build/lib/junit/org.springframework.test-jar-3.1.1.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/red5/dist/commons-cli-jar-1.2.jar"/>
-       <classpathentry kind="lib" 
path="build/lib/mainlibs/red5-client-jar-1.0-RC2.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/commons-cli-jar-1.2.jar"/>
        <classpathentry kind="lib" 
path="build/lib/mainlibs/cglib-jar-2.2.2.jar"/>
        <classpathentry kind="lib" 
path="build/lib/mainlibs/commons-fileupload-jar-1.2.2.jar"/>
        <classpathentry kind="lib" 
path="build/lib/mainlibs/commons-io-jar-2.1.jar"/>
@@ -123,24 +120,14 @@
        <classpathentry kind="lib" 
path="build/lib/mainlibs/org.springframework.orm-jar-3.1.1.RELEASE.jar"/>
        <classpathentry kind="lib" 
path="build/lib/mainlibs/org.springframework.transaction-jar-3.1.1.RELEASE.jar"/>
        <classpathentry kind="lib" 
path="build/lib/mainlibs/org.springframework.web.servlet-jar-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.aopalliance-1.0.0.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.net.sf.cglib-2.2.0.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.antlr-3.1.3.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.apache.xerces-2.9.1.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.objectweb.asm-3.2.0.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.slf4j.api-1.6.1.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/com.springsource.slf4j.bridge-1.6.1.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-aop-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-asm-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-beans-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-context-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-context-support-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-core-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-expression-3.1.1.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/lib/spring-web-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/client/dist/red5-client.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.net.sf.cglib-2.2.0.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/com.springsource.org.aopalliance-1.0.0.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/jruby-1.6.7.2.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/jython-standalone-2.5.2.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/slf4j-api-1.6.4.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-aop-3.1.1.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/sysout-over-slf4j-1.0.2.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/xmlrpc-2.0.1.jar"/>
        <classpathentry kind="output" path="build/classes/eclipse"/>
 </classpath>

Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1349461&r1=1349460&r2=1349461&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Tue Jun 12 
18:00:54 2012
@@ -1,6 +1,7 @@
 project.version=2.0.0
 project.status=SNAPSHOT
-red5.revision=4374
+red5.server.revision=4380
+red5.client.revision=4380
 laszlo.debug=false
 laszlo.proxied=solo
 db=derby

Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1349461&r1=1349460&r2=1349461&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Tue Jun 12 18:00:54 2012
@@ -40,9 +40,11 @@
        <property name="dtd-generator.lib.dir" 
value="${project.lib.dir}/dtd-generator" />
        <property name="svntask.lib.dir" value="${project.lib.dir}/svntask" />
 
-       <property name="red5.server.dir" value="${build.base.dir}/red5" />
+       <property name="red5.server.dir" value="${build.base.dir}/red5/server" 
/>
+       <property name="red5.client.dir" value="${build.base.dir}/red5/client" 
/>
        <property name="red5.lib" value="${red5.server.dir}/dist" />
        <property name="red5.server.lib" value="${red5.lib}/lib" />
+       <property name="red5.client.lib" value="${red5.client.dir}/dist" />
        <property name="red5.root" value="${dist.dir}/red5" />
        <property name="dist.webapps.dir" 
value="${red5.root}/webapps/${project.distname}" />
        <property name="dist.persistence.dir" 
value="${dist.webapps.dir}/WEB-INF/classes/META-INF/" />
@@ -77,6 +79,7 @@
        <!-- compile classpath -->
        <path id="compile.classpath">
                <fileset dir="${red5.server.lib}" includes="*.jar" />
+               <fileset dir="${red5.client.lib}" includes="*.jar" />
                <fileset dir="${red5.lib}" includes="*.jar" />
                <fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
                <fileset dir="${om.lib.dir}" includes="*.jar" />
@@ -87,6 +90,7 @@
 
        <target name="prepare.mkdir" depends="-java6.check">
                <mkdir dir="${red5.server.lib}" />
+               <mkdir dir="${red5.client.dir}/dist" />
                <mkdir dir="${dist.dir}" />
                <mkdir dir="${main.out.dir}" />
                <mkdir dir="${mainlibs.lib.dir}" />
@@ -139,6 +143,7 @@
        <!-- build webapp -->
        <target name="-copy-libraries" description="All jars downloaded by ivy 
copied to appropriate places">
                <copy todir="${red5.root}/lib">
+                       <fileset dir="${red5.client.lib}" 
includes="red5-client*.jar" />
                        <fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
                </copy>
                <copy todir="${dist.webapps.dir}/WEB-INF/lib">
@@ -334,6 +339,7 @@
                        <fileset dir="${red5.server.lib}" 
includes="bcprov-jdk16*.jar" />
                        <fileset dir="${red5.server.lib}" 
includes="ehcache-core*.jar" />
                        <fileset dir="${red5.server.lib}" 
includes="commons-beanutils*.jar" />
+                       <fileset dir="${red5.server.lib}" 
includes="slf4j-api*.jar" />
                        <fileset dir="${red5.server.lib}" 
includes="jcl-over-slf4j*.jar" />
                        <fileset dir="${red5.server.lib}" 
includes="commons-collections*.jar" />
                        <fileset dir="${red5.lib}" includes="red5.jar" />
@@ -343,7 +349,7 @@
                        <fileset dir="${red5.server.lib}" 
includes="logback*.jar" />
                        <fileset dir="${red5.server.lib}" 
includes="mina-core*.jar" />
                        <fileset dir="${red5.server.lib}" 
includes="com.springsource.slf4j.api*.jar" />
-                       <fileset dir="${mainlibs.lib.dir}" 
includes="red5-client*.jar" />
+                       <fileset dir="${red5.client.lib}" 
includes="red5-client*.jar" />
                </copy>
                <signjar alias="filetest" keystore="${keystore.file}" 
storepass="secret" lazy="false">
                        <path>
@@ -685,6 +691,7 @@
                <available classpathref="compile.classpath" 
classname="org.apache.derby.jdbc.ClientDriver" property="derby.installed" />
                <available file="${laszlo.home}/WEB-INF/lib" type="dir" 
property="laszlo.installed" />
                <available file="${red5.lib}/red5.sh" type="file" 
property="red5.installed" />
+               <available file="${red5.client.dir}/build.xml" type="file" 
property="red5.client.installed" />
        </target>
 
        <target name="-retrieve" description="Retrieves the libraries if 
needed">
@@ -707,11 +714,15 @@
                <ivy:resolve file="ivy.xml" conf="${ivy.conf.name}" 
checkIfChanged="false" transitive="${ivy.transitive}" />
                <ivy:retrieve conf="${ivy.conf.name}" 
pattern="${ivy.lib.location}/[artifact]-[type]-[revision].[ext]" />
        </target>
+       
+       <!-- wrapper to load the server before the client to have the 
+               red5.jar that is necessary to build the client --> 
+       <target name="-retrieve-red5" depends="-retrieve-red5-client" />
 
        <!-- Check for the Red5 libraries -->
-       <target name="-retrieve-red5" unless="red5.installed" 
description="Retrieves the libraries if needed" depends="-ant-task">
+       <target name="-retrieve-red5-server" unless="red5.installed" 
description="Retrieves the libraries if needed" depends="-ant-task">
                <svn refid="svn.settings">
-                       <checkout 
url="http://red5.googlecode.com/svn/java/server/trunk/"; 
revision="${red5.revision}" destPath="${red5.server.dir}" />
+                       <checkout 
url="http://red5.googlecode.com/svn/java/server/trunk/"; 
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
                </svn>
                <subant target="dist">
                        <fileset dir="${red5.server.dir}" includes="build.xml" 
/>
@@ -745,6 +756,18 @@
                        <fileset dir="${red5.server.lib}" 
includes="jaudiotagger*.jar" />
                </delete>
        </target>
+       
+       <!-- Check for the Red5 libraries -->
+       <target name="-retrieve-red5-client" unless="red5.client.installed" 
description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
+               <svn refid="svn.settings">
+                       <checkout 
url="http://red5.googlecode.com/svn/java/client/trunk/"; 
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
+               </svn>
+               <copy file="${red5.lib}/red5.jar" 
todir="${red5.client.dir}/lib" />
+               <subant target="dist">
+                       <fileset dir="${red5.client.dir}" includes="build.xml" 
/>
+               </subant>
+               <echo message="Red5 Client build" />
+       </target>
 
        <!-- Check for the Top level libraries -->
        <target name="-retrieve-mainlibs" unless="mainlib.installed" 
description="Retrieves the libraries if needed" depends="-retrieve-red5">

Modified: incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1349461&r1=1349460&r2=1349461&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Tue Jun 12 
18:00:54 2012
@@ -279,9 +279,9 @@ limitations under the License.
                        Method: <i>getErrorByCode (
                                                                                
                   String SID
                                                                                
                     , 
-                                                  Long errorid
+                                                  long errorid
                                                                                
                     , 
-                                                  Long language_id
+                                                  long language_id
                                                                        )
                        </i><br/>
                        <p>
@@ -314,7 +314,7 @@ limitations under the License.
                           
                                                                                
   <tr>
                             <td valign="top">
-                                                                       Long
+                                                                       long
                                                             </td>
                             <td valign="top">errorid</td>
                             <td valign="top">the error id (negative Value 
here!)</td>
@@ -322,7 +322,7 @@ limitations under the License.
                           
                                                                                
   <tr>
                             <td valign="top">
-                                                                       Long
+                                                                       long
                                                             </td>
                             <td valign="top">language_id</td>
                             <td valign="top">The id of the language</td>

Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1349461&r1=1349460&r2=1349461&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Tue Jun 12 18:00:54 2012
@@ -58,9 +58,6 @@
                <dependency org="cglib" name="cglib" rev="2.2.2" 
transitive="false">
                        <include type="jar" />
                </dependency>
-               <dependency org="org/red5" name="red5-client" rev="1.0-RC2" 
transitive="false">
-                       <include type="jar" />
-               </dependency>
                <!-- include type="bundle" / FIXME unable to get openjpa 
without  sources -->
                <dependency org="org.apache.geronimo.specs" 
name="geronimo-jpa_2.0_spec"
                        rev="1.1" conf="mainlib.ext->*" transitive="false"/>

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1349461&r1=1349460&r2=1349461&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
 Tue Jun 12 18:00:54 2012
@@ -882,7 +882,7 @@ public class ScopeApplicationAdapter ext
        @Override
        public synchronized void streamBroadcastClose(IBroadcastStream stream) {
 
-               // Notify all the clients that the stream had been started
+               // Notify all the clients that the stream had been closed
                log.debug("start streamBroadcastClose broadcast close: "
                                + stream.getPublishedName());
                try {


Reply via email to