DBsqlite and GosaSupportDaemon moved to namespace GOSA::DBsqlite and GOSA::GosaSuppor...

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8186 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index d45e64bc37c9cb44fce0e0ae66ec4b0a70966eda..141aa3e1d80b3262db6ebd05e912a4db76c92cea 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -35,7 +35,7 @@ use Data::Dumper;
 use Sys::Syslog qw( :DEFAULT setlogsock);
 use File::Spec;
 use Cwd;
-use GosaSupportDaemon;
+use GOSA::GosaSupportDaemon;
 
 
 my ($cfg_file, %cfg_defaults, $foreground, $verbose, $pid_file, $procid, $pid, $log_file);

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 9ce9b088c2c24469bb550c19a520d357e705bde0..c3e79fb3ee3a69656e85a8f4e5bee8ab9b02a58b 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -38,10 +38,11 @@ use Cwd;
 use File::Spec;
 use IPC::Shareable qw( :lock);
 IPC::Shareable->clean_up_all;
-use GosaSupportDaemon;
+use GOSA::GosaSupportDaemon;
+use GOSA::DBsqlite;
 
-use lib "/etc/gosa-si/modules";
-my $modules_path = "/etc/gosa-si/modules";
+my $modules_path = "/usr/lib/gosa-si/modules";
+use lib "/usr/lib/gosa-si/modules";
 
 my (%cfg_defaults, $foreground, $verbose, $ping_timeout);
 my ($bus, $msg_to_bus, $bus_cipher);
@@ -967,7 +968,7 @@ close( LOCK_FILE );
 # check wether all modules are gosa-si valid passwd check
 
 # connect to gosa-si job queue
-my $job_db = DBsqlite->new($job_queue_file_name);
+my $job_db = GOSA::DBsqlite->new($job_queue_file_name);
 
 # create reading and writing vectors
 my $rbits = my $wbits = my $ebits = "";

diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm
index f82a0d9738fdab6b2561b63afd171c3a5646edc6..46d13beaa74130331f1f93e7be070110652fe4bd 100644 (file)
--- a/gosa-si/modules/DBsqlite.pm
+++ b/gosa-si/modules/DBsqlite.pm
@@ -1,4 +1,4 @@
-package DBsqlite;
+package GOSA::DBsqlite;
 
 
 use strict;

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index a326fdba509900ce1f984cf01d325255ec4c0d24..d6eb36525415ed42c42f62993dce3f9ec50a10cb 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -5,11 +5,11 @@ use Exporter;
 
 use strict;
 use warnings;
-use GosaSupportDaemon;
+use GOSA::GosaSupportDaemon;
 use IO::Socket::INET;
 use XML::Simple;
 use File::Spec;
-use DBsqlite;
+use GOSA::DBsqlite;
 
 BEGIN{}
 END{}
@@ -87,7 +87,7 @@ if ($gosa_activ eq "on") {
 my @col_names = ("id", "timestamp", "status", "result", "header", 
                 "target", "xml", "mac");
 my $table_name = "jobs";
-my $sqlite = DBsqlite->new($job_queue_file_name);
+my $sqlite = GOSA::DBsqlite->new($job_queue_file_name);
 $sqlite->create_table($table_name, \@col_names);
 
 

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 37da24aa91abecf8472b9dfefc327ad5012c942b..35ba608f23c87cc8f1abc0fda9c043ff209cd810 100644 (file)
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -1,4 +1,4 @@
-package GosaSupportDaemon;
+package GOSA::GosaSupportDaemon;
 
 use Exporter;
 @ISA = qw(Exporter);

diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm
index 874aaa472da195140347bb9418882121e10a1eec..7dba3b8c7778dd579b4355d0694e220f093d7db4 100644 (file)
--- a/gosa-si/modules/ServerPackages.pm
+++ b/gosa-si/modules/ServerPackages.pm
@@ -8,7 +8,7 @@ use Exporter;
 
 use strict;
 use warnings;
-use GosaSupportDaemon;
+use GOSA::GosaSupportDaemon;
 use IO::Socket::INET;
 use XML::Simple;