You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/06/27 15:53:27 UTC

svn commit: r417493 - in /incubator/lokahi/site/trunk: about.html design.html glossary.html history.html howitworks.html index.html nav.html project.html styles/styles.css

Author: toback
Date: Tue Jun 27 08:53:26 2006
New Revision: 417493

URL: http://svn.apache.org/viewvc?rev=417493&view=rev
Log:
Updated site w/new information.

Added:
    incubator/lokahi/site/trunk/about.html
    incubator/lokahi/site/trunk/glossary.html
    incubator/lokahi/site/trunk/history.html
    incubator/lokahi/site/trunk/howitworks.html
Modified:
    incubator/lokahi/site/trunk/design.html
    incubator/lokahi/site/trunk/index.html
    incubator/lokahi/site/trunk/nav.html
    incubator/lokahi/site/trunk/project.html
    incubator/lokahi/site/trunk/styles/styles.css

Added: incubator/lokahi/site/trunk/about.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/about.html?rev=417493&view=auto
==============================================================================
--- incubator/lokahi/site/trunk/about.html (added)
+++ incubator/lokahi/site/trunk/about.html Tue Jun 27 08:53:26 2006
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi | About Lokahi</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
+
+	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+	<td align="left" valign="top"><a href="http://incubator.apache.org/lokahi/" id="bannerLeft"><img src="images/lokahi_logo_144_80.png" alt="Lokahi" border="0" width="144" height="80" /></a></td>
+	<td align="right" valign="top"><a href="http://incubator.apache.org/"><img src="images/apache-incubator-logo.png" alt="Apache Incubator" border="0" width="229" height="57" /></a></td>
+	</tr>
+	</table>
+
+	<div id="container">
+
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
+	<li class="nav"><a href="project.html">Project Information</a></li>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>About Lokahi</h1>		<h2>What is Lokahi?</h2>
+		<p>Lokahi is a web-based framework for the management of application servers. It is comprised of a core set of functionality and a set of modules which can be added or removed as needed. Each module enables management of an application server or the connection between two application servers. Certain modules, including modules for Apache, Tomcat, and mod_jk, are provided as part of the initial release, and documentation and an API will be provided for developers to create their own. This modularity allows Lokahi to be extensible to accommodate growing and changing infrastructures.</p>
+		<p>In many ways, Lokahi can be thought of, in ITIL terms, to be a Configuration Management Database.</p>
+		<p>Lokahi is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+		<h2>Why Lokahi?</h2>
+		<p>As enterprise moves more and more business functions to the web, the infrastructure supporting the resultant applications grows larger and more complex. Today's open source web applications, such as Apache and Tomcat, are capable and reliable platforms providing robust performance and scalability; however, the management layer of this infrastructure is lacking.</p>
+		<p>Most application server management is performed manually, requiring large commitments of time and staff size. Manual server management also requires an in-depth knowledge of the infrastructure and creates a significant opportunity for human error. In addition, there is very little process in place to manage applications. Application owners often do not have the ability to manage their applications and configurations.</p>
+		<p>These shortcomings in the management of web and application middle tier services demonstratrate that a true enterprise means of management does not exist.</p>
+		<p>Lokahi provides a centralized and more automated way of managing application servers. This lessens the strain on support staff and decreases the window for human error in infrastructure management. Lastly, it decreases the amount of time needed to perform routine operational tasks.</p>
+		<p>Lokahi also allows application owners and developers to manage their own applications. This further reduces workload on support staff, as well as shifts responsibility for applications fully to application owners, including many operational tasks and management of permissions. Making application owners responsible for permissions to edit and manage their applications can aid in regulatory compliance.</p>
+    </div>
+
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Modified: incubator/lokahi/site/trunk/design.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/design.html?rev=417493&r1=417492&r2=417493&view=diff
==============================================================================
--- incubator/lokahi/site/trunk/design.html (original)
+++ incubator/lokahi/site/trunk/design.html Tue Jun 27 08:53:26 2006
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
  <head>
    <title>Apache Lokahi</title>

    <link href="styles/styles.css" rel="stylesheet" type="text/css" />
	<meta name="author" content="The Lokahi Team" />
    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
  </head>
-
  <body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
 
 	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
@@ -10,12 +10,16 @@
 
 	<div id="container">
 
-	<div id="leftnav">
    <ul>
    <li class="nav"><a href="index.html">About Lokahi</a></li>
-	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Status</a></li>
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
 	<li class="nav"><a href="project.html">Project Information</a></li>
-	<li class="nav"><a href="javadocs/">javadocs</a></li>
	</ul>
    </div>
