- Malte

acs-bootstrap-installer.info

@@ -7,16 +7,18 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.1.5" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.1.5.apm">
+    <version name="5.3.1b1" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.3.1b1.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Bootstraps an OpenACS installation.</summary>
-        <release-date>2004-02-28</release-date>
+        <release-date>2007-04-15</release-date>
         <maturity>3</maturity>
         <vendor url="http://openacs.org">OpenACS</vendor>
+	<license url="http://www.gnu.org/copyleft/gpl.html">GPL</license>
+	<maturity>3</maturity>
         <description format="text/html">This package bootstraps OpenACS. If the core packages have not yet been installed, it calls the installer which leads the user through the steps necessary to do so.  It also checks that the installation meets the requirements for a successful install of OpenACS.</description>
 
-        <provides url="acs-bootstrap-installer" version="5.1.4"/>
-        <requires url="acs-kernel" version="5.0.0"/>
+        <provides url="acs-bootstrap-installer" version="5.3.1b1"/>
+        <requires url="acs-kernel" version="5.3.1b1"/>
 
         <callbacks>
         </callbacks>

bootstrap.tcl

@@ -140,6 +140,15 @@ set errno [catch {
     ns_log Notice "Loading acs-automated-testing specially so other packages can define tests..."
     apm_bootstrap_load_libraries -procs acs-automated-testing
 
+    # GN: Should be loaded before user packages such they can use
+    # the xotcl infrastructure
+    # DRB: only do it if xotcl's installed
+    if {[info command ::xotcl::Class] ne "" &&
+        [file isdirectory $root_directory/packages/xotcl-core]} {
+       apm_bootstrap_load_libraries -procs xotcl-core
+       apm_bootstrap_load_libraries -init xotcl-core
+    }
+
     # Load libraries, queries etc. for remaining packages
     apm_load_packages
 

db-init-checks-oracle.tcl

@@ -26,10 +26,13 @@ proc db_bootstrap_checks { errors error_p } {
     }
 
     if { ![info exists my_error_p] } {
-        # DRB: I've got the SQL to pick the version to drop in later...what we really want,
-        # though, is Oracle's "compat version" number and I'm not sure how to get it (it is
-        # reported as 8.1.0 during the Oracle installation process)
-        nsv_set ad_database_version . "8.1.6"
+        # Get the version from Oracle, using the db tools equivalent of
+        # sticks and fire...
+        set db [ns_db gethandle [lindex [db_available_pools {}] 0]]
+        set selection [ns_db 1row $db "select version from product_component_version where product like 'Oracle%'"]
+        regexp {^[0-9]+\.[0-9]+\.[0-9]+} [ns_set value $selection 0] match
+        ns_db releasehandle $db
+        nsv_set ad_database_version . $match
     }
 }
 
@@ -41,7 +44,9 @@ proc db_installer_checks { errors error_p } {
     # Date format is a globally defined value for Oracle, so we only need to check it once
     # for correctness.
 
-    if { [db_string sysdate "select sysdate from dual"] != [ns_fmttime [ns_time] "%Y-%m-%d"] } {
+    if { [db_string sysdate "select sysdate from dual"] != 
+         [db_string sysdate2 "select to_char(sysdate,'YYYY-MM-DD') from dual"] } {
+				  
         # See if NLS_DATE_FORMAT is set correctly
     	append my_errors "<hr><P><B>"
 	append my_errors [db_string sysdate "select sysdate from dual"] 

db-init-checks-postgresql.tcl

@@ -35,8 +35,8 @@ proc db_bootstrap_checks { errors error_p } {
         nsv_set ad_database_version . $version
     }
 
-    if { $version < 7.3 } {
-        append my_errors "<li>Your installed version of Postgres is too old.  Please install PostgreSQL 7.2 or later.\n"
+    if { $version < 8.0 } {
+        append my_errors "<li>Your installed version of Postgres is too old.  Please install PostgreSQL 8.0 or later.\n"
         set my_error_p 1
     }
 

installer/index.tcl

@@ -192,10 +192,10 @@ After adding support for the fancy ADP parser, please restart your web server.
 # in the install.xml file)
 
 set stacksize [ns_config "ns/threads" StackSize]
-if { $stacksize < [expr $acs_application(min_stack_size) * 1024] } {
 
-    append errors "<li><p>The configured AOLserver Stacksize is too small
-([expr $stacksize / 1024]K).
+if { ![string is integer $stacksize] ||
+     $stacksize < [expr $acs_application(min_stack_size) * 1024] } {
+    append errors "<li><p><strong>The configured AOLserver Stacksize is too small, missing, or a non-integer value.
 $acs_application(pretty_name) requires a StackSize parameter of at least
 ${acs_application(min_stack_size)}K.
 <p>Please add the following line to your .tcl configuration file
@@ -289,16 +289,6 @@ We'll need to create a site-wide administrator for your server (like the root
 user in UNIX). Please type in the email address, first and last name, and password
 for this user.
 
-<p>
-<font color=red>Please do not use any non-ASCII characters
-(accented characters, Umlaut, Asian etc...)
-in the fields below. This will break the installation process.
-</font>
-<br>
-This restriction is only for the screen below. You can modify
-the name of the system administrator later.
-</p>
-
 <script language=\"javascript\">
 function updateSystemEmails() {
     var form = document.forms\[0\];
@@ -311,7 +301,7 @@ function updateSystemEmails() {
 }
 </script>
 
-<form action=\"installer/install\">
+<form action=\"installer/install\" method=\"POST\">
 
 <table>
 <tr>

installer/install.tcl

@@ -51,33 +51,6 @@ if { ![install_good_data_model_p] } {
 
 install_do_packages_install
 
-##############
-#
-# Load message catalogs
-#
-#############
-
-# Doing this before restart so that keys are available in init files on startup
-ns_write "<p>Loading message catalogs..."
-lang::catalog::import -initialize
-ns_write "  <p>Done.<p>"
-
-##############
-#
-# Secret tokens
-#
-#############
-
-ns_write "<p>Generating secret tokens..."
-populate_secret_tokens_db
-ns_write "  <p>Done.<p>"
-
-##############
-#
-# Admin create
-#
-#############
-
 if { [empty_string_p $username] } {
     set username $email
 }
@@ -123,8 +96,39 @@ Please <a href=\"javascript:history.back()\">try again</a>.
     rename util_memoize_flush {}
     rename util_memoize_flush_saved util_memoize_flush
   }
+  ad_conn -set user_id $user_id
+}
+
+# Now process the application bundle if an install.xml file was found.
+
+if { [file exists "[acs_root_dir]/install.xml"] } {
+    set output [apm::process_install_xml "/install.xml" {}]
+    ns_write "<p>[join $output "</p><p>"]</p>"
 }
 
+
+##############
+#
+# Load message catalogs
+#
+#############
+
+
+# Doing this before restart so that keys are available in init files on startup
+ns_write "<p>Loading message catalogs..."
+lang::catalog::import -initialize
+ns_write "  <p>Done.<p>"
+
+##############
+#
+# Secret tokens
+#
+#############
+
+ns_write "<p>Generating secret tokens..."
+populate_secret_tokens_db
+ns_write "  <p>Done.<p>"
+
 ##############
 #
 # System settings
@@ -150,10 +154,7 @@ foreach { var param } {
 
 # set the Main Site RestrictToSSL parameter
 
-set main_site_id [db_string main_site_id_select { 
-    select package_id from apm_packages
-    where instance_name = 'Main Site' 
-}]
+set main_site_id [subsite::main_site_id]
 
 ad_parameter -set "acs-admin/*" -package_id $main_site_id RestrictToSSL
 ad_parameter -set $new_registrations -package_id $main_site_id NewRegistrationEmailAddress

tcl/20-db-bootstrap-procs.tcl

@@ -103,7 +103,7 @@ ad_proc db_bootstrap_set_db_type { errors } {
     # in all cases...
 
     nsv_set ad_known_database_types . \
-        [list [list "oracle" "Oracle8" "Oracle8"] [list "postgresql" "PostgreSQL" "PostgreSQL"]]
+        [list [list "oracle" "Oracle" "Oracle"] [list "postgresql" "PostgreSQL" "PostgreSQL"]]
 
     #
     # Initialize the list of available pools
@@ -219,12 +219,18 @@ ad_proc db_bootstrap_set_db_type { errors } {
                 ns_log Error "$proc_name: RDBMS type could not be determined: $errmsg"
             } else {
                 foreach known_database_type [nsv_get ad_known_database_types .] {
-                    if { ![string compare $driver [lindex $known_database_type 1]] } {
+
+                    set this_type [lindex $known_database_type 1]
+
+                    # we do a string match here, because we want to
+                    # match against Oracle, Oracle8, Oracle10, etc..
+                    if { [string match ${this_type}* $driver] } {
                         set this_suffix [lindex $known_database_type 0]
                         break
                     }
                 }
             }
+
             ns_db releasehandle $db
             if { [string length $this_suffix] == 0 } {
                 ns_log Notice "$proc_name: couldn't determine RDBMS type of database pool \"$pool\"."

tcl/30-apm-load-procs.tcl

@@ -207,7 +207,6 @@ ad_proc -public apm_get_package_files {
 
     set matching_files [list]
     foreach file $files {
-
         set rel_path [string range $file [expr [string length $package_path] + 1] end]
         set file_type [apm_guess_file_type $package_key $rel_path]
         set file_db_type [apm_guess_db_type $package_key $rel_path]