* simplified declaration of base classes via 'use base'

* simplified checking for correct API-version of modules


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1072 95ad53e4-c205-0410-b2fa-d234c58c8868

23 files changed, 66 insertions, 82 deletions

diff --git a/config-db/OpenSLX/MetaDB/Base.pm b/config-db/OpenSLX/MetaDB/Base.pm
index ac15ac52..db1f2e7e 100644
--- a/config-db/OpenSLX/MetaDB/Base.pm
+++ b/config-db/OpenSLX/MetaDB/Base.pm
@@ -16,7 +16,7 @@ package OpenSLX::MetaDB::Base;
 use strict;
 
 use vars qw($VERSION);
-$VERSION = 1;		# API-version
+$VERSION = 1.01;		# API-version . implementation-version
 
 use Carp;
 
diff --git a/config-db/OpenSLX/MetaDB/CSV.pm b/config-db/OpenSLX/MetaDB/CSV.pm
index 9d1418f4..94335d25 100644
--- a/config-db/OpenSLX/MetaDB/CSV.pm
+++ b/config-db/OpenSLX/MetaDB/CSV.pm
@@ -13,8 +13,9 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::MetaDB::CSV;
 
+use strict;
 use vars qw($VERSION);
-$VERSION = 1;		# API-version
+$VERSION = 1.01;		# API-version . implementation-version
 use base qw(OpenSLX::MetaDB::DBI);
 
 ################################################################################
@@ -28,12 +29,8 @@ use Carp;
 use Fcntl qw(:DEFAULT :flock);
 use DBD::CSV 0.22;
 use OpenSLX::Basics;
+use OpenSLX::MetaDB::DBI 1;
 
-my $superVersion = $OpenSLX::MetaDB::DBI::VERSION;
-if ($superVersion < $VERSION) {
-	confess _tr("Unable to load module '%s' (Version '%s' required, but '%s' found)",
-				'OpenSLX::MetaDB::DBI', $VERSION, $superVersion);
-}
 ################################################################################
 ### implementation
 ################################################################################
diff --git a/config-db/OpenSLX/MetaDB/DBI.pm b/config-db/OpenSLX/MetaDB/DBI.pm
index 31f70350..e59c9996 100644
--- a/config-db/OpenSLX/MetaDB/DBI.pm
+++ b/config-db/OpenSLX/MetaDB/DBI.pm
@@ -15,18 +15,13 @@ package OpenSLX::MetaDB::DBI;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = 1;		# API-version
+$VERSION = 1.01;		# API-version . implementation-version
 use base qw(OpenSLX::MetaDB::Base);
 
 use Carp;
 use DBI;
 use OpenSLX::Basics;
-
-my $superVersion = $OpenSLX::MetaDB::Base::VERSION;
-if ($superVersion < $VERSION) {
-	confess _tr('Unable to load module <%s> (Version <%s> required, but <%s> found)',
-				'OpenSLX::MetaDB::Base', $VERSION, $superVersion);
-}
+use OpenSLX::MetaDB::Base 1;
 
 ################################################################################
 ### basics
diff --git a/config-db/OpenSLX/MetaDB/SQLite.pm b/config-db/OpenSLX/MetaDB/SQLite.pm
index 673ae1c0..147b2061 100644
--- a/config-db/OpenSLX/MetaDB/SQLite.pm
+++ b/config-db/OpenSLX/MetaDB/SQLite.pm
@@ -13,8 +13,9 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::MetaDB::SQLite;
 
+use strict;
 use vars qw($VERSION);
-$VERSION = 1;		# API-version
+$VERSION = 1.01;		# API-version . implementation-version
 use base qw(OpenSLX::MetaDB::DBI);
 
 ################################################################################
@@ -25,12 +26,7 @@ use strict;
 use Carp;
 use DBD::SQLite;
 use OpenSLX::Basics;
-
-my $superVersion = $OpenSLX::MetaDB::DBI::VERSION;
-if ($superVersion < $VERSION) {
-	confess _tr('Unable to load module <%s> (Version <%s> required, but <%s> found)',
-				'OpenSLX::MetaDB::DBI', $VERSION, $superVersion);
-}
+use OpenSLX::MetaDB::DBI 1;
 
 ################################################################################
 ### implementation
diff --git a/config-db/OpenSLX/MetaDB/mysql.pm b/config-db/OpenSLX/MetaDB/mysql.pm
index 2d0c15d9..231e1bda 100644
--- a/config-db/OpenSLX/MetaDB/mysql.pm
+++ b/config-db/OpenSLX/MetaDB/mysql.pm
@@ -13,8 +13,9 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::MetaDB::mysql;
 
+use strict;
 use vars qw($VERSION);
-$VERSION = 1;		# API-version
+$VERSION = 1.01;		# API-version . implementation-version
 use base qw(OpenSLX::MetaDB::DBI);
 
 ################################################################################
@@ -25,12 +26,7 @@ use strict;
 use Carp;
 use DBD::mysql;
 use OpenSLX::Basics;
