cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp WarpHost.java
pier01/07/19 17:01:12
Modified:catalina/src/share/org/apache/catalina/connector/warp
WarpHost.java
Log:
New WARP implementation from Jakarta-Tomcat-Connectors
Revision ChangesPath
1.8 +13 -115
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpHost.java
Index: WarpHost.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpHost.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WarpHost.java 2001/01/24 23:10:48 1.7
+++ WarpHost.java 2001/07/20 00:01:12 1.8
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999, 2000 The Apache Software Foundation. *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. *
* All rights reserved.*
* *
* = *
@@ -56,127 +56,25 @@
* = */
package org.apache.catalina.connector.warp;
+import java.io.IOException;
import javax.servlet.ServletException;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.Context;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import java.io.IOException;
-import java.net.URL;
-import org.apache.catalina.Container;
-import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.startup.HostConfig;
-import org.apache.catalina.LifecycleException;
+import org.apache.catalina.core.StandardHost;
-/**
- *
- *
- * @author a href=mailto:[EMAIL PROTECTED];Pier Fumagalli/a
- * @author Copyright copy; 1999, 2000 a href=http://www.apache.org;The
- * Apache Software Foundation.
- * @version CVS $Id: WarpHost.java,v 1.7 2001/01/24 23:10:48 pier Exp $
- */
public class WarpHost extends StandardHost {
-
-// -- CONSTANTS
-
-/** Our debug flag status (Used to compile out debugging information). */
-private static final boolean DEBUG=WarpDebug.DEBUG;
-/** The class used for contexts. */
-private static String cc=org.apache.catalina.connector.warp.WarpContext;
-
-// LOCAL VARIABLES
-
-/** The Warp Host ID of this Host. */
-private int id=-1;
-/** The ID to use for the next dynamically configured application. */
-private int applid=0;
-
-/**
- * Create a new instance of a WarpHost.
- */
-public WarpHost() {
-super();
-HostConfig conf=new HostConfig();
-conf.setContextClass(cc);
-this.setContextClass(cc);
-this.addLifecycleListener(conf);
-this.setDebug(9);
-}
-
-// - PUBLIC METHODS
-
-public void invoke(Request req, Response res)
-throws ServletException, IOException {
-if (DEBUG) this.debug(Invoked);
-super.invoke(req,res);
-}
-
public Container map(Request request, boolean update) {
-if (DEBUG) this.debug(Trying to map request to context);
-if (request instanceof WarpRequest) {
-WarpRequest r=(WarpRequest)request;
-
- Container children[]=this.findChildren();
- for (int x=0; xchildren.length; x++) {
- if (children[x] instanceof WarpContext) {
- WarpContext c=(WarpContext)children[x];
- if (r.getRequestedApplicationID()==c.getApplicationID()) {
- ((WarpRequest)request).setContextPath(c.getPath());
- return(children[x]);
- }
-}
-}
-}
-if (DEBUG) this.debug(Trying to map request to context (std));
-return(super.map(request,update));
-}
-
-/**
- * Add a new context to this host.
- */
-public void addChild(Container container) {
-if (container instanceof WarpContext) {
-WarpContext cont=(WarpContext)container;
-cont.setApplicationID(this.applid++);
-if (DEBUG) this.debug(Adding context for path \+cont.getName()+
- \ with ID=+cont.getApplicationID());
-
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp WarpHost.java WarpEngine.java WarpConnectionHandler.java
pier00/12/13 17:25:58
Modified:catalina/src/share/org/apache/catalina/connector/warp
WarpHost.java WarpEngine.java
WarpConnectionHandler.java
Log:
Start WarpHost container if WarpEngine has already been started.
Revision ChangesPath
1.4 +8 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpHost.java
Index: WarpHost.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpHost.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WarpHost.java 2000/12/08 15:33:42 1.3
+++ WarpHost.java 2000/12/14 01:25:57 1.4
@@ -73,7 +73,7 @@
* @author a href="mailto:[EMAIL PROTECTED]"Pier Fumagalli/a
* @author Copyright copy; 1999, 2000 a href="http://www.apache.org"The
* Apache Software Foundation.
- * @version CVS $Id: WarpHost.java,v 1.3 2000/12/08 15:33:42 pier Exp $
+ * @version CVS $Id: WarpHost.java,v 1.4 2000/12/14 01:25:57 pier Exp $
*/
public class WarpHost extends StandardHost {
@@ -162,6 +162,13 @@
protected void setHostID(int id) {
if (DEBUG) this.debug("Setting HostID for "+super.getName()+" to "+id);
this.id=id;
+}
+
+/**
+ * Check if the start() method has already been called.
+ */
+public boolean isStarted() {
+return(super.started);
}
// -- DEBUGGING METHODS
1.7 +29 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpEngine.java
Index: WarpEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpEngine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WarpEngine.java 2000/12/08 15:33:43 1.6
+++ WarpEngine.java 2000/12/14 01:25:57 1.7
@@ -75,7 +75,7 @@
* @author a href="mailto:[EMAIL PROTECTED]"Pier Fumagalli/a
* @author Copyright copy; 1999, 2000 a href="http://www.apache.org"The
* Apache Software Foundation.
- * @version CVS $Id: WarpEngine.java,v 1.6 2000/12/08 15:33:43 pier Exp $
+ * @version CVS $Id: WarpEngine.java,v 1.7 2000/12/14 01:25:57 pier Exp $
*/
public class WarpEngine extends StandardEngine {
@@ -164,6 +164,17 @@
host.setHostID(this.hostid++);
host.setAppBase(this.appbase);
this.addChild(host);
+try {
+if (DEBUG) this.debug("Manually starting host");
+if (super.started) {
+if (!host.isStarted()) {
+host.start();
+}
+}
+} catch (LifecycleException e) {
+this.log(e);
+return(null);
+}
}
return(host);
}
@@ -215,8 +226,24 @@
String old=this.appbase;
this.appbase=appbase;
}
+
+// -- LOGGING AND DEBUGGING METHODS
+
+/**
+ * Dump a log message.
+ */
+public void log(String msg) {
+// FIXME: Log thru catalina
+WarpDebug.debug(this,msg);
+}
-// -- DEBUGGING METHODS
+/**
+ * Dump information for an Exception.
+ */
+public void log(Exception exc) {
+// FIXME: Log thru catalina
+WarpDebug.debug(this,exc);
+}
/**
* Dump a debug message.
1.9 +9 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnectionHandler.java
Index: WarpConnectionHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnectionHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WarpConnectionHandler.java2000/12/08 15:33:44 1.8
+++ WarpConnectionHandler.java2000/12/14 01:25:57 1.9
@@ -64,7 +64,7 @@
* @author a href="mailto:[EMAIL PROTECTED]"Pier Fumagalli/a
* @author Copyright copy; 1999, 2000 a href="http://www.apache.org"The
* Apache Software Foundation.
- * @version CVS $Id: WarpConnectionHandler.java,v 1.8 2000/12/08 15:33:44 pier Exp $
+ * @version CVS $Id: WarpConnectionHandler.java,v 1.9 2000/12/14 01:25:57 pier Exp $
*/
public class WarpConnectionHandler extends WarpHandler {
/** The WarpReader associated with this WarpConnectionHandler. */
@@ -102,7 +102,14 @@
