You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/01/09 00:04:47 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/server HttpServer.java
costin 00/01/08 15:04:47
Modified: src/share/org/apache/tomcat/core ContextManager.java
ServletContextFacade.java
src/share/org/apache/tomcat/server HttpServer.java
Removed: src/share/org/apache/tomcat/core Server.java
Log:
Removed the Server interface ( it doesn't serve to almost nothing,
all the functionality is in ContextManager).
A new interface will be created after we'll get a cleaner picture of what
is needed ( Tomcat.Next )
Revision Changes Path
1.7 +4 -5 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextManager.java 2000/01/08 22:55:45 1.6
+++ ContextManager.java 2000/01/08 23:04:46 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v 1.6 2000/01/08 22:55:45 costin Exp $
- * $Revision: 1.6 $
- * $Date: 2000/01/08 22:55:45 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v 1.7 2000/01/08 23:04:46 costin Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/01/08 23:04:46 $
*
* ====================================================================
*
@@ -85,8 +85,7 @@
* @author James Todd [gonzo@eng.sun.com]
* @author Harish Prabandham
*/
-
-public class ContextManager implements Server {
+public class ContextManager {
/**
* The string constants for this ContextManager.
1.9 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/core/ServletContextFacade.java
Index: ServletContextFacade.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletContextFacade.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServletContextFacade.java 2000/01/08 15:34:28 1.8
+++ ServletContextFacade.java 2000/01/08 23:04:46 1.9
@@ -83,11 +83,11 @@
private StringManager sm =
StringManager.getManager(Constants.Package);
- private Server server;
+ private ContextManager contextM;
private Context context;
- ServletContextFacade(Server server, Context context) {
- this.server = server;
+ ServletContextFacade(ContextManager server, Context context) {
+ this.contextM = server;
this.context = context;
}
@@ -132,7 +132,7 @@
throw new IllegalArgumentException(msg);
}
- return server.getContextByPath(path).getFacade();
+ return contextM.getContextByPath(path).getFacade();
}
public int getMajorVersion() {
@@ -327,7 +327,7 @@
}
public String getServerInfo() {
- return server.getServerInfo();
+ return contextM.getServerInfo();
}
public void log(String msg) {
1.6 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/server/HttpServer.java
Index: HttpServer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/HttpServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpServer.java 1999/11/02 00:46:20 1.5
+++ HttpServer.java 2000/01/08 23:04:47 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/HttpServer.java,v 1.5 1999/11/02 00:46:20 costin Exp $
- * $Revision: 1.5 $
- * $Date: 1999/11/02 00:46:20 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/HttpServer.java,v 1.6 2000/01/08 23:04:47 costin Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/01/08 23:04:47 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
// WARNING: Some of the APIs in this class are used by J2EE.
// Please talk to harishp@eng.sun.com before making any changes.
//
-public class HttpServer implements Server {
+public class HttpServer {
// XXX move to Constants
public static final String VHOST_PORT="vhost_port";
public static final String VHOST_NAME="vhost_name";