cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Engine.java
remm02/01/17 04:11:38
Modified:catalina/src/share/org/apache/catalina Tag: tomcat_40_branch
Engine.java
Log:
- Port JVM route addition.
Revision ChangesPath
No revision
No revision
1.6.2.1 +19 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java
Index: Engine.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Engine.java 23 Aug 2001 22:32:10 - 1.6
+++ Engine.java 17 Jan 2002 12:11:38 - 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.6
2001/08/23 22:32:10 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/08/23 22:32:10 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v
1.6.2.1 2002/01/17 12:11:38 remm Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2002/01/17 12:11:38 $
*
*
*
@@ -90,7 +90,7 @@
* should throw codeIllegalArgumentException/code.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/08/23 22:32:10 $
+ * @version $Revision: 1.6.2.1 $ $Date: 2002/01/17 12:11:38 $
*/
public interface Engine extends Container {
@@ -111,6 +111,21 @@
* @param defaultHost The new default host
*/
public void setDefaultHost(String defaultHost);
+
+
+/**
+ * Set the JvmRouteId for this engine.
+ *
+ * @param jvmRouteId the (new) JVM Route ID. Each Engine within a cluster
+ *must have the same JVM Route ID.
+ */
+public void setJvmRoute(String jvmRouteId);
+
+
+/**
+ * Retrieve the JvmRouteId for this engine.
+ */
+public String getJvmRoute();
/**
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Engine.java
remm02/01/14 15:37:41
Modified:catalina/src/share/org/apache/catalina Engine.java
Log:
- Add JVM route support.
- Patch submitted by Tom Drake rtd at pobox.com
Revision ChangesPath
1.8 +19 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java
Index: Engine.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Engine.java 16 Oct 2001 23:14:13 - 1.7
+++ Engine.java 14 Jan 2002 23:37:41 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.7
2001/10/16 23:14:13 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2001/10/16 23:14:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.8
2002/01/14 23:37:41 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/01/14 23:37:41 $
*
*
*
@@ -87,7 +87,7 @@
* should throw codeIllegalArgumentException/code.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/10/16 23:14:13 $
+ * @version $Revision: 1.8 $ $Date: 2002/01/14 23:37:41 $
*/
public interface Engine extends Container {
@@ -108,6 +108,21 @@
* @param defaultHost The new default host
*/
public void setDefaultHost(String defaultHost);
+
+
+/**
+ * Retrieve the JvmRouteId for this engine.
+ */
+public String getJvmRoute();
+
+
+/**
+ * Set the JvmRouteId for this engine.
+ *
+ * @param jvmRouteId the (new) JVM Route ID. Each Engine within a cluster
+ *must have a unique JVM Route ID.
+ */
+public void setJvmRoute(String jvmRouteId);
/**
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Engine.java
glenn 01/02/25 19:49:45
Modified:catalina/src/share/org/apache/catalina Engine.java
Log:
Implement DefaultContext in server.xml config
Revision ChangesPath
1.3 +23 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java
Index: Engine.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Engine.java 2000/12/19 03:23:11 1.2
+++ Engine.java 2001/02/26 03:49:44 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.2
2000/12/19 03:23:11 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/12/19 03:23:11 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.3
2001/02/26 03:49:44 glenn Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/02/26 03:49:44 $
*
*
*
@@ -64,6 +64,8 @@
package org.apache.catalina;
+import org.apache.catalina.Context;
+import org.apache.catalina.core.DefaultContext;
/**
* An bEngine/b is a Container that represents the entire Catalina servlet
@@ -88,7 +90,7 @@
* should throw codeIllegalArgumentException/code.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/12/19 03:23:11 $
+ * @version $Revision: 1.3 $ $Date: 2001/02/26 03:49:44 $
*/
public interface Engine extends Container {
@@ -111,7 +113,24 @@
public void setDefaultHost(String defaultHost);
+/**
+ * Set the DefaultContext
+ * for new web applications.
+ *
+ * @param defaultContext The new DefaultContext
+ */
+public void addDefaultContext(DefaultContext defaultContext);
+
+
// - Public Methods
+
+
+/**
+ * Import the DefaultContext config into a web application context.
+ *
+ * @param context web application context to import default context
+ */
+public void importDefaultContext(Context context);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
