Index: openacs-4/etc/install/config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/Attic/config.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/etc/install/config.tcl	22 Sep 2003 10:18:13 -0000	1.9
+++ openacs-4/etc/install/config.tcl	10 Oct 2003 15:25:15 -0000	1.10
@@ -90,8 +90,6 @@
 # that an email alert should be sent
 set alert_keyword "INSTALLATION ALERT"
 set send_alert_script "send-alert"
-set openacs_output_file "${serverroot}/log/install-openacs-data-model-output.html"
-set openacs_packages_output_file "${serverroot}/log/install-openacs-packages-install-output.html"
-set apm_output_file "${serverroot}/log/install-apm-packages-output.html"
+set install_output_file "${serverroot}/log/install-output.html"
 # Where all errors in the log file during installation are collected
 set install_error_file "${serverroot}/log/install-log-errors"
Index: openacs-4/etc/install/openacs-install.test
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/openacs-install.test,v
diff -u -r1.1 -r1.2
--- openacs-4/etc/install/openacs-install.test	4 Sep 2003 16:51:26 -0000	1.1
+++ openacs-4/etc/install/openacs-install.test	10 Oct 2003 15:25:15 -0000	1.2
@@ -9,64 +9,38 @@
 # Check that database connection is there and configuration is ok
 assert ![regexp -nocase "At least one misconfiguration was discovered" "[response text]"]
 
-# Install the core data model and load the .info package files (took 155s)
-do_request "$server_url/install-data-model"
-write_response_to_file $openacs_output_file
-
-# Install the packages (took 73s)
-do_request "$server_url/packages-install"
-write_response_to_file $openacs_packages_output_file
-
-# Create an administrator
-do_request "$server_url/create-administrator"
-
+# Fill in administrator info
 field find ~f ~n email
 field fill "$admin_email"
-
 field find ~f ~n "first_names"
 field fill "$admin_first_names"
-
 field find ~f ~n last_name
 field fill "$admin_last_name"
-
 field find ~n password
 field fill "$admin_password"
-
 field find ~n password_confirmation
 field fill "$admin_password"
 
-form submit
-
-# Fill in the system administration page
-assert text "Please enter some information about your system"
-
+# Fill in the system settings
 field find ~n system_url
 field fill "$server_url"
-
 field find ~n system_name
 field fill "$system_name"
-
 field find ~n publisher_name
 field fill "$publisher_name"
-
 field find ~n system_owner
 field fill "$system_owner_email"
-
 field find ~n admin_owner
 field fill "$admin_owner_email"
-
 field find ~n host_administrator
 field fill "$admin_owner_email"
-
 field find ~n outgoing_sender
 field fill "$outgoing_sender_email"
-
 field find ~n new_registrations
 field fill "$new_registrations_email"
 
 form submit
 
-# Installation should now be done
-assert text "OpenACS Installation Complete"
+write_response_to_file $openacs_output_file
 
 # Test Execution END
Index: openacs-4/etc/install/tclwebtest-functions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/Attic/tclwebtest-functions.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/etc/install/tclwebtest-functions.tcl	29 Sep 2003 13:51:39 -0000	1.5
+++ openacs-4/etc/install/tclwebtest-functions.tcl	10 Oct 2003 15:25:15 -0000	1.6
@@ -161,7 +161,7 @@
     global __server_url
 
     # Request the start page
-    do_request "$__server_url"
+    do_request "${__server_url}/register"
 
     # Login the user
     form find ~n login