From lokahi-commits-return-58-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org Thu Jun 15 12:58:06 2006
Return-Path: <lokahi-commits-return-58-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-lokahi-commits-archive@locus.apache.org
Received: (qmail 99296 invoked from network); 15 Jun 2006 12:58:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Jun 2006 12:58:06 -0000
Received: (qmail 70081 invoked by uid 500); 15 Jun 2006 12:58:06 -0000
Delivered-To: apmail-incubator-lokahi-commits-archive@incubator.apache.org
Received: (qmail 70057 invoked by uid 500); 15 Jun 2006 12:58:06 -0000
Mailing-List: contact lokahi-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lokahi-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:lokahi-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:lokahi-commits@incubator.apache.org>
List-Id: <lokahi-commits.incubator.apache.org>
Reply-To: lokahi-dev@incubator.apache.org
Delivered-To: mailing list lokahi-commits@incubator.apache.org
Received: (qmail 70048 invoked by uid 99); 15 Jun 2006 12:58:06 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 05:58:06 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 05:58:04 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id D74941A9842; Thu, 15 Jun 2006 05:57:44 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r414571 - in /incubator/lokahi/lokahi/trunk: build.properties
 build.xml database/tmc_instance_data.sql
 database/tmc_rel_function_user_data.sql database/tmc_user_data.sql
 docs/README.TXT
Date: Thu, 15 Jun 2006 12:57:43 -0000
To: lokahi-commits@incubator.apache.org
From: toback@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060615125744.D74941A9842@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: toback
Date: Thu Jun 15 05:57:43 2006
New Revision: 414571

URL: http://svn.apache.org/viewvc?rev=414571&view=rev
Log:
updating the build process to make it easier.

Added:
    incubator/lokahi/lokahi/trunk/database/tmc_instance_data.sql
    incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql
    incubator/lokahi/lokahi/trunk/database/tmc_user_data.sql
Modified:
    incubator/lokahi/lokahi/trunk/build.properties
    incubator/lokahi/lokahi/trunk/build.xml
    incubator/lokahi/lokahi/trunk/docs/README.TXT

Modified: incubator/lokahi/lokahi/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/build.properties?rev=414571&r1=414570&r2=414571&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/build.properties (original)
+++ incubator/lokahi/lokahi/trunk/build.properties Thu Jun 15 05:57:43 2006
@@ -1,6 +1,6 @@
 tomcat.home=/opt/tomcat5.5.9/
 app.name=lokahi
-app.virtuahost.name=
+app.virtualhost.name=
 app.authenticationmodule=org.apache.lokahi.core.common.authentication.NoAuthentication
 console.log.location=
 agent.log.location=
@@ -8,8 +8,8 @@
 database.user=
 database.password=
 database.driver=oracle.jdbc.driver.OracleDriver
-inital.instance.name=
-inital.user.name=
+initial.instance.name=
+initial.user.name=
 install.location=${tomcat.home}/webapps/
 
 

Modified: incubator/lokahi/lokahi/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/build.xml?rev=414571&r1=414570&r2=414571&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/build.xml (original)
+++ incubator/lokahi/lokahi/trunk/build.xml Thu Jun 15 05:57:43 2006
@@ -1,6 +1,13 @@
 <project name="lokahi" default="install">
 
-  <target name="install" depends="init,jar,copy-www,copy-db,build-agent,copy-docs,post-process"/>
+  <target name="build" depends="init,jar,copy-www,copy-db,build-agent,copy-docs,post-process"/>
+
+  <target name="install" depends="build">
+    <mkdir dir="${install.location}${app.name}"/>
+    <copy todir="${install.location}${app.name}">
+      <fileset dir="${app.build.context}"/>
+    </copy>
+  </target>
 
   <target name="post-process" depends="copy-dependent-libs,copy-etc"/>
 
@@ -13,6 +20,11 @@
   <target name="copy-db">
     <copy todir="${app.build.db}">
       <fileset dir="${app.src.db}"/>
