From 66ef7bb1a8271fdcbd4558786fa99f1f0a4ca944 Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 15 Nov 2007 04:23:24 +0000 Subject: [PATCH] backporting subclassification of OpenSRF::Application git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@8066 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application.pm | 16 ++++++++++++++++ Open-ILS/src/perlmods/OpenILS/Application/Actor.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Auth.pm | 4 ++-- Open-ILS/src/perlmods/OpenILS/Application/Cat.pm | 4 ++-- Open-ILS/src/perlmods/OpenILS/Application/Circ.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Collections.pm | 4 ++-- Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Penalty.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Proxy.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Search.pm | 3 ++- Open-ILS/src/perlmods/OpenILS/Application/Storage.pm | 4 ++-- Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm | 4 ++-- 14 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 Open-ILS/src/perlmods/OpenILS/Application.pm diff --git a/Open-ILS/src/perlmods/OpenILS/Application.pm b/Open-ILS/src/perlmods/OpenILS/Application.pm new file mode 100644 index 0000000000..c7d05e15b4 --- /dev/null +++ b/Open-ILS/src/perlmods/OpenILS/Application.pm @@ -0,0 +1,16 @@ +package OpenILS::Application; +use OpenSRF::Application; +use base qw/OpenSRF::Application/; + +sub ils_version { + return "1-2"; +} + +__PACKAGE__->register_method( + api_name => 'opensrf.open-ils.system.ils_version', + api_level => 1, + method => 'ils_version', +); + +1; + diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index 8a68fb8943..3d3ca48e3a 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -1,5 +1,6 @@ package OpenILS::Application::Actor; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use strict; use warnings; use Data::Dumper; $Data::Dumper::Indent = 0; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm index 65143aa659..831dc4ebe8 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm @@ -1,6 +1,7 @@ package OpenILS::Application::AppUtils; use strict; use warnings; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use OpenSRF::Utils::Cache; use OpenSRF::Utils::Logger qw/$logger/; use OpenILS::Utils::ModsParser; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Auth.pm b/Open-ILS/src/perlmods/OpenILS/Application/Auth.pm index 216ee3d1bb..11c99ee91b 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Auth.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Auth.pm @@ -1,7 +1,7 @@ use strict; use warnings; package OpenILS::Application::Auth; -use OpenSRF::Application; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use OpenSRF::Utils::Cache; use Digest::MD5 qw(md5_hex); use OpenSRF::Utils::Logger qw(:level); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm index 42220d270f..0fd5eb35aa 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm @@ -1,10 +1,10 @@ use strict; use warnings; package OpenILS::Application::Cat; use OpenILS::Application::AppUtils; -use OpenSRF::Application; +use OpenILS::Application; use OpenILS::Application::Cat::Utils; use OpenILS::Application::Cat::Merge; -use base qw/OpenSRF::Application/; +use base qw/OpenILS::Application/; use Time::HiRes qw(time); use OpenSRF::EX qw(:try); use OpenSRF::Utils::JSON; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm index bed1bc2b5f..b06fc5ff23 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm @@ -1,5 +1,6 @@ package OpenILS::Application::Circ; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use strict; use warnings; use OpenILS::Application::Circ::Circulate; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm b/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm index 0c53073a0b..adde626ed0 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm @@ -3,9 +3,9 @@ use strict; use warnings; use OpenSRF::EX qw(:try); use OpenILS::Application::AppUtils; use OpenSRF::Utils::Logger qw(:logger); -use OpenSRF::Application; +use OpenILS::Application; use OpenILS::Utils::Fieldmapper; -use base 'OpenSRF::Application'; +use base 'OpenILS::Application'; use OpenILS::Utils::CStoreEditor qw/:funcs/; use OpenILS::Event; use OpenILS::Const qw/:const/; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm b/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm index e70180bf19..39285ca389 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm @@ -1,5 +1,6 @@ package OpenILS::Application::Ingest; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use Unicode::Normalize; use OpenSRF::EX qw/:try/; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Penalty.pm b/Open-ILS/src/perlmods/OpenILS/Application/Penalty.pm index 1345bdba20..094ae477bb 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Penalty.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Penalty.pm @@ -10,7 +10,8 @@ use OpenSRF::Utils::SettingsClient; use OpenILS::Application::AppUtils; use OpenSRF::Utils::Logger qw(:logger); use OpenILS::Utils::CStoreEditor qw/:funcs/; -use base 'OpenSRF::Application'; +use OpenILS::Application; +use base 'OpenILS::Application'; my $U = "OpenILS::Application::AppUtils"; my $script; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Proxy.pm b/Open-ILS/src/perlmods/OpenILS/Application/Proxy.pm index e2423e5e20..c355c0e753 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Proxy.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Proxy.pm @@ -1,6 +1,7 @@ package OpenILS::Application::Proxy; use strict; use warnings; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use OpenSRF::EX qw(:try); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm b/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm index 915c35dd45..0061d7cc4d 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm @@ -1,5 +1,6 @@ package OpenILS::Application::Reporter; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use strict; use warnings; use OpenSRF::Utils::Logger qw/$logger/; use OpenILS::Utils::CStoreEditor qw/:funcs/; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search.pm index bd2bbcc0eb..fcce7e4816 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Search.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Search.pm @@ -1,5 +1,6 @@ package OpenILS::Application::Search; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use strict; use warnings; use OpenSRF::Utils::JSON; use OpenSRF::Utils::Logger qw(:logger); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage.pm index f3f3ce358e..65f95c9fe4 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage.pm @@ -1,6 +1,6 @@ package OpenILS::Application::Storage; -use OpenSRF::Application; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; use OpenSRF::EX qw/:try/; use OpenSRF::Utils::Logger qw/:level/; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm index 978e946ecb..ede7e269e3 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm @@ -5,8 +5,8 @@ use warnings; # All OpenSRF applications must be based on OpenSRF::Application or # a subclass thereof. Makes sense, eh? -use OpenSRF::Application; -use base qw/OpenSRF::Application/; +use OpenILS::Application; +use base qw/OpenILS::Application/; # This is the client class, used for connecting to open-ils.storage use OpenSRF::AppSession; -- 2.11.0