Skip to content

Commit 658fefb

Browse files
mondainmondain
committed
Updates for 1.1.0
1 parent cc0c83c commit 658fefb

File tree

9 files changed

+17
-210
lines changed

9 files changed

+17
-210
lines changed

‎pom.xml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.0.14</version>
6+
<version>1.1.0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server</artifactId>
@@ -229,25 +229,6 @@
229229
<groupId>org.apache.mina</groupId>
230230
<version>${mina.version}</version>
231231
</dependency>
232-
<dependency>
233-
<groupId>org.quartz-scheduler</groupId>
234-
<artifactId>quartz</artifactId>
235-
<version>${quartz.version}</version>
236-
<exclusions>
237-
<exclusion>
238-
<groupId>c3p0</groupId>
239-
<artifactId>c3p0</artifactId>
240-
</exclusion>
241-
<exclusion>
242-
<artifactId>c3p0</artifactId>
243-
<groupId>com.mchange</groupId>
244-
</exclusion>
245-
<exclusion>
246-
<artifactId>HikariCP-java6</artifactId>
247-
<groupId>com.zaxxer</groupId>
248-
</exclusion>
249-
</exclusions>
250-
</dependency>
251232
<!-- Runtime plugin deps -->
252233
<dependency>
253234
<groupId>${project.groupId}</groupId>

‎src/main/java/org/red5/server/adapter/MultiThreadedApplicationAdapter.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
import org.red5.server.plugin.PluginDescriptor;
6969
import org.red5.server.plugin.PluginRegistry;
7070
import org.red5.server.plugin.Red5Plugin;
71-
import org.red5.server.scheduling.QuartzSchedulingService;
71+
import org.red5.server.scheduling.JDKSchedulingService;
7272
import org.red5.server.so.SharedObjectService;
7373
import org.red5.server.stream.IProviderService;
7474
import org.red5.server.stream.PlaylistSubscriberStream;
@@ -952,7 +952,7 @@ public ISubscriberStream getSubscriberStream(IScope scope, String name) {
952952
* @return Name of the scheduled job
953953
*/
954954
public String addScheduledJob(int interval, IScheduledJob job) {
955-
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
955+
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
956956
return service.addScheduledJob(interval, job);
957957
}
958958

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

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

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

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

@@ -1021,7 +1021,7 @@ public void pauseScheduledJob(String name) {
10211021
* Scheduled job name
10221022
*/
10231023
public void resumeScheduledJob(String name) {
1024-
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
1024+
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
10251025
service.resumeScheduledJob(name);
10261026
}
10271027

@@ -1032,7 +1032,7 @@ public void resumeScheduledJob(String name) {
10321032
* Scheduled job name
10331033
*/
10341034
public void removeScheduledJob(String name) {
1035-
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, QuartzSchedulingService.class, false);
1035+
ISchedulingService service = (ISchedulingService) ScopeUtils.getScopeService(scope, ISchedulingService.class, JDKSchedulingService.class, false);
10361036
service.removeScheduledJob(name);
10371037
}
10381038

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

‎src/main/java/org/red5/server/scheduling/ApplicationSchedulingService.java

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎src/main/java/org/red5/server/stream/ProviderService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ public INPUT_TYPE lookupProviderInput(IScope scope, String name, int type) {
5858
// we have live input
5959
result = INPUT_TYPE.LIVE;
6060
} else {
61-
// "default" to VOD as a missing file will be picked up later on
62-
result = INPUT_TYPE.VOD;
6361
File file = getStreamFile(scope, name);
6462
if (file == null) {
6563
if (type == -2 && liveWaitSupport) {
6664
result = INPUT_TYPE.LIVE_WAIT;
6765
}
6866
log.debug("Requested stream: {} does not appear to be of VOD type", name);
67+
} else {
68+
// "default" to VOD as a missing file will be picked up later on
69+
result = INPUT_TYPE.VOD;
6970
}
7071
}
7172
return result;

‎src/main/server/conf/quartz.properties

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/main/server/conf/red5-common.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@
8383
<bean id="consumerService" class="org.red5.server.stream.ConsumerService"/>
8484

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

9088
<!-- Use injection to setup thread pool for remoting clients -->
9189
<bean id="remotingClient" class="org.red5.server.net.remoting.RemotingClient">

‎src/main/server/red5.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if NOT DEFINED JAVA_HOME goto err
88

99
REM JAVA options
1010
REM You can set JVM additional options here if you want
11-
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
11+
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
1212
REM Set up logging options
1313
set LOGGING_OPTS=-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true
1414
REM Set up security options

‎src/main/server/red5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ echo "Running on " $OS
3737
# JAVA options
3838
# You can set JVM additional options here if you want
3939
if [ -z "$JVM_OPTS" ]; then
40-
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"
40+
JVM_OPTS="-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true"
4141
fi
4242
# Set up security options
4343
SECURITY_OPTS="-Djava.security.debug=failure"

‎src/main/server/webapps/root/index.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,8 @@
9393
<b class="spiffy"> <b class="spiffy1"><b></b></b> <b
9494
class="spiffy2"><b></b></b> <b class="spiffy3"></b> <b
9595
class="spiffy4"></b> <b class="spiffy5"></b></b>
96-
9796
<div class="spiffyfg">
9897
<img src="biglogo.png" alt="Red5" />
99-
10098
<div id="information">
10199
This page is used to test the proper operation of the Red5 server
102100
after it has been installed. If you can read this page it means that
@@ -106,7 +104,7 @@
106104
<iframe src="vod/index.html" width="320" height="240" border="0"></iframe>
107105
<i>This may be empty if you don't have the vod app installed.</i>
108106
</center>
109-
<br /> <br /> If you prefer to jump right in, launch a <a href="demos">demo</a><
107+
<br /> <br /> If you prefer to jump right in, launch a <a href="demos">demo</a>
110108
</div>
111109
<br />
112110
<p>

0 commit comments

Comments
 (0)