+           <filterchain>
+        <replacetokens begintoken="@" endtoken="@">
+          <token key="INITIAL_INSTANCE_NAME" value="${initial.instance.name}"/>
+        </replacetokens>
+      </filterchain>
     </copy>
   </target>
 
@@ -70,15 +82,15 @@
         file="${app.build.web-inf.classes}/lokahi.properties"
         comment="Generated automatically.  See conf/lokahi.properties for comments.">
       <entry key="application.root" value="/${app.name}"/>
-      <entry key="application.full.url" value="http://${app.virtuahost.name)/${app.name}/"/>
-      <entry key="AGENT_REPLY_TO_ADDRESS" value="http://${app.virtuahost.name)/${app.name}/services/TmcJob"/>
-      <entry key="rest.servlet.url" value="http://${app.virtuahost.name)/${app.name}/rest/"/>
+      <entry key="application.full.url" value="http://${app.virtualhost.name}/${app.name}/"/>
+      <entry key="AGENT_REPLY_TO_ADDRESS" value="http://${app.virtualhost.name}/${app.name}/services/TmcJob"/>
+      <entry key="rest.servlet.url" value="http://${app.virtualhost.name}/${app.name}/rest/"/>
       <entry key="AuthenticateModule" value="${app.authenticationmodule}"/>
       <entry key="tmc.database.uri" value="${database.uri}"/>
       <entry key="tmc.database.user" value="${database.user}"/>
       <entry key="tmc.database.password" value="${database.password}"/>
       <entry key="tmc.database.driver" value="${database.driver}"/>
-      <entry key="tmc.instance.name" value="${inital.instance.name}"/>
+      <entry key="tmc.instance.name" value="${initial.instance.name}"/>
       <entry key="prop.location" value="${install.location}/${app.name}"/>
     </propertyfile>
   </target>

Added: incubator/lokahi/lokahi/trunk/database/tmc_instance_data.sql
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/tmc_instance_data.sql?rev=414571&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/database/tmc_instance_data.sql (added)
+++ incubator/lokahi/lokahi/trunk/database/tmc_instance_data.sql Thu Jun 15 05:57:43 2006
@@ -0,0 +1,9 @@
+
+
+insert into TMC_INSTANCE
+( INSTANCE_ID, INSTANCE_NAME )
+values
+( TMC_INSTANCE_SEQ.NEXTVAL, '@INITIAL_INSTANCE_NAME@' )
+/
+commit;
+

Added: incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql?rev=414571&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql (added)
+++ incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql Thu Jun 15 05:57:43 2006
@@ -0,0 +1,157 @@
+rem initial data for superuser USER_ID=1
+rem automatically generated by script
+insert into TMC_REL_FUNCTION_USER values ( 1,91,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,63,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,92,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,115,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,94,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,68,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,78,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,67,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,52,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,86,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,20,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,42,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,64,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,69,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,95,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,96,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,32,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,43,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,76,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,87,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,79,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,13,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,44,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,9,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,90,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,88,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,41,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,58,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,14,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,17,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,60,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,36,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,6,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,59,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,5,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,16,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,37,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,55,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,33,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,15,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,62,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,114,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,7,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,53,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,31,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,106,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,65,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,54,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,48,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,107,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,110,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,8,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,66,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,93,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,29,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,102,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,49,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,39,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,82,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,112,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,103,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,72,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,24,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,83,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,61,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,50,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,23,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,113,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,34,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,74,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,101,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,30,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,18,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,111,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,25,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,57,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,35,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,26,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,100,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,19,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,51,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,28,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,85,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,105,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,3,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,27,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,70,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,1,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,80,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,99,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,46,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,56,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,104,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,11,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,40,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,4,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,77,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,84,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,12,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,89,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,45,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,97,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,38,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,2,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,81,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,109,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,75,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,47,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,108,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,71,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,21,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,10,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,22,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,73,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,98,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,116,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,117,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,85,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,76,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,3,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,10,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,79,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,81,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,77,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,84,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,78,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,82,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,1,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,80,2,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,85,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,76,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,3,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,10,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,79,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,81,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,77,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,84,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,78,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,82,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,1,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,80,1,4,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,5,8,3,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,8,8,3,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,5,1,3,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,8,1,3,1 );
+insert into TMC_REL_FUNCTION_USER values ( 1,118,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,119,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,121,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,123,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,126,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,124,0,1,0 );
+Commit;
+
+rem end of file
+

