Merge pull request #6993 from ant-media/remove-unused-setting

Remove clusterNotifier in xml and code for TomcatLoader

Author: mekya

src/main/java/org/red5/server/tomcat/TomcatLoader.java

@@ -34,14 +34,10 @@
 import javax.management.JMX;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import jakarta.security.auth.message.config.AuthConfigFactory;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.apache.catalina.Cluster;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
@@ -68,7 +64,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.jmx.export.annotation.ManagedResource;
@@ -80,8 +75,10 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import io.antmedia.cluster.IClusterNotifier;
 import io.antmedia.component.AppConfig;
+import jakarta.security.auth.message.config.AuthConfigFactory;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 /**
  * Red5 loader for Tomcat.
@@ -170,12 +167,6 @@ public boolean accept(File dir, String name) {
 	 */
 	protected List<TomcatConnector> connectors;
 
-
-	/**
-	 * Cluster
-	 */
-	private IClusterNotifier clusterNotifier;
-
 	/**
 	 * Valves
 	 */
@@ -915,18 +906,4 @@ public List<TomcatConnector> getConnectors() {
 		return connectors;
 	}
 
-	/**
-	 * @return the clusterNotifier
-	 */
-	public IClusterNotifier getClusterNotifier() {
-		return clusterNotifier;
-	}
-
-	/**
-	 * @param clusterNotifier the clusterNotifier to set
-	 */
-	public void setClusterNotifier(IClusterNotifier clusterNotifier) {
-		this.clusterNotifier = clusterNotifier;
-	}
-
 }

src/main/server/conf/jee-container.xml

@@ -40,10 +40,6 @@
 	<!-- Tomcat without SSL enabled -->
 	<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader"
 		depends-on="context.loader,warDeployer" lazy-init="true">
-		<!--  make sure tomcat.cluster is initialized before TomcatLoader in cluster mode otherwise there maybe initialization exceptions -->
-		<!-- cluster start
-		<property name="clusterNotifier" ref="tomcat.cluster" />
-		cluster end -->
 		<property name="webappFolder" value="${red5.root}/webapps" />
 
 		<property name="connectors">