Skip to content

Commit

Permalink
Updates for 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mondain
mondain committed Apr 22, 2019
1 parent cc0c83c commit 658fefb
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 210 deletions.
21 changes: 1 addition & 20 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.red5</groupId>
<artifactId>red5-parent</artifactId>
<version>1.0.14</version>
<version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>red5-server</artifactId>
Expand Down Expand Up @@ -229,25 +229,6 @@
<groupId>org.apache.mina</groupId>
<version>${mina.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
<exclusion>
<artifactId>c3p0</artifactId>
<groupId>com.mchange</groupId>
</exclusion>
<exclusion>
<artifactId>HikariCP-java6</artifactId>
<groupId>com.zaxxer</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- Runtime plugin deps -->
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/org/red5/server/adapter/MultiThreadedApplicationAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
import org.red5.server.plugin.PluginDescriptor;
import org.red5.server.plugin.PluginRegistry;
import org.red5.server.plugin.Red5Plugin;
import org.red5.server.scheduling.QuartzSchedulingService;
import org.red5.server.scheduling.JDKSchedulingService;
import org.red5.server.so.SharedObjectService;
import org.red5.server.stream.IProviderService;
import org.red5.server.stream.PlaylistSubscriberStream;
Expand Down Expand Up @@ -952,7 +952,7 @@ public ISubscriberStream getSubscriberStream(IScope scope, String name) {
* @return Name of the scheduled job
*/
public String addScheduledJob(int interval, IScheduledJob job) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
return service.addScheduledJob(interval, job);
}

Expand All @@ -967,7 +967,7 @@ public String addScheduledJob(int interval, IScheduledJob job) {
* @return Name of the scheduled job
*/
public String addScheduledOnceJob(long timeDelta, IScheduledJob job) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
return service.addScheduledOnceJob(timeDelta, job);
}

Expand All @@ -983,7 +983,7 @@ public String addScheduledOnceJob(long timeDelta, IScheduledJob job) {
* @return Name of the scheduled job
*/
public String addScheduledOnceJob(Date date, IScheduledJob job) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
return service.addScheduledOnceJob(date, job);
}

Expand All @@ -999,7 +999,7 @@ public String addScheduledOnceJob(Date date, IScheduledJob job) {
* @return the name of the scheduled job
*/
public String addScheduledJobAfterDelay(int interval, IScheduledJob job, int delay) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
return service.addScheduledJobAfterDelay(interval, job, delay);
}

Expand All @@ -1010,7 +1010,7 @@ public String addScheduledJobAfterDelay(int interval, IScheduledJob job, int del
* Scheduled job name
*/
public void pauseScheduledJob(String name) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
service.pauseScheduledJob(name);
}

Expand All @@ -1021,7 +1021,7 @@ public void pauseScheduledJob(String name) {
* Scheduled job name
*/
public void resumeScheduledJob(String name) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
service.resumeScheduledJob(name);
}

Expand All @@ -1032,7 +1032,7 @@ public void resumeScheduledJob(String name) {
* Scheduled job name
*/
public void removeScheduledJob(String name) {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
service.removeScheduledJob(name);
}

Expand All @@ -1042,7 +1042,7 @@ public void removeScheduledJob(String name) {
* @return List of scheduled job names as list of Strings.
*/
public List<String> getScheduledJobNames() {
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
return service.getScheduledJobNames();
}

Expand Down
134 changes: 0 additions & 134 deletions src/main/java/org/red5/server/scheduling/ApplicationSchedulingService.java
View file

This file was deleted.

5 changes: 3 additions & 2 deletions src/main/java/org/red5/server/stream/ProviderService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@ public INPUT_TYPE lookupProviderInput(IScope scope, String name, int type) {
// we have live input
result = INPUT_TYPE.LIVE;
} else {
// "default" to VOD as a missing file will be picked up later on
result = INPUT_TYPE.VOD;
File file = getStreamFile(scope, name);
if (file == null) {
if (type == -2 && liveWaitSupport) {
result = INPUT_TYPE.LIVE_WAIT;
}
log.debug("Requested stream: {} does not appear to be of VOD type", name);
} else {
// "default" to VOD as a missing file will be picked up later on
result = INPUT_TYPE.VOD;
}
}
return result;
Expand Down
37 changes: 0 additions & 37 deletions src/main/server/conf/quartz.properties
View file

This file was deleted.

4 changes: 1 addition & 3 deletions src/main/server/conf/red5-common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
<bean id="consumerService" class="org.red5.server.stream.ConsumerService"/>

<!-- Scheduling service -->
<bean id="schedulingService" class="org.red5.server.scheduling.QuartzSchedulingService">
<property name="configFile" value="${red5.root}/conf/quartz.properties"/>
</bean>
<bean id="schedulingService" class="org.red5.server.scheduling.JDKSchedulingService"/>

<!-- Use injection to setup thread pool for remoting clients -->
<bean id="remotingClient" class="org.red5.server.net.remoting.RemotingClient">
Expand Down
2 changes: 1 addition & 1 deletion src/main/server/red5.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if NOT DEFINED JAVA_HOME goto err

REM JAVA options
REM You can set JVM additional options here if you want
if NOT DEFINED JVM_OPTS set JVM_OPTS=-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2
if NOT DEFINED JVM_OPTS set JVM_OPTS=-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true
REM Set up logging options
set LOGGING_OPTS=-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true
REM Set up security options
Expand Down
2 changes: 1 addition & 1 deletion src/main/server/red5.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "Running on " $OS
# JAVA options
# You can set JVM additional options here if you want
if [ -z "$JVM_OPTS" ]; then
JVM_OPTS="-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2"
JVM_OPTS="-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true"
fi
# Set up security options
SECURITY_OPTS="-Djava.security.debug=failure"
Expand Down
4 changes: 1 addition & 3 deletions src/main/server/webapps/root/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@
<b class="spiffy"> <b class="spiffy1"><b></b></b> <b
class="spiffy2"><b></b></b> <b class="spiffy3"></b> <b
class="spiffy4"></b> <b class="spiffy5"></b></b>

<div class="spiffyfg">
<img src="biglogo.png" alt="Red5" />

<div id="information">
This page is used to test the proper operation of the Red5 server
after it has been installed. If you can read this page it means that
Expand All @@ -106,7 +104,7 @@
<iframe src="vod/index.html" width="320" height="240" border="0"></iframe>
<i>This may be empty if you don't have the vod app installed.</i>
</center>
<br /> <br /> If you prefer to jump right in, launch a <a href="demos">demo</a><
<br /> <br /> If you prefer to jump right in, launch a <a href="demos">demo</a>
</div>
<br />
<p>
Expand Down

0 comments on commit 658fefb

Please sign in to comment.