From f4c3ca5541768864a42e9b92e674f45e399a66f9 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 24 May 2009 18:49:19 +0000
Subject: [PATCH] Remove ServerFactory class

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@778214 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/ServerFactory.java | 77 -----------------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 java/org/apache/catalina/ServerFactory.java

diff --git a/java/org/apache/catalina/ServerFactory.java b/java/org/apache/catalina/ServerFactory.java
deleted file mode 100644
index be1e398d2..000000000
--- a/java/org/apache/catalina/ServerFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.catalina;
-
-import org.apache.catalina.core.StandardServer;
-
-
-/**
- * <p><strong>ServerFactory</strong> allows the registration of the
- * (singleton) <code>Server</code> instance for this JVM, so that it
- * can be accessed independently of any existing reference to the
- * component hierarchy.  This is important for administration tools
- * that are built around the internal component implementation classes.
- *
- * @author Craig R. McClanahan
- * @version $Revision$ $Date$
- */
-
-public class ServerFactory {
-
-
-    // ------------------------------------------------------- Static Variables
-
-
-    /**
-     * The singleton <code>Server</code> instance for this JVM.
-     */
-    private static Server server = null;
-
-
-    // --------------------------------------------------------- Public Methods
-
-
-    /**
-     * Return the singleton <code>Server</code> instance for this JVM.
-     */
-    public static Server getServer() {
-        if( server==null )
-            server=new StandardServer();
-        return (server);
-
-    }
-
-
-    /**
-     * Set the singleton <code>Server</code> instance for this JVM.  This
-     * method must <strong>only</strong> be called from a constructor of
-     * the (singleton) <code>Server</code> instance that is created for
-     * this execution of Catalina.
-     *
-     * @param theServer The new singleton instance
-     */
-    public static void setServer(Server theServer) {
-
-        if (server == null)
-            server = theServer;
-
-    }
-
-
-}
-- 
2.11.0