Author: solomax
Date: Fri Mar 25 11:03:28 2016
New Revision: 1736557
URL: http://svn.apache.org/viewvc?rev=1736557&view=rev
Log:
[OPENMEETINGS-1360] red5-server is updated to latest version
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/IScreenShare.java
openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.1.x/pom.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Fri Mar 25 11:03:28 2016
@@ -316,11 +316,11 @@ public class ScopeApplicationAdapter ext
client.setStreamPublishStarted(true);
}
-
client.setVX(Integer.parseInt(map.get("screenX").toString()));
-
client.setVY(Integer.parseInt(map.get("screenY").toString()));
-
client.setVWidth(Integer.parseInt(map.get("screenWidth").toString()));
-
client.setVHeight(Integer.parseInt(map.get("screenHeight").toString()));
-
client.setStreamPublishName(map.get("publishName").toString());
+ client.setVX(Double.valueOf("" +
map.get("screenX")).intValue());
+ client.setVY(Double.valueOf("" +
map.get("screenY")).intValue());
+ client.setVWidth(Double.valueOf("" +
map.get("screenWidth")).intValue());
+ client.setVHeight(Double.valueOf("" +
map.get("screenHeight")).intValue());
+ client.setStreamPublishName("" +
map.get("publishName"));
sessionManager.updateClientByStreamId(current.getClient().getId(), client,
false, null);
Map<String, Object> returnMap = new
HashMap<String, Object>();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
Fri Mar 25 11:03:28 2016
@@ -82,7 +82,7 @@
<event name="onIoError" />
<!-- save value for restart -->
- <attribute name="streamName" />
+ <attribute name="streamName" type="string"/>
<attribute name="delay" />
<!--- @keywords private -->
<method name="createStream">
@@ -168,9 +168,9 @@
@param string streamName the streamname to play
@param number delay The time it should seek, for Live-Streams
this value should be -1
-->
- <method name="playStream" args="streamName,delay">
+ <method name="playStream" args="_streamName, delay">
<![CDATA[
- this.streamName=streamName;
+ this.streamName = "" + _streamName;
this.delay=delay;
if (this._ns!=null){
this._stop();
@@ -182,6 +182,7 @@
//FIXME: Commented out, cause this leads to
Buffer-Full/Buffer-Empty Events
//after re-syncing the stream
//this.setBuffer(0.1);
+ if ($debug) Debug.write("Play Stream "+streamName);
if (delay == 0) {
this._ns.play(streamName);
} else {
@@ -190,9 +191,9 @@
]]>
</method>
- <method name="justPlayStream" args="streamName,delay">
+ <method name="justPlayStream" args="_streamName, delay">
<![CDATA[
- this.streamName=streamName;
+ this.streamName = "" + _streamName;
this.delay=delay;
if (this._ns!=null){
if ($debug) Debug.write("STOP NS is NOT null ")
@@ -207,13 +208,13 @@
this.setBuffer(6);
- if ($debug) Debug.write("Play Stream "+streamName);
+ if ($debug) Debug.write("Just Play Stream "+streamName);
this._ns.play(streamName,delay);
]]>
</method>
- <method name="prepare" args="mode,streamName,camReference,micReference">
+ <method name="prepare" args="mode, streamName, camReference,
micReference">
if (this._ns != null){
this._stop();
}
@@ -246,7 +247,7 @@
muteMicro(this.micMuted);
}
- this._ns.publish(streamName, (mode == "broadcast") ? "live" :
mode);
+ this._ns.publish("" + streamName, (mode == "broadcast") ?
"live" : mode);
</method>
<!---
BroadCasts a Stream
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
Fri Mar 25 11:03:28 2016
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.8</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -55,6 +55,20 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+
<Permissions>all-permissions</Permissions>
+
<Trusted-Only>true"</Trusted-Only>
+ <Codebase>*</Codebase>
+
<Crypto-Strength>unlimited</Crypto-Strength>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
@@ -268,7 +282,7 @@
</keystoreConfig>
<verify>false</verify> <!-- due to self signed certificate -->
</sign>
- <unsign>true</unsign>
+ <unsign>false</unsign>
<outputJarVersions>false</outputJarVersions>
<makeArchive>false</makeArchive>
<verbose>true</verbose>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
Fri Mar 25 11:03:28 2016
@@ -72,9 +72,9 @@ class CaptureScreen extends Thread {
private String host = null;
private String app = null;
private int port = -1;
- private int streamId;
+ private Number streamId;
private boolean startPublish = false;
- private Scheduler scheduler;
+ private Scheduler _scheduler;
public CaptureScreen(CoreScreenShare coreScreenShare, IScreenShare
client, String host, String app, int port) {
core = coreScreenShare;
@@ -82,22 +82,28 @@ class CaptureScreen extends Thread {
this.host = host;
this.app = app;
this.port = port;
- final Properties p = new Properties();
- p.put(PROP_SCHED_SKIP_UPDATE_CHECK, "true");
- p.put("org.quartz.threadPool.threadCount", "10");
- try {
- SchedulerFactory sf = new StdSchedulerFactory(p);
- scheduler = sf.getScheduler();
- } catch (SchedulerException e) {
- log.error("Unexpected error while creating scheduler",
e);
+ }
+
+ private Scheduler getScheduler() {
+ if (_scheduler == null) {
+ final Properties p = new Properties();
+ p.put(PROP_SCHED_SKIP_UPDATE_CHECK, "true");
+ p.put("org.quartz.threadPool.threadCount", "10");
+ try {
+ SchedulerFactory sf = new
StdSchedulerFactory(p);
+ _scheduler = sf.getScheduler();
+ } catch (SchedulerException e) {
+ log.error("Unexpected error while creating
scheduler", e);
+ }
}
+ return _scheduler;
}
public void release() {
try {
- if (scheduler != null) {
- scheduler.shutdown(true);
- scheduler = null;
+ if (_scheduler != null) {
+ _scheduler.shutdown(true);
+ _scheduler = null;
}
} catch (Exception e) {
log.error("Unexpected error while shutting down
scheduler", e);
@@ -130,9 +136,10 @@ class CaptureScreen extends Thread {
.build();
sendJob.getJobDataMap().put(SendJob.CAPTURE_KEY, this);
- scheduler.scheduleJob(encodeJob, encodeTrigger);
- scheduler.scheduleJob(sendJob, sendTrigger);
- scheduler.start();
+ Scheduler s = getScheduler();
+ s.scheduleJob(encodeJob, encodeTrigger);
+ s.scheduleJob(sendJob, sendTrigger);
+ s.start();
} catch (Exception e) {
log.error("Error while running: ", e);
}
@@ -275,11 +282,11 @@ class CaptureScreen extends Thread {
return port;
}
- public int getStreamId() {
+ public Number getStreamId() {
return streamId;
}
- public void setStreamId(int streamId) {
+ public void setStreamId(Number streamId) {
this.streamId = streamId;
}
@@ -289,6 +296,7 @@ class CaptureScreen extends Thread {
public void setSendCursor(boolean sendCursor) {
try {
+ Scheduler s = getScheduler();
if (sendCursor) {
JobDetail cursorJob =
JobBuilder.newJob(CursorJob.class).withIdentity(QUARTZ_CURSOR_JOB_NAME,
QUARTZ_GROUP_NAME).build();
Trigger cursorTrigger =
TriggerBuilder.newTrigger()
@@ -296,9 +304,9 @@ class CaptureScreen extends Thread {
.withSchedule(simpleSchedule().withIntervalInMilliseconds(1000 / Math.min(5,
FPS)).repeatForever())
.build();
cursorJob.getJobDataMap().put(CursorJob.CAPTURE_KEY, this);
- scheduler.scheduleJob(cursorJob, cursorTrigger);
+ s.scheduleJob(cursorJob, cursorTrigger);
} else {
-
scheduler.deleteJob(JobKey.jobKey(QUARTZ_CURSOR_JOB_NAME, QUARTZ_GROUP_NAME));
+
s.deleteJob(JobKey.jobKey(QUARTZ_CURSOR_JOB_NAME, QUARTZ_GROUP_NAME));
}
} catch (SchedulerException e) {
log.error("Unexpected Error schedule/unschedule cursor
job", e);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Fri Mar 25 11:03:28 2016
@@ -71,7 +71,7 @@ public class CoreScreenShare implements
private int port;
public String publishName;
- private CaptureScreen capture = null;
+ private CaptureScreen _capture = null;
private RTMPClientPublish publishClient = null;
private ScreenSharerFrame frame;
@@ -96,10 +96,10 @@ public class CoreScreenShare implements
public Map<Integer, Boolean> currentPressedKeys = new HashMap<Integer,
Boolean>();
private CaptureScreen getCapture() {
- if (capture == null) {
- capture = new CaptureScreen(this, instance, host, app,
port);
+ if (_capture == null) {
+ _capture = new CaptureScreen(this, instance, host, app,
port);
}
- return capture;
+ return _capture;
}
//
------------------------------------------------------------------------
//
@@ -387,12 +387,13 @@ public class CoreScreenShare implements
setReadyToRecord(false);
getCapture().setStartPublish(false);
getCapture().release();
- capture = null;
+ _capture = null;
} catch (Exception e) {
log.error("ScreenShare stopStream exception " + e);
}
}
+ @Override
public void onStreamEvent(Notify notify) {
log.debug( "onStreamEvent " + notify );
@@ -639,6 +640,7 @@ public class CoreScreenShare implements
}
}
+ @Override
public void resultReceived(IPendingServiceCall call) {
try {
@@ -693,7 +695,7 @@ public class CoreScreenShare implements
} else if ("createStream".equals(method)) {
if (startRecording || startStreaming) {
if (call.getResult() != null) {
-
getCapture().setStreamId((Integer)call.getResult());
+
getCapture().setStreamId((Number)call.getResult());
}
log.debug("createPublishStream result
stream id: {}; name: {}", getCapture().getStreamId(), publishName);
instance.publish(getCapture().getStreamId(), publishName, "live", this);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/IScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/IScreenShare.java?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/IScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/IScreenShare.java
Fri Mar 25 11:03:28 2016
@@ -34,6 +34,6 @@ public interface IScreenShare extends Cl
void setServiceProvider(Object serviceProvider);
void disconnect();
void createStream(IPendingServiceCallback callback);
- void publish(int streamId, String name, String mode,
INetStreamEventHandler handler);
- void publishStreamData(int streamId, IMessage message);
+ void publish(Number streamId, String name, String mode,
INetStreamEventHandler handler);
+ void publishStreamData(Number streamId, IMessage message);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml Fri Mar
25 11:03:28 2016
@@ -129,7 +129,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
-
<missing>red5-server/red5-server-1.0.6-RELEASE-server.zip</missing> <!-- TODO
should be in-sync with global property -->
+
<missing>red5-server/red5-server-1.0.7-M10.zip</missing> <!-- TODO should be
in-sync with global property -->
</file>
</activation>
<build>
@@ -146,7 +146,7 @@
</goals>
<configuration>
<url>https://github.com/Red5/red5-server/releases/download</url>
-
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.zip</fromFile>
+
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}.zip</fromFile>
<toDir>${red5-server-file.dir}</toDir>
<skip>${red5-server.dwnd.skip}</skip>
</configuration>
@@ -168,10 +168,10 @@
<goals>
<goal>copy</goal>
</goals>
- <phase>process-resources</phase>
+ <phase>prepare-package</phase>
<configuration>
<fileset>
-
<directory>${red5-server-file.dir}/red5-server-${red5-server.version}-server.zip/red5-server-${red5-server.version}</directory>
+
<directory>${red5-server-file.dir}/red5-server-${red5-server.version}.zip/red5-server</directory>
<outputDirectory>${server.dir}</outputDirectory>
</fileset>
<skip>${om.quick.build}</skip>
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1736557&r1=1736556&r2=1736557&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Fri Mar 25 11:03:28 2016
@@ -36,7 +36,7 @@
<wicket.mode>DEPLOYMENT</wicket.mode>
<om.quick.build>false</om.quick.build>
<db>derby</db>
- <spring.version>4.1.7.RELEASE</spring.version>
+ <spring.version>4.2.5.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
@@ -44,8 +44,8 @@
<wicket.version>7.2.0</wicket.version>
<wicketju.version>7.2.0</wicketju.version>
<wickets.version>7.2.0</wickets.version>
- <red5-server.version>1.0.6-RELEASE</red5-server.version>
- <red5-client.version>1.0.6-RELEASE</red5-client.version>
+ <red5-server.version>1.0.7-M10</red5-server.version>
+ <red5-client.version>1.0.7-M10</red5-client.version>
<batik.version>1.8</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
@@ -56,7 +56,7 @@
<site.basedir>${project.basedir}</site.basedir>
<skip.site.copy>true</skip.site.copy>
<src.pack.skip>false</src.pack.skip>
- <tomcat.version>8.0.28</tomcat.version>
+ <tomcat.version>8.0.32</tomcat.version>
<derby.version>10.12.1.1</derby.version>
</properties>
<modules>