-
    <div id="content">
-		<h1>Design of Lokahi</h1>
		
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>Design of Lokahi</h1>		
 		<p>Lokahi is a web-based system comprised of a core set of functionality and a set of modules which can be added or removed as needed. Each module will enable management of an application server or the connection between two application servers.</p>
 
 		<h2>Primary Components</h2>
@@ -32,25 +36,9 @@
 
 		<h3>Controller</h3>
 		<p>The Controller is the central piece directing interactions among all the components. It is responsible for brokering messages from the console to the appropriate agent.</p>
-
-		<h2>Core Set</h2>
-		<p>The Core Set consists of:</p>
-		<ul>
-		<li>Project and project management information</li>
-		<li>Environments and environment information</li>
-		<li>Instance and instance information</li>
-		<li>Controller</li>
-		<li>Main part of the agents</li>
-		<li>Main part of the GUI, including the Login page</li>
-		</ul>
-
-		<h2>Module</h2>
-		<p>The Modules consist of:</p>
-		<ul>
-		<li>[insert text]</li>
-		</ul>
+		
 
 	</div>
 
-	</div>

    <div id="footer">
      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>
    </div>
-
  </body>
</html>
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Added: incubator/lokahi/site/trunk/glossary.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/glossary.html?rev=417493&view=auto
==============================================================================
--- incubator/lokahi/site/trunk/glossary.html (added)
+++ incubator/lokahi/site/trunk/glossary.html Tue Jun 27 08:53:26 2006
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi | Glossary</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
+
+	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+	<td align="left" valign="top"><a href="http://incubator.apache.org/lokahi/" id="bannerLeft"><img src="images/lokahi_logo_144_80.png" alt="Lokahi" border="0" width="144" height="80" /></a></td>
+	<td align="right" valign="top"><a href="http://incubator.apache.org/"><img src="images/apache-incubator-logo.png" alt="Apache Incubator" border="0" width="229" height="57" /></a></td>
+	</tr>
+	</table>
+
+	<div id="container">
+
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
+	<li class="nav"><a href="project.html">Project Information</a></li>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>Glossary of Terms</h1>
+
+		<dt id="apachepool">Apache Pool</dt>
+		<dd>A grouping of Apache Workers.</dd>
+
+		<dt id="apacheworker">Apache Worker</dt>
+		<dd>A unique combination of one installation of Apache on one server.</dd>		
+		
+		<dt id="hostingpool">Hosting Pool</dt>
+		<dd>The combination of one Apache Pool and one Tomcat Pool.</dd>
+		
+		<dt id="instance">Instance</dt>
+		<dd>An instance is essentially an installation of the controller. However, there is not necessarily a one-to-one relationship between the instance and the controller. The controller is clusterable, meaning that if a controller is installed on three servers in one cluster, those three controllers act as one; therefore, an instance can have more than one controller. Also, a controller can manage any infrastructure it has access to, across instances, so that there can be more than one instance per controller. A good example of this is an infrastructure in which there are intranet, internet, and test lab environments. The test lab and intranet may be on two separate instances, but still managed via one controller. All instances of Lokahi at an organization can connect, read, and write to a single database/schema.
+		<img src="images/lokahi-controllers1.gif" alt="Any instance of Lokahi can control itw own and all other environments." width="455" height="345" border="0">
+		</dd>
+		
+		<dt id="job">Job</dt>
+		<dd>The objects sent back and forth between the agent and controller are jobs. A job is an individual task that the agent performs. Jobs can be pooled, and in that pool there can be a certain order per hardware. Thus, jobs can have predecessors, and if a predecessor fails, the next job won't run.</dd>
+	
+		<dt id="pool">Pool</dt>
+		<dd>A grouping of Workers.</dd>
+	
+		<dt id="tomcatpool">Tomcat Pool</dt>
+		<dd>A grouping of Tomcat Workers.</dd>
+		
+		<dt id="tomcatworker">Tomcat Worker</dt>
+		<dd>A unique combination of one Tomcat JVM on one server.</dd>
+
+		<dt id="worker">Worker</dt>
+		<dd>A unique combination of one instantiation of an application server on one piece of server hardware.</dd>
+		
+		
+    </div>
+
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Added: incubator/lokahi/site/trunk/history.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/history.html?rev=417493&view=auto
==============================================================================
--- incubator/lokahi/site/trunk/history.html (added)
+++ incubator/lokahi/site/trunk/history.html Tue Jun 27 08:53:26 2006
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi | History</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
+
+	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+	<td align="left" valign="top"><a href="http://incubator.apache.org/lokahi/" id="bannerLeft"><img src="images/lokahi_logo_144_80.png" alt="Lokahi" border="0" width="144" height="80" /></a></td>
+	<td align="right" valign="top"><a href="http://incubator.apache.org/"><img src="images/apache-incubator-logo.png" alt="Apache Incubator" border="0" width="229" height="57" /></a></td>
+	</tr>
+	</table>
+
+	<div id="container">
+
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
+	<li class="nav"><a href="project.html">Project Information</a></li>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>History of Lokahi</h1>		
+		
+	</div>
+
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Added: incubator/lokahi/site/trunk/howitworks.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/howitworks.html?rev=417493&view=auto
==============================================================================
--- incubator/lokahi/site/trunk/howitworks.html (added)
+++ incubator/lokahi/site/trunk/howitworks.html Tue Jun 27 08:53:26 2006
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi | How Lokahi Works</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
+
+	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+	<td align="left" valign="top"><a href="http://incubator.apache.org/lokahi/" id="bannerLeft"><img src="images/lokahi_logo_144_80.png" alt="Lokahi" border="0" width="144" height="80" /></a></td>
+	<td align="right" valign="top"><a href="http://incubator.apache.org/"><img src="images/apache-incubator-logo.png" alt="Apache Incubator" border="0" width="229" height="57" /></a></td>
+	</tr>
+	</table>
+
+	<div id="container">
+
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
+	<li class="nav"><a href="project.html">Project Information</a></li>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>How Lokahi Works</h1>
+		
+		<img src="images/lokahi-element-diagram.gif" alt="" width="310" height="657" border="0" style="float:left;margin-right:10px">
+		
+		<p>Lokahi manages both infrastructure and applications; the two are intertwined, but can be considered more or less separately for the purposes of explanation.</p>
+		<p>The application side is relatively simple; projects have virtual hosts and contexts. Users are assigned to applications.</p>
+		<p>The diagram at left shows how Lokahi organizes the infrastructure in order to manage it. Installations of Apache and Tomcat, as well as single servers, are considered separately. <a href="glossary.html#worker">Workers</a> are unique combinations of instantiations of Apache and Tomcat (Apache installations and JVMs) and servers. Note the relationship: an installation of Apache or Tomcat can have many workers, but each worker is related to only one installation of Apache or Tomcat, and one piece of hardware. (This may sound a little confusing, but consider that an installation of Tomcat can have many JVMs defined, but any given JVM will only be associated with one specific installation of Tomcat.) Thus, a JVM replicated across three clustered servers is actually treated as three separate <a href="glossary.html#tomcatworker">Tomcat Workers</a> by Lokahi.<p>
+		<p>A grouping of workers is a <a href="glossary.html#pool">Pool</a>. Thus, one JVM in a clustered environment, which therefore exists once for each server, is a <a href="glossary.html#tomcatpool">Tomcat Pool</a>.</p>
+		<p>Lastly, the combination of one Apache Pool and one Tomcat Pool creates a <a href="glossary.html#hostingpool">Hosting Pool</a>.</p>
+
+    </div>
+
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Modified: incubator/lokahi/site/trunk/index.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/index.html?rev=417493&r1=417492&r2=417493&view=diff
==============================================================================
--- incubator/lokahi/site/trunk/index.html (original)
+++ incubator/lokahi/site/trunk/index.html Tue Jun 27 08:53:26 2006
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
  <head>
    <title>Apache Lokahi</title>

    <link href="styles/styles.css" rel="stylesheet" type="text/css" />
	<meta name="author" content="The Lokahi Team" />
    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
  </head>
