backporting subclassification of OpenSRF::Application

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@8066 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application.pm b/Open-ILS/src/perlmods/OpenILS/Application.pm
new file mode 100644 (file)
index 0000000..c7d05e1
--- /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 8a68fb8..3d3ca48 100644 (file)
--- 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 65143aa..831dc4e 100644 (file)
--- 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 216ee3d..11c99ee 100644 (file)
--- 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 42220d2..0fd5eb3 100644 (file)
--- 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 bed1bc2..b06fc5f 100644 (file)
--- 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 0c53073..adde626 100644 (file)
--- 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 e70180b..39285ca 100644 (file)
--- 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 1345bdb..094ae47 100644 (file)
--- 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 e2423e5..c355c0e 100644 (file)
--- 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 915c35d..0061d7c 100644 (file)
--- 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 bd2bbcc..fcce7e4 100644 (file)
--- 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 f3f3ce3..65f95c9 100644 (file)
--- 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 978e946..ede7e26 100644 (file)
--- 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;