Author: solomax
Date: Mon May 21 02:34:07 2012
New Revision: 1340885
URL: http://svn.apache.org/viewvc?rev=1340885&view=rev
Log:
"red5-screensharing" folder is renamed to be "screensharing"; red5 version
update to 4368, documentation is updated
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/screensharing/
- copied from r1340883,
incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/
Modified:
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component?rev=1340885&r1=1340884&r2=1340885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
(original)
+++
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
Mon May 21 02:34:07 2012
@@ -4,7 +4,7 @@
<wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/client"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/screenviewer"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/red5-screenshare"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/screensharing"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/server"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/WebContent/WEB-INF"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1340885&r1=1340884&r2=1340885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Mon May 21
02:34:07 2012
@@ -1,6 +1,6 @@
project.version=2.0.0
project.status=SNAPSHOT
-red5.revision=4364
+red5.revision=4368
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=1340885&r1=1340884&r2=1340885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon May 21 02:34:07 2012
@@ -34,7 +34,7 @@
<property name="mainlibs.lib.dir" value="${project.lib.dir}/mainlibs" />
<property name="om.lib.dir" value="${project.lib.dir}/om" />
<property name="anakia.lib.dir" value="${project.lib.dir}/anakia" />
- <property name="red5-screenshare.resources"
value="${basedir}/WebContent/red5-screenshare" />
+ <property name="screensharing.resources"
value="${basedir}/WebContent/screensharing" />
<property name="junit.lib.dir" value="${project.lib.dir}/junit" />
<property name="rat.lib.dir" value="${project.lib.dir}/rat" />
<property name="dtd-generator.lib.dir"
value="${project.lib.dir}/dtd-generator" />
@@ -50,7 +50,7 @@
<property name="laszlo.home" value="${build.base.dir}/openlaszlo" />
<!-- screenshare.out.dir -->
- <property name="screenshare.out.dir"
value="${dist.webapps.dir}/red5-screenshare" />
+ <property name="screenshare.out.dir"
value="${dist.webapps.dir}/screensharing" />
<property name="main.out.dir"
value="${build.base.dir}/classes/openmeetings" />
@@ -306,7 +306,7 @@
<include name="META-INF/LICENSE" />
<include name="META-INF/NOTICE" />
</fileset>
- <fileset
file="${red5-screenshare.resources}/logback.xml"/>
+ <fileset file="${screensharing.resources}/logback.xml"/>
<manifest>
<attribute name="Built-By" value="OpenMeetings
- http://openmeetings.googlecode.com"; />
<attribute name="Built-On"
value="${build.TODAY}" />
@@ -333,7 +333,7 @@
</dname>
</genkey>
<copy todir="${screenshare.out.dir}" filtering="true">
- <fileset dir="${red5-screenshare.resources}"
includes="*.jpg"/>
+ <fileset dir="${screensharing.resources}"
includes="*.jpg"/>
<fileset dir="${red5.server.lib}"
includes="commons-codec*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpclient*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpcore*.jar" />
Modified: incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html?rev=1340885&r1=1340884&r2=1340885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html Mon May
21 02:34:07 2012
@@ -1042,9 +1042,6 @@ limitations under the License.
<li>
Uncomment <tt><!-- RTMPS --></tt> section in
<tt>red5/conf/red5-core.xml</tt>
</li>
- <li>
- delete line #131 of <tt>red5/conf/red5-core.xml</tt>:
<tt><property name="jmxPollInterval" value="1000" /></tt>
- </li>
<li>
Edit <tt>red5/conf/red5.properties</tt>
and set
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1340885&r1=1340884&r2=1340885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Mon May 21 02:34:07 2012
@@ -232,7 +232,7 @@ public class ScreenRequestHandler extend
log.debug("Creating JNLP Template for TCP solution");
try {
- final String screenShareDirName =
"red5-screenshare";
+ final String screenShareDirName =
"screensharing";
//libs
StringBuilder libs = new StringBuilder();
File screenShareDir = new
File(ScopeApplicationAdapter.webAppPath, screenShareDirName);
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml?rev=1340885&r1=1340884&r2=1340885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml Mon May
21 02:34:07 2012
@@ -122,9 +122,6 @@
<li>
Uncomment <tt><!-- RTMPS --></tt> section in
<tt>red5/conf/red5-core.xml</tt>
</li>
- <li>
- delete line #131 of <tt>red5/conf/red5-core.xml</tt>:
<tt><property name="jmxPollInterval" value="1000" /></tt>
- </li>
<li>
Edit <tt>red5/conf/red5.properties</tt>
and set
