remm 01/09/24 01:17:10
Modified: src/wrappers/catalina SlideHost.java server.xml
Added: src/wrappers/catalina/root index.jsp style.css
src/wrappers/catalina/root/WEB-INF struts-config.xml web.xml
src/wrappers/catalina/root/WEB-INF/classes
slide-root.properties
Log:
- Fix some nasty conflicts between the hosts names.
- Add welcome web application, based on the new Slide tag library.
Revision Changes Path
1.5 +17 -5 jakarta-slide/src/wrappers/catalina/SlideHost.java
Index: SlideHost.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideHost.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SlideHost.java 2001/09/08 20:03:12 1.4
+++ SlideHost.java 2001/09/24 08:17:09 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideHost.java,v 1.4
2001/09/08 20:03:12 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2001/09/08 20:03:12 $
+ * $Header: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideHost.java,v 1.5
2001/09/24 08:17:09 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/09/24 08:17:09 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
* Slide implementation of Host.
*
* @author Remy Maucherat
- * @version $Revision: 1.4 $ $Date: 2001/09/08 20:03:12 $
+ * @version $Revision: 1.5 $ $Date: 2001/09/24 08:17:09 $
*/
public class SlideHost
@@ -169,13 +169,25 @@
public synchronized void start() throws LifecycleException {
String defaultNamespace = domain.getDefaultNamespace();
+ boolean installDefault = true;
+ try {
+ File rootWar = new File("webapps/ROOT.war");
+ if (rootWar.exists()) {
+ install("", rootWar.toURL());
+ installDefault = false;
+ }
+ } catch (IOException e) {
+ // Can't happen
+ e.printStackTrace();
+ }
+
Enumeration namespaceNames = domain.enumerateNamespaces();
while (namespaceNames.hasMoreElements()) {
String name = (String) namespaceNames.nextElement();
try {
install("/" + name, new URL("http", "slide", name));
- if (name.equals(defaultNamespace)) {
+ if (installDefault && (name.equals(defaultNamespace))) {
// Also install the deafult namespace as the root context
install("", new URL("http", "slide", name));
}
1.5 +4 -4 jakarta-slide/src/wrappers/catalina/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/server.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- server.xml 2001/09/24 01:40:34 1.4
+++ server.xml 2001/09/24 08:17:09 1.5
@@ -76,7 +76,7 @@
-->
<!-- Define the top level container in our container hierarchy -->
- <Engine name="WebDAV" defaultHost="localhost" debug="0">
+ <Engine name="WebDAV" defaultHost="localhost8081" debug="0">
<!-- Global logger unless overridden at lower levels -->
<Logger className="org.apache.catalina.logger.FileLogger"
@@ -84,7 +84,7 @@
timestamp="true"/>
<!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="blank" unpackWARs="false"
+ <Host name="localhost8081" debug="0" appBase="blank" unpackWARs="false"
className="wrappers.catalina.WebdavHost">
<Valve className="org.apache.catalina.valves.AccessLogValve"
@@ -127,7 +127,7 @@
-->
<!-- Define the top level container in our container hierarchy -->
- <Engine name="Admin" defaultHost="localhost" debug="0">
+ <Engine name="Admin" defaultHost="localhost8082" debug="0">
<!-- Global logger unless overridden at lower levels -->
<Logger className="org.apache.catalina.logger.FileLogger"
@@ -135,7 +135,7 @@
timestamp="true"/>
<!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="blank" unpackWARs="false"
+ <Host name="localhost8082" debug="0" appBase="blank" unpackWARs="false"
className="wrappers.catalina.AdminHost">
<Valve className="org.apache.catalina.valves.AccessLogValve"
1.1 jakarta-slide/src/wrappers/catalina/root/index.jsp
Index: index.jsp
===================================================================
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/slide-struts.tld" prefix="slide" %>
<html:html locale='true'>
<head>
<title><bean:message key="app.title"/></title>
<link rel='stylesheet' type='text/css' href='<html:rewrite
page="/style.css"/>'>
<html:base/>
</head>
<body bgcolor='#ffffff' marginwidth='0' marginheight='0'>
<table border='0' cellpadding='10' cellspacing='0' width='100%' height='100%'>
<tr>
<td class='panel' align='right' colspan='2' width='100%'>
<h1 class='headline1'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
</td>
</tr>
<tr>
<td class='panel' align='center' bgcolor='#023264' height='100%'>
<hr>
<table border='0' cellpadding='0' cellspacing='0' class='panelMenu'>
<tr>
<td align='left' valign='middle' class='panelMenuItem'>
<html:link page='/index.jsp'><bean:message
key="home.title"/></html:link>
</td>
</tr>
<tr>
<td align='left' valign='middle' class='panelMenuItem'>
<html:link page='/slide-doc/'><bean:message
key="doc.title"/></html:link>
</td>
</tr>
<tr>
<td align='left' valign='middle' class='panelMenuItem'>
<html:link page='/manager/'><bean:message
key="manage.title"/></html:link>
</td>
</tr>
</table>
<hr>
<br>
<br>
</td>
<td class='content' align='left' valign='top' width='100%' height='100%'>
<br>
<span class='contentText'>
<bean:message key="app.welcome"/>
</span>
<hr>
<bean:message key="manager-conf.text"/>
<br>
<bean:message key="slide-conf.text"/>
<slide:domain id="domain">
<logic:iterate id="name" name="domain" property="namespaceNames">
<hr>
<bean:message key="namespace.label"/><bean:write name="name"
filter="true"/>
<a href='<bean:write name="name" filter="true"/>'><bean:message
key="browse.label"/></a>
<hr>
</logic:iterate>
</slide:domain>
</td>
</tr>
</table>
</body>
</html:html>
1.1 jakarta-slide/src/wrappers/catalina/root/style.css
Index: style.css
===================================================================
body {
background-color: #ffffff;
color: #000000;
font-family: sans-serif;
font-size: 10pt;
margin: 0px;
padding: 0px;
}
.headline1 {
font-family: sans-serif;
margin: 0cm;
}
.headline2 {
font-family: sans-serif;
margin: 0cm;
}
.headline3 {
font-family: sans-serif;
margin: 0cm;
}
.panel {
background-color: #023264;
border-style: none;
border-width: 0px;
padding: 0.25cm;
vertical-align: top;
}
.panelMenu {
list-style: none;
margin: 0cm;
margin-top: 0.25cm;
padding: 0cm;
}
.panelMenuItem {
color: #cccccc;
font-family: sans-serif;
font-size: 9pt;
margin: 5px;
padding: 1px;
text-decoration: none;
}
.panelMenuItem a {
color: #cccccc;
font-family: sans-serif;
font-size: 9pt;
margin: 5px;
padding: 1px;
text-decoration: none;
}
.panelMenuItem a:hover {
background-color: #cccccc;
color: #023264;
font-family: sans-serif;
font-size: 9pt;
text-decoration: none;
}
.panelMenuItemActive {
background-color: #5787b9;
color: #023264;
font-family: sans-serif;
font-size: 9pt;
text-decoration: none;
}
.toolbar {
background-color: #ffffff;
border-style: none;
border-width: 0px;
color: #000000;
font-family: sans-serif;
font-size: 9pt;
padding: 0.15cm;
vertical-align: bottom;
}
.content {
background-color: #ffffff;
color: #000000;
font-size: 9pt;
padding: 0.25cm;
vertical-align: top;
}
.contentHeadline {
color: #023264;
font-family: sans-serif;
font-size: 12pt;
font-style: normal;
font-weight: bold;
text-align: left;
}
.contentText {
color: #000000;
font-family: sans-serif;
font-size: 9pt;
font-style: normal;
font-weight: normal;
text-align: justify;
}
.list {
background-color: #ffffee;
border-color: #dddddd;
border-width: 0px;
font-family: sans-serif;
font-size: 9pt;
padding: 0cm;
}
.listAction {
font-family: sans-serif;
font-size: 10pt;
margin: 5px;
padding: 5px;
}
.listAction:hover {
font-family: sans-serif;
font-size: 10pt;
margin: 5px;
padding: 5px;
}
.listHeader {
background-color: #dddddd;
border-color: #dddddd;
border-width: 1px;
border-style: outset;
color: #555555;
font-family: sans-serif;
font-size: 8pt;
font-weight: normal;
font-style: italic;
padding: 0.1cm;
}
.listCell {
font-family: sans-serif;
font-size: 9pt;
padding: 5px;
}
.dialog {
background-color: #dddddd;
border-color: #dddddd;
border-width: 1px;
border-style: outset;
font-family: sans-serif;
font-size: 9pt;
padding: 0.25cm;
}
.dialogLabel {
color: #555576;
font-family: sans-serif;
font-size: 9pt;
}
.error {
color: red;
font-family: sans-serif;
font-size: 9pt;
}
1.1
jakarta-slide/src/wrappers/catalina/root/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd";>
<!-- Struts configuration for the Slide Root Webapp -->
<struts-config>
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
</form-beans>
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
</action-mappings>
</struts-config>
1.1 jakarta-slide/src/wrappers/catalina/root/WEB-INF/web.xml
Index: web.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd";>
<web-app>
<!-- Context Initialization Parameters
Use these parameters to specify the path to the domain configuration
file and the specific namespace to use, if necessary.
If you don't specify the domain parameter, it is assumed that the
domain will already be initialized when this context is started, or
that you've specified the path to the domain configuration file in
slide.properties.
If you don't specify the namespace parameter, the default namespace will
be used, if available. -->
<!-- context-param>
<param-name>domain</param-name>
<param-value>/Domain.xml</param-value>
</context-param -->
<!-- context-param>
<param-name>namespace</param-name>
<param-value>slide</param-value>
</context-param -->
<!-- Action Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
<init-param>
<param-name>application</param-name>
<param-value>slide-root</param-value>
</init-param>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
<init-param>
<param-name>nocache</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>detail</param-name>
<param-value>2</param-value>
</init-param>
<init-param>
<param-name>validate</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
<!-- Action Servlet Mapping -->
<servlet-mapping>
<servlet-name>action</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
<!-- Establish the default list of welcome files -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<!-- Slide Tag Library Descriptor -->
<taglib>
<taglib-uri>/WEB-INF/slide-struts.tld</taglib-uri>
<taglib-location>/WEB-INF/slide-struts.tld</taglib-location>
</taglib>
<!-- Struts Tag Library Descriptors -->
<taglib>
<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
<taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
<taglib-location>/WEB-INF/struts-html.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
<taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
</taglib>
</web-app>
1.1
jakarta-slide/src/wrappers/catalina/root/WEB-INF/classes/slide-root.properties
Index: slide-root.properties
===================================================================
# general
app.title=Slide Main
app.welcome=Welcome to Slide 1.0.15.
home.title=Home
namespace.label=Namespace:
browse.label=View
edit.label=Edit
administer.label=Admin
# messages
manager-conf.text=To access the Tomcat manager web application, you must edit the
conf/tomcat-users.xml file, and define a user with role manager.
slide-conf.text=To edit or administer a Slide namespace, you must properly configure
one user with root privileges. For example, it can be done for the default namespace
by editing the conf/slide/slide.data file and uncommenting the indicated element.
# doc
doc.title=Doc
# manage
manage.title=Manage
