craigmcc 00/12/18 19:23:12
Modified: catalina/src/share/org/apache/catalina Engine.java
catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Enhance the example main() method in the Embedded class so that it will
actually run. The "/examples" webapp does not work without a Realm defined.
Add get/setDefaultHost() to the Engine interface, not just the StandardEngine
implementation class.
Revision Changes Path
1.2 +21 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Engine.java 2000/08/11 05:24:06 1.1
+++ Engine.java 2000/12/19 03:23:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.1
2000/08/11 05:24:06 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 05:24:06 $
+ * $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 $
*
* ====================================================================
*
@@ -88,10 +88,27 @@
* should throw <code>IllegalArgumentException</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 05:24:06 $
+ * @version $Revision: 1.2 $ $Date: 2000/12/19 03:23:11 $
*/
public interface Engine extends Container {
+
+
+ // ------------------------------------------------------------- Properties
+
+
+ /**
+ * Return the default hostname for this Engine.
+ */
+ public String getDefaultHost();
+
+
+ /**
+ * Set the default hostname for this Engine.
+ *
+ * @param defaultHost The new default host
+ */
+ public void setDefaultHost(String defaultHost);
// --------------------------------------------------------- Public Methods
1.7 +8 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Embedded.java 2000/12/14 22:32:19 1.6
+++ Embedded.java 2000/12/19 03:23:12 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.6 2000/12/14 22:32:19 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/12/14 22:32:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.7 2000/12/19 03:23:12 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/12/19 03:23:12 $
*
* ====================================================================
*
@@ -90,6 +90,7 @@
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemOutLogger;
import org.apache.catalina.net.SSLServerSocketFactory;
+import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -147,7 +148,7 @@
* </pre>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/12/14 22:32:19 $
+ * @version $Revision: 1.7 $ $Date: 2000/12/19 03:23:12 $
*/
public class Embedded implements Lifecycle {
@@ -999,7 +1000,8 @@
*/
public static void main(String args[]) {
- Embedded embedded = new Embedded();
+ Embedded embedded = new Embedded(new SystemOutLogger(),
+ new MemoryRealm());
embedded.setDebug(5);
embedded.setLogger(new SystemOutLogger());
String home = System.getProperty("catalina.home");
@@ -1017,6 +1019,7 @@
// that simulates a portion of the one configured in server.xml
// by default
Engine engine = embedded.createEngine();
+ engine.setDefaultHost("localhost");
Host host = embedded.createHost("localhost", home + "/webapps");
engine.addChild(host);
