Remove another reference to the ServerFactory singleton.

Remove unused engine attribute.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@778194 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index 3c4a642..e3b8072 100644 (file)
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -263,7 +263,7 @@ public class Connector
      /**
       * Mapper listener.
       */
-     protected MapperListener mapperListener = new MapperListener(mapper);
+     protected MapperListener mapperListener = new MapperListener(mapper, this);
 
 
      /**

diff --git a/java/org/apache/catalina/connector/MapperListener.java b/java/org/apache/catalina/connector/MapperListener.java
index 45e0769..089e29f 100644 (file)
--- a/java/org/apache/catalina/connector/MapperListener.java
+++ b/java/org/apache/catalina/connector/MapperListener.java
@@ -29,7 +29,6 @@ import javax.management.ObjectName;
 import org.apache.catalina.ContainerEvent;
 import org.apache.catalina.ContainerListener;
 import org.apache.catalina.Host;
-import org.apache.catalina.ServerFactory;
 import org.apache.catalina.core.StandardContext;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -62,6 +61,11 @@ public class MapperListener
      * Associated mapper.
      */
     protected Mapper mapper = null;
+    
+    /**
+     * Associated connector
+     */
+    protected Connector connector = null;
 
     /**
      * MBean server.
@@ -77,7 +81,6 @@ public class MapperListener
 
     // It should be null - and fail if not set
     private String domain="*";
-    private String engine="*";
 
     // ----------------------------------------------------------- Constructors
 
@@ -85,8 +88,9 @@ public class MapperListener
     /**
      * Create mapper listener.
      */
-    public MapperListener(Mapper mapper) {
+    public MapperListener(Mapper mapper, Connector connector) {
         this.mapper = mapper;
+        this.connector = connector;
     }
 
 
@@ -100,14 +104,6 @@ public class MapperListener
         this.domain = domain;
     }
 
-    public String getEngine() {
-        return engine;
-    }
-
-    public void setEngine(String engine) {
-        this.engine = engine;
-    }
-
     /**
      * Initialize associated mapper.
      */
@@ -329,9 +325,8 @@ public class MapperListener
         String name=objectName.getKeyProperty("host");
         if( name != null ) {        
 
-            Host host = (Host) ServerFactory.getServer().findService(
-                    domain).getContainer().findChild(name);
-        
+            Host host =
+                (Host) connector.getService().getContainer().findChild(name);
             String[] aliases = host.findAliases();
             mapper.addHost(name, aliases, objectName);
             host.addContainerListener(this);
@@ -349,8 +344,8 @@ public class MapperListener
         throws Exception {
         String name=objectName.getKeyProperty("host");
         if( name != null ) { 
-            Host host = (Host) ServerFactory.getServer().findService(
-                domain).getContainer().findChild(name);
+            Host host =
+                (Host) connector.getService().getContainer().findChild(name);
         
             mapper.removeHost(name);
             if (host != null) {