Author: markt
Date: Wed Feb 1 11:03:14 2012
New Revision: 1239060
URL: http://svn.apache.org/viewvc?rev=1239060&view=rev
Log:
Prep to remove a circular dependency
Modified:
tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java?rev=1239060&r1=1239059&r2=1239060&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java Wed Feb 1
11:03:14 2012
@@ -26,7 +26,8 @@ import org.apache.catalina.core.Standard
* there is demand it can be extended to support alternative factories and/or
* alternative defaults.
*
- * TODO: Create the other standard components via this factory
+ * @deprecated There was no demand for this capability and it will be removed
in
+ * Tomact 8.0.x
*/
public class CatalinaFactory {
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1239060&r1=1239059&r2=1239060&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Feb 1
11:03:14 2012
@@ -40,7 +40,6 @@ import javax.management.ObjectName;
import javax.naming.directory.DirContext;
import org.apache.catalina.AccessLog;
-import org.apache.catalina.CatalinaFactory;
import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerEvent;
@@ -228,8 +227,7 @@ public abstract class ContainerBase exte
/**
* The Pipeline object with which this Container is associated.
*/
- protected Pipeline pipeline =
- CatalinaFactory.getFactory().createPipeline(this);
+ protected Pipeline pipeline = new StandardPipeline(this);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
