From 13c56144de5731344228a0ca2a77d63ffbdd8b39 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 15 Jul 2010 14:35:13 -0700 Subject: [PATCH] Fix bootstrapping problem with upgrade into WebGUI8 --- lib/WebGUI/Session.pm | 2 +- .../7.9.9-8.0.0/addMaintenancePageToConfig.pl | 14 ------- .../upgrades/7.9.9-8.0.0/migrateToNewCache.pl | 36 ------------------ .../upgrades/7.9.9-8.0.0/moveFileLocations.pl | 20 ---------- share/upgrades/7.9.9-8.0.0/moveMaintenance.pl | 13 ------- share/upgrades/7.9.9-8.0.0/removeAdminBar.pl | 10 ----- ...ot_import_default-asset-subscription.wgpkg | Bin 907 -> 0 bytes 7 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 share/upgrades/7.9.9-8.0.0/addMaintenancePageToConfig.pl delete mode 100644 share/upgrades/7.9.9-8.0.0/migrateToNewCache.pl delete mode 100644 share/upgrades/7.9.9-8.0.0/moveFileLocations.pl delete mode 100644 share/upgrades/7.9.9-8.0.0/moveMaintenance.pl delete mode 100644 share/upgrades/7.9.9-8.0.0/removeAdminBar.pl delete mode 100644 share/upgrades/7.9.9-8.0.0/root_import_default-asset-subscription.wgpkg diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index a06705e0f..81dabc7be 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -122,7 +122,7 @@ Returns a CHI object, configured according to the settings in the config file. sub cache { my $self = shift; unless (exists $self->{_cache}) { - my $cacheConf = $self->config->get('cache'); + my $cacheConf = $self->config->get('cache') || { driver => "Memory", global => 1 }; # Default values my $resolveConf = sub { diff --git a/share/upgrades/7.9.9-8.0.0/addMaintenancePageToConfig.pl b/share/upgrades/7.9.9-8.0.0/addMaintenancePageToConfig.pl deleted file mode 100644 index e35052024..000000000 --- a/share/upgrades/7.9.9-8.0.0/addMaintenancePageToConfig.pl +++ /dev/null @@ -1,14 +0,0 @@ -use WebGUI::Upgrade::Script; - -use File::Basename; -use Cwd qw(realpath); -use File::Spec::Functions; -use WebGUI::Paths; - -start_step "Moving preload files"; - -my $webgui_root = realpath( catdir( dirname( $INC{'WebGUI/Upgrade/Script.pm'} ), (updir) x 3 ) ); - -config->set('maintenancePage', catfile( $webgui_root, 'www', 'maintenance.html' )); - -done; diff --git a/share/upgrades/7.9.9-8.0.0/migrateToNewCache.pl b/share/upgrades/7.9.9-8.0.0/migrateToNewCache.pl deleted file mode 100644 index 5241484e0..000000000 --- a/share/upgrades/7.9.9-8.0.0/migrateToNewCache.pl +++ /dev/null @@ -1,36 +0,0 @@ -use WebGUI::Upgrade::Script; -use Module::Find; - -start_step "Migrating to new cache"; - -rm_lib - findallmod('WebGUI::Cache'), - 'WebGUI::Workflow::Activity::CleanDatabaseCache', - 'WebGUI::Workflow::Activity::CleanFileCache', -; - -config->set("cache", { - 'driver' => 'FastMmap', - 'expires_variance' => '0.10', - 'root_dir' => '/tmp/WebGUICache', -}); - -config->set('hotSessionFlushToDb', 600); -config->delete('disableCache'); -config->delete('cacheType'); -config->delete('fileCacheRoot'); -config->deleteFromArray('workflowActivities/None', 'WebGUI::Workflow::Activity::CleanDatabaseCache'); -config->deleteFromArray('workflowActivities/None', 'WebGUI::Workflow::Activity::CleanFileCache'); - -sql 'DROP TABLE IF EXISTS cache'; -sql 'DELETE FROM WorkflowActivity WHERE className in (?,?)', - 'WebGUI::Workflow::Activity::CleanDatabaseCache', - 'WebGUI::Workflow::Activity::CleanFileCache', -; -sql 'DELETE FROM WorkflowActivityData WHERE activityId IN (?,?)', - 'pbwfactivity0000000002', - 'pbwfactivity0000000022', -; - -done; - diff --git a/share/upgrades/7.9.9-8.0.0/moveFileLocations.pl b/share/upgrades/7.9.9-8.0.0/moveFileLocations.pl deleted file mode 100644 index f468869c7..000000000 --- a/share/upgrades/7.9.9-8.0.0/moveFileLocations.pl +++ /dev/null @@ -1,20 +0,0 @@ -use WebGUI::Upgrade::Script; - -use File::Basename; -use Cwd qw(realpath); -use File::Spec::Functions; -use WebGUI::Paths; - -start_step "Moving preload files"; - -my $webgui_root = realpath( catdir( dirname( $INC{'WebGUI/Upgrade/Script.pm'} ), (updir) x 3 ) ); - -unlink catfile($webgui_root, 'lib', 'default.ttf'); - -unlink catfile($webgui_root, 'sbin', 'preload.custom.example'); -unlink catfile($webgui_root, 'sbin', 'preload.exclude.example'); - -rename catfile($webgui_root, 'sbin', 'preload.custom'), WebGUI::Paths->preloadCustom; -rename catfile($webgui_root, 'sbin', 'preload.exclude'), WebGUI::Paths->preloadExclusions; - -done; diff --git a/share/upgrades/7.9.9-8.0.0/moveMaintenance.pl b/share/upgrades/7.9.9-8.0.0/moveMaintenance.pl deleted file mode 100644 index 0c9fdc26a..000000000 --- a/share/upgrades/7.9.9-8.0.0/moveMaintenance.pl +++ /dev/null @@ -1,13 +0,0 @@ -use WebGUI::Upgrade::Script; - -use File::Spec::Functions; -use File::Basename; -use Cwd qw(realpath); - -my $webgui_root = realpath( catdir( dirname( $INC{'WebGUI/Upgrade/Script.pm'} ), (updir) x 3 ) ); - -start_step "Moving maintenance file"; - -unlink catfile($webgui_root, 'docs', 'maintenance.html'); - -done; diff --git a/share/upgrades/7.9.9-8.0.0/removeAdminBar.pl b/share/upgrades/7.9.9-8.0.0/removeAdminBar.pl deleted file mode 100644 index f22ac158e..000000000 --- a/share/upgrades/7.9.9-8.0.0/removeAdminBar.pl +++ /dev/null @@ -1,10 +0,0 @@ - -use WebGUI::Upgrade::Script; - - -report "\tRemoving Admin Bar... "; - -session->config->delete( 'macros/AdminBar' ); - - -done; diff --git a/share/upgrades/7.9.9-8.0.0/root_import_default-asset-subscription.wgpkg b/share/upgrades/7.9.9-8.0.0/root_import_default-asset-subscription.wgpkg deleted file mode 100644 index f04fa276d90806b8916b4496a98c417a82e6f78a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 907 zcmV;619bc!iwFP!00000|Ls=aPunmM?lXTyl&4J^;Ph8$HzC1*Q3+5rT96nUauc^T zP3_EfTDpn6dubYN_Nb z7AbjN)vNoYTJ_5%$MZ-TK47x>m1sj1Kni5U#pwBXiDpVaf1D--3zNg|U#`BUBSh`l z-&%d=UQ6+!5W#!B4thVMf2CS^s(+3sYC0nfFOiVj$DD^@aQ%5a7k(M{?p;b&~ZqV%TgxoDkkM^u~Rhgd4Z z!UMDrNfa%P1H~YEcsN75inYrFx5DEG3J?*&k|lJn!Cf~_dJ)${7Fz2On@yz(F`jF; z1)E-T5y~k>BlbYggp4&`#m63uqNj|89Xil$8jK(cWVnQ6>CVcjoC>D8Fhg2s=@xRN zS~HVxM|^xf8tsw(`C+C1^Wx^J@72pwi!f0cwMt5}%f~69yCLh-Br@CRXIm#d9Vi|f zE`_z@x~-&k{ke^N@JI%L=e?gbZLNN13P&0(NrNRzyw3Ntr~G zf_8eu;|pm3M}RUsB?lTj>7;D`bF7q~Bx@uZL+?+DeTJ2H$$w?;YL%KzHl_-S9>YAN zL9=<okIX zfi7Q2Zu5b^0a^dgrvZj3xYt8DZHW`9#u-}$RRmO{j%kq5gvuW1m<49H*cCPw6M>q= zro9HnyaVkla%~^|Paj(Ac^BH9MGsnNh7R(HHR;^nRQ;sfnIzkH59B@^OwPIkdz0(S znFhE|dEz>I57w10N;Fr#_>AB?v8)|b8}Z9tVLCy{!92*}wGXj4v1u1SWeabiXO1s@ h?jE-uw_f6Hee?0gz#9W^47_Fr{s22PvdaJv000d+w}k)z