You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/05/24 19:11:25 UTC
svn commit: r778194 - in /tomcat/trunk/java/org/apache/catalina/connector:
Connector.java MapperListener.java
Author: markt
Date: Sun May 24 17:11:25 2009
New Revision: 778194
URL: http://svn.apache.org/viewvc?rev=778194&view=rev
Log:
Remove another reference to the ServerFactory singleton.
Remove unused engine attribute.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=778194&r1=778193&r2=778194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun May 24 17:11:25 2009
@@ -263,7 +263,7 @@
/**
* Mapper listener.
*/
- protected MapperListener mapperListener = new MapperListener(mapper);
+ protected MapperListener mapperListener = new MapperListener(mapper, this);
/**
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=778194&r1=778193&r2=778194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Sun May 24 17:11:25 2009
@@ -29,7 +29,6 @@
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 @@
* Associated mapper.
*/
protected Mapper mapper = null;
+
+ /**
+ * Associated connector
+ */
+ protected Connector connector = null;
/**
* MBean server.
@@ -77,7 +81,6 @@
// It should be null - and fail if not set
private String domain="*";
- private String engine="*";
// ----------------------------------------------------------- Constructors
@@ -85,8 +88,9 @@
/**
* Create mapper listener.
*/
- public MapperListener(Mapper mapper) {
+ public MapperListener(Mapper mapper, Connector connector) {
this.mapper = mapper;
+ this.connector = connector;
}
@@ -100,14 +104,6 @@
this.domain = domain;
}
- public String getEngine() {
- return engine;
- }
-
- public void setEngine(String engine) {
- this.engine = engine;
- }
-
/**
* Initialize associated mapper.
*/
@@ -329,9 +325,8 @@
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 @@
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org