Updates for 1.1.0

Author: mondain

pom.xml

@@ -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-common</artifactId>
@@ -177,21 +177,6 @@
             <groupId>commons-codec</groupId>
             <version>${commons-codec.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>${quartz.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>c3p0</artifactId>
-                    <groupId>com.mchange</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>HikariCP-java6</artifactId>
-                    <groupId>com.zaxxer</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>

src/main/java/org/red5/server/Server.java

@@ -33,7 +33,6 @@
 import org.red5.server.api.scheduling.ISchedulingService;
 import org.red5.server.api.scope.IGlobalScope;
 import org.red5.server.api.scope.IScope;
-import org.red5.server.scheduling.QuartzSchedulingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -52,7 +51,7 @@ public class Server implements IServer, ApplicationContextAware, InitializingBea
     /**
      * Service used to provide notifications.
      */
-    private static QuartzSchedulingService schedulingService;
+    private static ISchedulingService schedulingService;
 
     /**
      * List of global scopes
@@ -98,7 +97,7 @@ public void setApplicationContext(ApplicationContext applicationContext) {
      * Initialization section.
      */
     public void afterPropertiesSet() throws Exception {
-        Server.schedulingService = (QuartzSchedulingService) applicationContext.getBean("schedulingService");
+        Server.schedulingService = (ISchedulingService) applicationContext.getBean(ISchedulingService.BEAN_NAME);
     }
 
     /**

src/main/java/org/red5/server/api/Red5.java

@@ -66,12 +66,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 1.0.10";
+    public static final String VERSION = "Red5 Server 1.1.0";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/1,0,10,0";
+    public static final String FMS_VERSION = "RED5/1,1,0,0";
 
     /**
      * Server capabilities

src/main/java/org/red5/server/api/scheduling/ISchedulingService.java

@@ -34,6 +34,16 @@ public interface ISchedulingService extends IScopeService {
 
     public static String BEAN_NAME = "schedulingService";
 
+    /**
+     * Scheduling service constant
+     */
+    public static final String SCHEDULING_SERVICE = "scheduling_service";
+
+    /**
+     * Scheduled job constant
+     */
+    public static final String SCHEDULED_JOB = "scheduled_job";
+
     /**
      * Schedule a job for periodic execution.
      * 
@@ -68,7 +78,7 @@ public interface ISchedulingService extends IScopeService {
     public String addScheduledOnceJob(Date date, IScheduledJob job);
 
     /**
-     * Schedule a job for periodic execution which will start after the specifed delay.
+     * Schedule a job for periodic execution which will start after the specified delay.
      * 
      * @param interval
      *            time in milliseconds between two notifications of the job

…beans/QuartzSchedulingServiceMXBean.java …/mxbeans/JDKSchedulingServiceMXBean.javasrc/main/java/org/red5/server/jmx/mxbeans/QuartzSchedulingServiceMXBean.java renamed to src/main/java/org/red5/server/jmx/mxbeans/JDKSchedulingServiceMXBean.java src/main/java/org/red5/server/jmx/mxbeans/QuartzSchedulingServiceMXBean.java renamed to src/main/java/org/red5/server/jmx/mxbeans/JDKSchedulingServiceMXBean.java

@@ -23,13 +23,13 @@
 import javax.management.MXBean;
 
 /**
- * Scheduling service that uses Quartz as backend.
+ * Scheduling service that uses JDK as backend.
  *
  * @author The Red5 Project
  * @author Paul Gregoire (mondain@gmail.com)
  */
 @MXBean
-public interface QuartzSchedulingServiceMXBean {
+public interface JDKSchedulingServiceMXBean {
 
     /**
      * Getter for job name.