-
  <body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
 
 	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
@@ -10,22 +10,35 @@
 
 	<div id="container">
 
-	<div id="leftnav">
    <ul>
    <li class="nav"><a href="index.html">About Lokahi</a></li>
-	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Status</a></li>
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
 	<li class="nav"><a href="project.html">Project Information</a></li>
-	<li class="nav"><a href="javadocs/">javadocs</a></li>
	</ul>
    </div>
-
    <div id="content">
-		<h1>About Lokahi</h1>
		<h2>What is Lokahi?</h2>
-		<p>Lokahi is a web-based framework for the management of application servers. It is comprised of a core set of functionality and a set of modules which can be added or removed as needed. Each module enables management of an application server or the connection between two application servers. Certain modules, including modules for Apache, Tomcat, and mod_jk, are provided as part of the initial release, and documentation and an API will be provided for developers to create their own. This modularity allows Lokahi to be extensible to accommodate growing and changing infrastructures.</p>
-		<p>In many ways, Lokahi can be thought of, in ITIL terms, to be a Configuration Management Database.</p>
-		<p>Lokahi is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
-		<h2>Why Lokahi?</h2>
-		<p>As enterprise moves more and more business functions to the web, the infrastructure supporting the resultant applications grows larger and more complex. Today's open source web applications, such as Apache and Tomcat, are capable and reliable platforms providing robust performance and scalability; however, the management layer of this infrastructure is lacking.</p>
-		<p>Most application server management is performed manually, requiring large commitments of time and staff size. Manual server management also requires an in-depth knowledge of the infrastructure and creates a significant opportunity for human error. In addition, there is very little process in place to manage applications. Application owners often do not have the ability to manage their applications and configurations.</p>
-		<p>These shortcomings in the management of web and application middle tier services demonstratrate that a true enterprise means of management does not exist.</p>
-		<p>Lokahi provides a centralized and more automated way of managing application servers. This lessens the strain on support staff and decreases the window for human error in infrastructure management. Lastly, it decreases the amount of time needed to perform routine operational tasks.</p>
-		<p>Lokahi also allows application owners and developers to manage their own applications. This further reduces workload on support staff, as well as shifts responsibility for applications fully to application owners, including many operational tasks and management of permissions. Making application owners responsible for permissions to edit and manage their applications can aid in regulatory compliance.</p>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>Lokahi</h1>
+		<p>Lokahi is a modular, web-based framework for the management of application servers. 
+		
+		<h2>What can I do with Lokahi?</h2>
+		<p>With Lokahi, you can perform a number of management tasks on key application servers. The current release provides management functionality for Apache, Tomcat, and mod_jk, such as:
+		<ul>
+		<li>Start/stop/graceful Apache</li>
+		<li>Add/remove virtual host</li>
+		<li>Change virtual host configurations</li>
+		<li>Start/stop Tomcat JVM</li>
+		<li>Add/remove context</li>
+		<li>Change context configurations</li>
+		<li>Reload context in memory</li>
+		<li>Add/remove/modify JVM</li>
+		<li>Manage management permissions by application</li>
+		</ul>
+		
+		<p>Lokahi can manage application servers across server pools and across <a href="glossary.html#instance">instances</a>, greatly simplifying the management of complex infrastructure. See <a href="about.html">About Lokahi</a> for more benefits of Lokahi.</p>
+
     </div>
 