Added: incubator/lokahi/lokahi/trunk/database/tmc_user_data.sql
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/tmc_user_data.sql?rev=414571&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/database/tmc_user_data.sql (added)
+++ incubator/lokahi/lokahi/trunk/database/tmc_user_data.sql Thu Jun 15 05:57:43 2006
@@ -0,0 +1,15 @@
+
+
+insert into TMC_USER
+( USER_ID, USER_NAME, PASSWORD, STATE_ID, FIRST_NAME, LAST_NAME, JOB_TITLE, EMAIL, COMMENTS )
+values
+( TMC_USER_SEQ.NEXTVAL, '&username', '&password', 8, '&firstname', '&lastname', 'Superuser', '&email', 
+'This is the first superuser needed to set up everything else from the GUI'
+);
+
+commit;
+
+select user_id, user_name from tmc_user;
+
+prompt If This user is not user_id = 1, you need to fix that.
+

Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=414571&r1=414570&r2=414571&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/README.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/README.TXT Thu Jun 15 05:57:43 2006
@@ -1,44 +1,69 @@
-Requirements:  Tomcat 5.5.9, Oracle 9i, JDK 1.5, ant 1.6.5 or later.
+   Requirements:  Tomcat 5.5.9, Oracle 9i, JDK 1.5, ant 1.6.5 or later.
 
