Index: openacs-4/packages/acs-automated-testing/acs-automated-testing.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/acs-automated-testing.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-automated-testing/acs-automated-testing.info	24 Feb 2004 13:45:47 -0000	1.9
+++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info	24 Feb 2004 14:23:03 -0000	1.10
@@ -20,6 +20,9 @@
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="enabled_p"  default="0" description="Source scripts flag"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="IsInstallReportServer"  default="0" description="Setting this parameter to true means this server should present a web interface at /test with the install and test results of other OpenACS servers. If you set this parameter to true you also need to set the XMLReportDir parameter.
+
+"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="XMLReportDir"  description="The full path to the directory where the xml report of system tests are stored. This is also the directory where the install and test xml reports of other servers should be stored if this server is to function as a master test server.
 "/>
         </parameters>
Index: openacs-4/packages/acs-automated-testing/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-automated-testing/www/index.adp	24 Feb 2004 14:15:01 -0000	1.1
@@ -0,0 +1,31 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<if @servers:rowcount@ gt 0>
+  <table border="1">
+    <tr>
+      <th>Server</th>
+      <th>Description</th>
+      <th>Last built</th>
+      <th>Errors</th>
+    </tr>
+    <multiple name="servers">
+      <tr>
+        <if @servers.parse_errors@ not nil>
+          <td colspan="4">Could not parse XML file at @servers.path@: @servers.parse_errors@</td>
+        </if>
+        <else>
+          <td><a href="@servers.url@">@servers.name@</a></td>
+          <td>@servers.description@</td>
+          <td>@servers.install_date@</td>
+          <td>@servers.error_total_count@ errors</td>
+        </else>
+      </tr>
+    </multiple>
+  </table>
+</if>
+
+<if @xml_report_dir@ nil>
+  The XMLReportDir parameter is empty so a server listing cannot be generated.
+</if>
Index: openacs-4/packages/acs-automated-testing/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-automated-testing/www/index.tcl	25 Feb 2003 14:43:31 -0000	1.1
+++ openacs-4/packages/acs-automated-testing/www/index.tcl	24 Feb 2004 14:15:01 -0000	1.2
@@ -1 +1,37 @@
-ad_returnredirect admin
\ No newline at end of file
+ad_page_contract {
+    Typically redirects to the admin index page which displays information about test cases
+    on this server. However, if this is an install/test reporting server (see parameter IsInstallReportServer) then
+    show the list of installed servers here.
+}
+
+if { ![parameter::get -boolean -parameter IsInstallReportServer] } {
+    ad_returnredirect admin
+    ad_script_abort
+}
+
+set page_title "Test Servers Control Page"
+set context [list]
+multirow create servers path url name description install_date error_total_count parse_errors
+
+set xml_report_dir [aa_test::xml_report_dir]
+if { ![empty_string_p $xml_report_dir] } {
+    foreach path [glob $xml_report_dir/*-installreport.xml] {
+        aa_test::parse_install_file -path $path -array service
+
+        set test_path [aa_test::test_file_path -install_file_path $path]
+        if { [file exists $test_path] } {
+            aa_test::parse_test_file -path $test_path -array test
+            array set testcase_failure $test(testcase_failure)
+            set service(num_errors) [llength [array names testcase_failure]]
+        } 
+
+        multirow append servers \
+            $service(path) \
+            [export_vars -base server { path }] \
+            $service(name) \
+            $service(description) \
+            $service(install_end_timestamp) \
+            $service(num_errors) \
+            $service(parse_errors)
+    }
+}
Index: openacs-4/packages/acs-automated-testing/www/server.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-automated-testing/www/server.adp	24 Feb 2004 14:15:01 -0000	1.1
@@ -0,0 +1,83 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<ul>
+  <li>Service:
+    <ul>
+      <li>Name: @service.name@</li>
+      <li>Description: @service.description@</li>
+      <li>URL: <a href="@service.url@">@service.url@</a>
+    </ul>
+  </li>
+  <if @admin_p@>
+    <li>Login:
+      <ul>
+        <li><a href="@admin_login_url@">Admin user</a>
+      </ul>
+    </li>
+  </if>
+  </li>
+  <li>Installation: 
+    <ul>
+      <li>Installation completed at: @service.install_end_timestamp@
+      <li>Duration: @service.install_duration_pretty@
+    </ul>
+  </li>
+  <li>Sources
+    <ul>
+      <li>OS: @service.os@
+      <li>DB: @service.dbtype@ @service.dbversion@
+      <li>Webserver: : @service.webserver@
+      <li>Openacs flag: @service.openacs_cvs_flag@
+    </ul>
+  </li>
+  <li>Logs
+    <ul>
+      <li><a href="@service.auto_test_url@">Automated testing</a>
+      <li>Install Log (TODO)
+    </ul>
+  </li>
+  <li>Test failures
+    <if @has_test_report_p@>
+      <if @testcase_failures:rowcount@ eq 0>
+        <i>none</i>
+      </if>
+      <else>
+        <table>
+          <tr>
+            <th>Test case</th>
+            <th>Failure count</th>
+          </tr>
+        <multiple name="testcase_failures">
+          <tr>
+            <td>@testcase_failures.testcase_id@</td>
+            <td align="center">@testcase_failures.count@</td>
+          </tr>
+        </multiple>      
+        </table>
+      </else>
+    </if>
+    <else>
+      <p>
+        Unknown. Missing test report file at path @test_path@
+      </p>
+    </else>
+  </li>
+</ul>
+
+<h3>Rebuild</h3>
+
+<ul
+  <li>
+    To rebuild this server:
+    <ol>
+      <li>
+        SSH to @service.hostname@
+      </li>
+      <li>
+        Execute @service.rebuild_cmd@
+      </li>
+    </ol>
+  </li>
+</ul>
Index: openacs-4/packages/acs-automated-testing/www/server.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-automated-testing/www/server.tcl	24 Feb 2004 14:15:01 -0000	1.1
@@ -0,0 +1,33 @@
+ad_page_contract {
+    Control page for an individual server.
+} {
+    path:notnull
+}
+
+aa_test::parse_install_file -path $path -array service
+
+set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin]
+
+set test_path [aa_test::test_file_path -install_file_path $path]
+set has_test_report_p [file exists $test_path]
+
+multirow create testcase_failures testcase_id count
+
+if { $has_test_report_p } {
+    aa_test::parse_test_file -path $test_path -array test
+
+    array set testcase_failure $test(testcase_failure)
+    foreach testcase_id [array names testcase_failure] {
+	multirow append testcase_failures $testcase_id $testcase_failure($testcase_id)
+    }
+}
+
+set page_title "Control Page for Server $service(name)"
+set context [list $page_title]
+
+set time [ns_time]
+set token_id [sec_get_random_cached_token_id]
+set token [sec_get_token $token_id]
+set hash [ns_sha1 "$time$token_id$token"]
+
+set admin_login_url "[export_vars -base "$service(url)/register" {{email {$service(adminemail)}} {password {$service(adminpassword)}} {__confirmed_p 1} time hash token_id {return_url /admin}}]&form:id=login"
Index: openacs-4/packages/acs-automated-testing/www/admin/install/report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/install/Attic/report.adp,v
diff -u -N
--- openacs-4/packages/acs-automated-testing/www/admin/install/report.adp	24 Feb 2004 13:13:13 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
-
-<ul>
-  <multiple name="servers">
-    <li>
-      <if @servers.parse_errors@ not nil>Could not parse XML file at @servers.path@: @servers.parse_errors@</if>
-      <else>
-        <a href="@servers.url@">@servers.name@</a>
-        (@servers.install_date@, @servers.error_total_count@ errors)
-      </else>
-    </li>
-  </multiple>
-</ul>
-
-<if @xml_report_dir@ nil>
-  The XMLReportDir parameter is empty so a server listing cannot be generated.
-</if>
\ No newline at end of file
Index: openacs-4/packages/acs-automated-testing/www/admin/install/report.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/install/Attic/report.tcl,v
diff -u -N
--- openacs-4/packages/acs-automated-testing/www/admin/install/report.tcl	24 Feb 2004 13:13:13 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-ad_page_contract {
-    Test servers control page.
-}
-
-set page_title "Test Servers Control Page"
-set context [list]
-multirow create servers path url name install_date error_total_count parse_errors
-
-set xml_report_dir [aa_test::xml_report_dir]
-if { ![empty_string_p $xml_report_dir] } {
-    foreach path [glob $xml_report_dir/*-installreport.xml] {
-        aa_test::parse_install_file -path $path -array service
-
-        set test_path [aa_test::test_file_path -install_file_path $path]
-        if { [file exists $test_path] } {
-            aa_test::parse_test_file -path $test_path -array test
-            array set testcase_failure $test(testcase_failure)
-            set service(num_errors) [llength [array names testcase_failure]]
-        } 
-
-        multirow append servers \
-            $service(path) \
-            [export_vars -base server { path }] \
-            $service(name) \
-            $service(install_end_timestamp) \
-            $service(num_errors) \
-            $service(parse_errors)
-    }
-}
\ No newline at end of file
Index: openacs-4/packages/acs-automated-testing/www/admin/install/server.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/install/Attic/server.adp,v
diff -u -N
--- openacs-4/packages/acs-automated-testing/www/admin/install/server.adp	24 Feb 2004 13:45:30 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-<master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
-
-<ul>
-  <li>Service:
-    <ul>
-      <li>Name: @service.name@</li>
-      <li>Description: @service.description@</li>
-      <li>URL: <a href="@service.url@">@service.url@</a>
-    </ul>
-  </li>
-  <li>Login:
-    <ul>
-      <li><a href="@admin_login_url@">Admin user</a>
-    </ul>
-  </li>
-
-  </li>
-  <li>Installation: 
-    <ul>
-      <li>Installation completed at: @service.install_end_timestamp@
-      <li>Duration: @service.install_duration_pretty@
-    </ul>
-  </li>
-  <li>Sources
-    <ul>
-      <li>OS: @service.os@
-      <li>DB: @service.dbtype@ @service.dbversion@
-      <li>Webserver: : @service.webserver@
-      <li>Openacs flag: @service.openacs_cvs_flag@
-    </ul>
-  </li>
-  <li>Logs
-    <ul>
-      <li><a href="@service.auto_test_url@">Automated testing</a>
-      <li>Install Log (TODO)
-    </ul>
-  </li>
-  <li>Test failures
-    <if @has_test_report_p@>
-      <if @testcase_failures:rowcount@ eq 0>
-        <i>none</i>
-      </if>
-      <else>
-        <table>
-          <tr>
-            <th>Test case</th>
-            <th>Failure count</th>
-          </tr>
-        <multiple name="testcase_failures">
-          <tr>
-            <td>@testcase_failures.testcase_id@</td>
-            <td align="center">@testcase_failures.count@</td>
-          </tr>
-        </multiple>      
-        </table>
-      </else>
-    </if>
-    <else>
-      <p>
-        Unknown. Missing test report file at path @test_path@
-      </p>
-    </else>
-  </li>
-</ul>
-
-<h3>Rebuild</h3>
-
-<ul
-  <li>
-    To rebuild this server:
-    <ol>
-      <li>
-        SSH to @service.hostname@
-      </li>
-      <li>
-        Execute @service.rebuild_cmd@
-      </li>
-    </ol>
-  </li>
-</ul>
Index: openacs-4/packages/acs-automated-testing/www/admin/install/server.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/install/Attic/server.tcl,v
diff -u -N
--- openacs-4/packages/acs-automated-testing/www/admin/install/server.tcl	24 Feb 2004 13:45:30 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-ad_page_contract {
-    Control page for an individual server.
-} {
-    path:notnull
-}
-
-aa_test::parse_install_file -path $path -array service
-
-set test_path [aa_test::test_file_path -install_file_path $path]
-set has_test_report_p [file exists $test_path]
-
-multirow create testcase_failures testcase_id count
-
-if { $has_test_report_p } {
-    aa_test::parse_test_file -path $test_path -array test
-
-    array set testcase_failure $test(testcase_failure)
-    foreach testcase_id [array names testcase_failure] {
-	multirow append testcase_failures $testcase_id $testcase_failure($testcase_id)
-    }
-}
-
-set page_title "Control Page for Server $service(name)"
-set context [list $page_title]
-
-set time [ns_time]
-set token_id [sec_get_random_cached_token_id]
-set token [sec_get_token $token_id]
-set hash [ns_sha1 "$time$token_id$token"]
-
-set admin_login_url "[export_vars -base "$service(url)/register" {{email {$service(adminemail)}} {password {$service(adminpassword)}} {__confirmed_p 1} time hash token_id {return_url /admin}}]&form:id=login"