-	</div>

    <div id="footer">
      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>
    </div>
-
  </body>
</html>
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Modified: incubator/lokahi/site/trunk/nav.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/nav.html?rev=417493&r1=417492&r2=417493&view=diff
==============================================================================
--- incubator/lokahi/site/trunk/nav.html (original)
+++ incubator/lokahi/site/trunk/nav.html Tue Jun 27 08:53:26 2006
@@ -1,4 +1,8 @@
-	<div id="leftnav">
    <ul>
    <li class="nav"><a href="index.html">About Lokahi</a></li>
-	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Status</a></li>
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
 	<li class="nav"><a href="project.html">Project Information</a></li>
-	<li class="nav"><a href="javadocs/">javadocs</a></li>
	</ul>
    </div>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
\ No newline at end of file

Modified: incubator/lokahi/site/trunk/project.html
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/project.html?rev=417493&r1=417492&r2=417493&view=diff
==============================================================================
--- incubator/lokahi/site/trunk/project.html (original)
+++ incubator/lokahi/site/trunk/project.html Tue Jun 27 08:53:26 2006
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
  <head>
    <title>Apache Lokahi</title>

    <link href="styles/styles.css" rel="stylesheet" type="text/css" />
	<meta name="author" content="The Lokahi Team" />
    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
  </head>
-
  <body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>  <head>    <title>Apache Lokahi</title>    <link href="styles/styles.css" rel="stylesheet" type="text/css" />	<meta name="author" content="The Lokahi Team" />    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />  </head>
+  <body>
 
 	<table id="header" border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
@@ -10,16 +10,20 @@
 
 	<div id="container">
 
-	<div id="leftnav">
    <ul>
    <li class="nav"><a href="index.html">About Lokahi</a></li>
-	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Status</a></li>
+	<div id="leftnav">    <ul>    <li class="nav"><a href="index.html">Lokahi Home</a></li>
+    <li class="nav"><a href="about.html">About Lokahi</a></li>
+    <li class="nav"><a href="history.html">History of Lokahi</a></li>    
+	<li class="nav"><a href="design.html">Design of Lokahi</a></li>
+	<li class="nav"><a href="howitworks.html">How Lokahi Works</a></li> 	<li class="nav"><a href="http://incubator.apache.org/projects/lokahi.html">Incubation Status</a></li>
 	<li class="nav"><a href="project.html">Project Information</a></li>