-Build instructions:
-1.	untar the tarball, or take the latest src from svn @ http://svn.apache.org/repos/asf/incubator/lokahi/lokahi/trunk/
-2.	edit the following propertys in the build.properties file:
-
-tomcat.home=/opt/tomcat5.5.9/
-app.name=lokahi
-app.virtuahost.name=
-app.authenticationmodule=org.apache.lokahi.core.common.authentication.NoAuthentication
-console.log.location=
-agent.log.location=
-database.uri=jdbc:oracle:thin:@some.server.net:PORT:SCHEMA
-database.user=
-database.password=
-database.driver=oracle.jdbc.driver.OracleDriver
-inital.instance.name=
-inital.user.name=
-install.location=${tomcat.home}/webapps/
-
-3.	download and add the proper classes12.jar, from the oracle website, to the lib directory.
-4.	download and add jdom version 1.0 from http://www.jdom.org/ to the lib directory.
-5.	download and add the activation.jar from http://java.sun.com/products/javabeans/glasgow/jaf.html to the lib directory.
-6.	download and add the mail.jar from http://java.sun.com/products/javamail/ to the lib directory.
-7.	verify that JAVA_HOME is properly set to point to jdk1.5 in your shell.
-5.	run ant to build the package.
-
-Database setup:
-1. Create the lokahi schema <SCH> in your Oracle database with default tablespace and enough quota on that tablespace (100 MB is sufficient for install)
-2. Run schema_priv.sql as DBA to grant system privileges to <SCH>. > @schema_priv.sql <SCH>
-3. Login as <SCH> and run install.sql
-   Install.sql will call recompile.sql to recompile any invalid object and report install status at the end.
-4. Make sure there is no invalid object and no error message in install.log and recompile.log
-5. create a user, instance.  (ok, so we need a script to do this, java!)
-
-Agent install:
-1.	copy the files in ./build/agent to a directory on each server.
-2.	start the agent buy running:
-$JAVA_HOME/bin/java -classpath $JAVA_HOME/lib/tools.jar:$AGENT_HOME/log4j-1.2.13.jar:$AGENT_HOME/lokahi.jar:$AGENT_HOME/axis.jar:$AGENT_HOME/commons-logging.jar:$AGENT_HOME/commons-discovery-0.2.jar:$AGENT_HOME/jdom.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/derby.jar:$AGENT_HOME:/derbyclient.jar:$AGENT_HOME/commons-pool-1.2.jar org.apache.lokahi.core.agent.TMCAgent start
-
-
-Console install:
-1. 
-2. define the context in tomcats server.xml file and start tomcat.
+   Build instructions:
+
+   SECTION I: Download Source Code
+
+   1. Untar the tarball, or take the latest src from svn @
+      http://svn.apache.org/repos/asf/incubator/lokahi/lokahi/trunk/
+   2. Change directory (cd) to the home directory of lokahi.
+
+   SECTION II: Database Setup (Oracle)
+
+   1. Change directory to database/ directory.
+   2. Create the lokahi schema <SCHEMA> in your Oracle database with default tablespace
+      and enough quota on that tablespace (100 MB is sufficient for install).
+   3. Run schema_priv.sql as DBA to grant system privileges to <SCHEMA>:
+      > @schema_priv.sql <SCH>
+
+   4. Login from sqlplus as <SCHEMA> and run:
+      SQL> @install.sql
+
+      Install.sql will call recompile.sql to recompile any invalid object and report
+      install status at the end. Make sure there is no invalid object and no error
+      message in install.log and recompile.log
+
+   5. Create the superuser. Login from sqlplus as <SCHEMA> and run:
+      > @tmc_user_data.sql
+      > @tmc_rel_function_user_data.sql
+
+   SECTION III: Build Software
+
+   1. Change directory (cd) to the home directory of lokahi.
+   2. Edit the following properties in the build.properties file:
+
+   ----
+   tomcat.home=<YOUR_TOMCAT_HOME>
+   app.name=lokahi
+   app.virtuahost.name=
+   app.authenticationmodule=org.apache.lokahi.core.common.authentication.NoAuthentication
+   console.log.location=
+   agent.log.location=
+   database.uri=jdbc:oracle:thin:@<DATABASE_SERVER>:<PORT>:<DB_NAME>
+   database.user=<SCHEMA>
+   database.password=<PASSWORD>
+   database.driver=oracle.jdbc.driver.OracleDriver
+   inital.instance.name=
+   inital.user.name=
+   install.location=${tomcat.home}/webapps/
+   ----
+
+   3. Download external libraries to lib/ directory:
+      a. classes12.jar   -- from the oracle website
+      b. jdom.jar        -- Jdom version 1.0 from http://www.jdom.org/
+      c. activation.jar  -- from http://java.sun.com/products/javabeans/glasgow/jaf.html
+      d. mail.jar        -- from http://java.sun.com/products/javamail/
+   4. Verify that JAVA_HOME is properly set to jdk1.5 in your shell.
+   5. Run ant to build the package.
+
+
+   SECTION IV: Agent Install
+
+   1.	copy the files in ./build/agent to a directory on each server.
+   2.	start the agent buy running:
+   $JAVA_HOME/bin/java -classpath $JAVA_HOME/lib/tools.jar:$AGENT_HOME/log4j-1.2.13.jar:$AGENT_HOME/lokahi.jar:$AGENT_HOME/axis.jar:$AGENT_HOME/commons-logging.jar:$AGENT_HOME/commons-discovery-0.2.jar:$AGENT_HOME/jdom.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/derby.jar:$AGENT_HOME:/derbyclient.jar:$AGENT_HOME/commons-pool-1.2.jar org.apache.lokahi.core.agent.TMCAgent start
+
+
+   SECTION V: Console Install
+   1.
+   2. define the context in tomcats server.xml file and start tomcat.