[Rt-commit] r9136 - in rt/branches/3.999-DANGEROUS: etc lib/RT sbin

[jesse at bestpractical.com]

Author: jesse
Date: Mon Sep 24 00:16:13 2007
New Revision: 9136

Added:
   rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm
Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/etc/config.yml
   rt/branches/3.999-DANGEROUS/sbin/rt-setup-database

Log:
 r67313 at pinglin:  jesse | 2007-09-14 13:08:35 -0400
 * now set up the core db objects in jifty bootstrap


Modified: rt/branches/3.999-DANGEROUS/etc/config.yml
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/config.yml	(original)
+++ rt/branches/3.999-DANGEROUS/etc/config.yml	Mon Sep 24 00:16:13 2007
@@ -6,7 +6,7 @@
   ApplicationUUID: EAFC6FF2-5E8D-11DC-9FAD-91A9684ED971
   ConfigFileVersion: 2
   Database: 
-    CheckSchema: 1
+    CheckSchema: 0
     Database: rt3
     Driver: mysql
     Host: localhost

Added: rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm
==============================================================================
--- (empty file)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm	Mon Sep 24 00:16:13 2007
@@ -0,0 +1,14 @@
+use RT::Bootstrap;
+use base qw/Jifty::Bootstrap/;
+
+sub run {
+    my $self = shift;
+    RT::connect_to_database();
+        RT::InitLogging();
+        RT::InitSystemObjects();
+ 
+    RT::Handle->InsertInitialData();
+
+}
+
+1;

Modified: rt/branches/3.999-DANGEROUS/sbin/rt-setup-database
==============================================================================
--- rt/branches/3.999-DANGEROUS/sbin/rt-setup-database	(original)
+++ rt/branches/3.999-DANGEROUS/sbin/rt-setup-database	Mon Sep 24 00:16:13 2007
@@ -43,7 +43,7 @@
     exit(-1);
 }
 foreach ( @actions ) {
-    unless ( /^(?:init|create|drop|schema|acl|coredata|insert)$/ ) {
+    unless ( /^(?:init|create|drop|schema|acl|insert)$/ ) {
         print STDERR "$0 called with an invalid --action parameter.\n";
         exit(-1);
     }
@@ -55,7 +55,7 @@
 
 # convert init to multiple actions
 if ( $actions[0] eq 'init' ) {
-    @actions = qw(create schema acl coredata insert);
+    @actions = qw(create schema acl insert);
     $args{'datafile'} ||= $RT::EtcPath . "/initialdata";
 }
 
@@ -126,14 +126,6 @@
         print "Now inserting database ACLs\n";
         Jifty->handle->InsertACL( $dbh, $args{'datadir'} ) # unless $db_type eq 'Oracle'
     }
-    elsif ( $action eq 'coredata' ) {
-        RT::connect_to_database();
-        RT::InitLogging();
-        RT::InitSystemObjects();
-
-        print "Now inserting RT core system objects\n";
-        Jifty->handle->InsertInitialData();
-    }
     elsif ( $action eq 'insert' ) {
         RT::Init();