-	<li class="nav"><a href="javadocs/">javadocs</a></li>
	</ul>
    </div>
-
    <div id="content">
-		<h1>Project Information</h1>
+	<li class="nav"><a href="javadocs/">javadocs</a></li>
+	<li class="nav"><a href="glossary.html">Glossary</a></li>	</ul>    </div>
+    <div id="content">
+		<h1>Project Information</h1>
 		<h2>Bug Tracking</h2>
 		<p><a href="http://issues.apache.org/jira/browse/lokahi">http://issues.apache.org/jira/browse/lokahi</a>
 		<h2>Mailing Lists</h2>
-		<pre>dev	lokahi-dev incubator.apache.org
commits	lokahi-commits incubator.apache.org
+		<pre>dev	lokahi-dev incubator.apache.orgcommits	lokahi-commits incubator.apache.org
 private	lokahi-private incubator.apache.org</pre>
 		<h2>Source Code</h2>
 		<p>http://svn.apache.org/repos/asf/incubator/lokahi/</p>
@@ -28,5 +32,5 @@
 
 	</div>
 
-	</div>

    <div id="footer">
      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>
    </div>
-
  </body>
</html>
+	</div>    <div id="footer">      <div style="float:right;">&#169; 2006 Apache Software Foundation</div>    </div>
+  </body></html>
\ No newline at end of file

Modified: incubator/lokahi/site/trunk/styles/styles.css
URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/styles/styles.css?rev=417493&r1=417492&r2=417493&view=diff
==============================================================================
--- incubator/lokahi/site/trunk/styles/styles.css (original)
+++ incubator/lokahi/site/trunk/styles/styles.css Tue Jun 27 08:53:26 2006
@@ -1,20 +1,30 @@
-body {
margin: 5px;
}
+body {margin: 10px;}
 
-a:link {
color: #217e21;
-text-decoration:underline;
}
+a:link {color: #217e21;
+text-decoration:underline;}
 
-a:visited {
color: #666462;
-text-decoration:underline;
}

a:hover, a:active {
text-decoration: none;
color: #4ca038;
}
+a:visited {color: #666462;
+text-decoration:underline;}a:hover, a:active {text-decoration: none;color: #4ca038;}
 
-p, li {
font-family: Arial, Helvetica, sans-serif;
font-size: .8em;
color: #474645;
+p, li, dd, dt {font-family: Arial, Helvetica, sans-serif;font-size: .8em;color: #474645;
 line-height:1.4em;
-max-width:50em;
}
+max-width:50em;}
 
-h1 {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 1.5em;
color: #217e21;
}
+dd {
+margin-left:15px;
+margin-bottom:2em;
+}
+
+dt {
+font-weight:bold;
+}
+
+h1 {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 1.5em;color: #217e21;}
 
-h2 {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 1.1em;
color: #474645;
}
+h2 {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 1.1em;color: #474645;
+font-weight:bold;}
 
-h3 {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 1em;
color: #474645;
}
+h3 {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: .9em;color: #474645;}
 
 #container {
 background-color:#ffffff;
@@ -22,7 +32,7 @@
 
 #leftnav {
 float:left;
-width=11em;
+width=150px;
 margin:5px 10px 0 0;
 padding-right:.3em;
 border-style:solid;
@@ -37,23 +47,24 @@
 line-height:1.5em;
 text-align:right;
 margin-left:-1.5em;
-font-family: Arial, Helvetica, sans-serif;
}
+font-family: Arial, Helvetica, sans-serif;}
 
-#leftnav ul a:link {
color:#666462;
-text-decoration: none;
}
+#leftnav ul a:link {color:#666462;
+text-decoration: none;}
 
-#leftnav ul a:visited {
color:#666462;
-text-decoration: none;
}
+#leftnav ul a:visited {color:#666462;
+text-decoration: none;}
 
-#leftnav ul a:hover {
color:#4ca038;
}
+#leftnav ul a:hover {color:#4ca038;}
 
-#leftnav ul a:active {
color:#4ca038;
}
+#leftnav ul a:active {color:#4ca038;}
 
-#content {
margin-left: 10em;
-padding:0 5px 0 5px;
}
+#content {margin-left: 150px;
+padding:0 5px 0 5px;}
 
 #footer {
 font-size:.8em;
 font-family: Arial, Helvetica, sans-serif;
 color: #474645;
+float:right;
 }