-
-my $superVersion = $OpenSLX::MetaDB::DBI::VERSION;
-if ($superVersion < $VERSION) {
-	confess _tr('Unable to load module <%s> (Version <%s> required, but <%s> found)',
-				'OpenSLX::MetaDB::DBI', $VERSION, $superVersion);
-}
+use OpenSLX::MetaDB::DBI 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/Distro/Any.pm b/installer/OpenSLX/OSExport/Distro/Any.pm
index f98fecac..828e4990 100644
--- a/installer/OpenSLX/OSExport/Distro/Any.pm
+++ b/installer/OpenSLX/OSExport/Distro/Any.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::Distro::Any;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSExport::Distro::Base 1.01;
+use OpenSLX::OSExport::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/Distro/Debian.pm b/installer/OpenSLX/OSExport/Distro/Debian.pm
index 2cb107fc..35e7f4c9 100644
--- a/installer/OpenSLX/OSExport/Distro/Debian.pm
+++ b/installer/OpenSLX/OSExport/Distro/Debian.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::Distro::Debian;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSExport::Distro::Base 1.01;
+use OpenSLX::OSExport::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/Distro/Fedora.pm b/installer/OpenSLX/OSExport/Distro/Fedora.pm
index 2e986168..9374678d 100644
--- a/installer/OpenSLX/OSExport/Distro/Fedora.pm
+++ b/installer/OpenSLX/OSExport/Distro/Fedora.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::Distro::Fedora;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSExport::Distro::Base 1.01;
+use OpenSLX::OSExport::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/Distro/Gentoo.pm b/installer/OpenSLX/OSExport/Distro/Gentoo.pm
index 7a1eb266..c7d4575f 100644
--- a/installer/OpenSLX/OSExport/Distro/Gentoo.pm
+++ b/installer/OpenSLX/OSExport/Distro/Gentoo.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::Distro::Gentoo;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSExport::Distro::Base 1.01;
+use OpenSLX::OSExport::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/Distro/SUSE.pm b/installer/OpenSLX/OSExport/Distro/SUSE.pm
index 923f1de8..96164b2d 100644
--- a/installer/OpenSLX/OSExport/Distro/SUSE.pm
+++ b/installer/OpenSLX/OSExport/Distro/SUSE.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::Distro::SUSE;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSExport::Distro::Base 1.01;
+use OpenSLX::OSExport::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index 9b39df80..409bb0cf 100644
--- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::Distro::Ubuntu;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSExport::Distro::Base 1.01;
+use OpenSLX::OSExport::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
index a581bfcc..f721d6d2 100644
--- a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
@@ -13,8 +13,8 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::ExportType::NBD_Squash;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::ExportType::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::ExportType::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
@@ -22,7 +22,7 @@ use Carp;
 use File::Basename;
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:support);
-use OpenSLX::OSExport::ExportType::Base 1.01;
+use OpenSLX::OSExport::ExportType::Base 1;
 use OpenSLX::Utils;
 
 ################################################################################
diff --git a/installer/OpenSLX/OSExport/ExportType/NFS.pm b/installer/OpenSLX/OSExport/ExportType/NFS.pm
index 25cea211..e3cd9cce 100644
--- a/installer/OpenSLX/OSExport/ExportType/NFS.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NFS.pm
@@ -13,8 +13,8 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::ExportType::NFS;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSExport::ExportType::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSExport::ExportType::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
@@ -23,7 +23,7 @@ use File::Basename;
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:support);
 use OpenSLX::Utils;
-use OpenSLX::OSExport::ExportType::Base 1.01;
+use OpenSLX::OSExport::ExportType::Base 1;
 
 ################################################################################
 ### interface methods
diff --git a/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm b/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm
index 315d3c43..80651a15 100644
--- a/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::Any_Clone;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm b/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm
index 31d2d145..f2e38868 100644
--- a/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::Fedora_6;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Distro/Fedora_6_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/Fedora_6_x86_64.pm
index 24eb512d..00125f47 100644
--- a/installer/OpenSLX/OSSetup/Distro/Fedora_6_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Fedora_6_x86_64.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::Fedora_6_x86_64;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
index d9fa78f6..66de610f 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::SUSE_10_1;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
index fd74f4cd..7675be79 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::SUSE_10_1_x86_64;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
index f67a8fba..b65bf5f7 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::SUSE_10_2;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
index 9df9f855..aff06f2c 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::SUSE_10_2_x86_64;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Distro::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Distro::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Distro::Base 1.01;
+use OpenSLX::OSSetup::Distro::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
index 315b53d5..c4b9735d 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::MetaPackager::smart;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::MetaPackager::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::MetaPackager::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::MetaPackager::Base 1.01;
+use OpenSLX::OSSetup::MetaPackager::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index a6011f67..cf68122a 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::MetaPackager::yum;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::MetaPackager::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::MetaPackager::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::MetaPackager::Base 1.01;
+use OpenSLX::OSSetup::MetaPackager::Base 1;
 
 ################################################################################
 ### implementation
diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm
index 63c49e47..d689f160 100644
--- a/installer/OpenSLX/OSSetup/Packager/rpm.pm
+++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Packager::rpm;
 
-use vars qw(@ISA $VERSION);
-@ISA = ('OpenSLX::OSSetup::Packager::Base');
+use vars qw($VERSION);
+use base qw(OpenSLX::OSSetup::Packager::Base);
 $VERSION = 1.01;		# API-version . implementation-version
 
 use strict;
 use Carp;
 use OpenSLX::Basics;
-use OpenSLX::OSSetup::Packager::Base 1.01;
+use OpenSLX::OSSetup::Packager::Base 1;
 
 ################################################################################
 ### implementation