Skip to content

GitLab

lemonldap-ng
lemonldap-ng
Commit cae4cbad authored by Yadd's avatar Yadd
Browse files
Options

LEMONLDAP::NG : New module Lemonldap::NG::Common. It contains Conf.pm and Cie

parent dd0c8157
Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 124 deletions
build/lemonldap-ng/Makefile
View file @ cae4cbad
......@@ -14,6 +14,7 @@ LDAPPORT="389"
LDAPSUFFIX="dc=example,dc=net"
# Other
VERSION=`head -n1 changelog |sed -e 's/lemonldap-ng (//' -e 's/).*$$//'`
SRCCOMMONDIR=lemonldap-ng-common
SRCHANDLERDIR=lemonldap-ng-handler
SRCPORTALDIR=lemonldap-ng-portal
SRCMANAGERDIR=lemonldap-ng-manager
......@@ -32,7 +33,11 @@ REALDESTFILECONFDIR=$(REALSYSTEMCONFDIR)conf/
REALDESTSESSIONDIR=$(REALSCRIPTSDIR)sessions/
REALDESTLASPDIR=$(REALSCRIPTSDIR)liberty-alliance-sp-portal
all: handler manager portal
all: common handler manager portal
common: common_conf
@$(MAKE) -C ${SRCCOMMONDIR}
@touch common
handler: handler_conf
@$(MAKE) -C ${SRCHANDLERDIR}
......@@ -46,7 +51,11 @@ manager: manager_conf
@$(MAKE) -C ${SRCMANAGERDIR}
@touch manager
configure: handler_conf portal_conf manager_conf
configure: common_conf handler_conf portal_conf manager_conf
common_conf:
@cd ${SRCCOMMONDIR}; perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
@touch common_conf
handler_conf:
@cd ${SRCHANDLERDIR}; perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
......@@ -60,18 +69,25 @@ manager_conf:
@cd ${SRCMANAGERDIR}; perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
@touch manager_conf
test: manager handler portal manager_test handler_test portal_test
test: common handler portal manager common_test handler_test portal_test manager_test
common_test: common
@$(MAKE) -C ${SRCCOMMONDIR} test
handler_test: handler common_test
@$(MAKE) -C ${SRCHANDLERDIR} test INST_ARCHLIB=../${SRCCOMMONDIR}/blib/lib/
manager_test: manager
@$(MAKE) -C ${SRCMANAGERDIR} test
portal_test: portal handler_test common_test
@$(MAKE) -C ${SRCPORTALDIR} test INST_ARCHLIB=../${SRCCOMMONDIR}/blib/lib/
handler_test: handler
@$(MAKE) -C ${SRCHANDLERDIR} test INST_ARCHLIB=../${SRCMANAGERDIR}/blib/lib/
manager_test: manager handler_test common_test
@$(MAKE) -C ${SRCMANAGERDIR} test INST_ARCHLIB=../${SRCCOMMONDIR}/blib/lib/
portal_test: portal
@$(MAKE) -C ${SRCPORTALDIR} test INST_ARCHLIB=../${SRCMANAGERDIR}/blib/lib/
install: common_install handler_install portal_install manager_install
install: handler_install portal_install manager_install
common_install: common
@$(MAKE) -C ${SRCCOMMONDIR} install
@touch common_install
handler_install: handler
@$(MAKE) -C ${SRCHANDLERDIR} install
......@@ -87,11 +103,15 @@ manager_install: manager
distclean: clean
clean: handler_clean portal_clean manager_clean
clean: common_clean handler_clean portal_clean manager_clean
@rm -rf ${SYSTEMCONFDIR}
@rm -rf ${SCRIPTSDIR}
@rm -vf *gz
common_clean:
- $(MAKE) -C ${SRCCOMMONDIR} distclean
@rm -vf common*
handler_clean:
- $(MAKE) -C ${SRCHANDLERDIR} distclean
@rm -vf handler*
......@@ -165,6 +185,10 @@ production_install: production_preconf example
uninstall: configure handler_uninstall portal_uninstall manager_uninstall
common_uninstall: common
@$(MAKE) -C ${SRCCOMMONDIR} uninstall
@rm -vf common_uninstall
handler_uninstall: handler
@$(MAKE) -C ${SRCHANDLERDIR} uninstall
@rm -vf handler_uninstall
......@@ -180,7 +204,7 @@ manager_uninstall: manager
dist: clean
@- $(MAKE) clean
@mkdir -p lemonldap-ng-$(VERSION)
@- cp -pR lemonldap-ng-manager/ lemonldap-ng-portal/ lemonldap-ng-handler/ * lemonldap-ng-$(VERSION)
@- cp -pR lemonldap-ng-common/ lemonldap-ng-manager/ lemonldap-ng-portal/ lemonldap-ng-handler/ * lemonldap-ng-$(VERSION)
@- dir=lemonldap-ng-$(VERSION); find $$dir -name .svn -exec rm -rf {} \; 2>/dev/null
@rm -rf lemonldap-ng-$(VERSION)/lemonldap-ng-$(VERSION)
@tar czf lemonldap-ng-$(VERSION).tar.gz lemonldap-ng-$(VERSION)
......@@ -189,7 +213,11 @@ dist: clean
debian-dist: dist
@mv lemonldap-ng-$(VERSION).tar.gz lemonldap-ng_$(VERSION).orig.tar.gz
cpan: clean configure handler_cpan portal_cpan manager_cpan
cpan: clean configure common_cpan handler_cpan portal_cpan manager_cpan
common_cpan: common_conf
@$(MAKE) -C ${SRCCOMMONDIR} dist
@mv ${SRCCOMMONDIR}/Lemonldap*.gz .
handler_cpan: handler_conf
@$(MAKE) -C ${SRCHANDLERDIR} dist
......
build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.install
View file @ cae4cbad
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Apache/*
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Conf*
debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Conf*
debian/tmp/usr/share/perl5/Lemonldap/NG/Common/Apache/*
debian/tmp/usr/share/perl5/Lemonldap/NG/Common/Conf*
debian/tmp/usr/share/man/man3/Lemonldap::NG::Common::Apache::Session::SOAP.3pm
debian/tmp/usr/share/man/man3/Lemonldap::NG::Common::Conf*
debian/tmp/usr/share/man/man1/lmConfig_File2MySQL.1p
debian/tmp/usr/bin/lmConfig* /usr/share/lemonldap-ng/bin
debian/configStorage.pm /usr/share/lemonldap-ng
......
build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install
View file @ cae4cbad
......@@ -11,7 +11,6 @@ debian/tmp/usr/share/perl5/auto/Lemonldap/NG/Manager
debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Base.3pm
debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager.3pm
debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::SOAPServer.3pm
debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Apache::Session::SOAP.3pm
debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Restricted.3pm
debian/tmp/var/lib/lemonldap-ng/manager/apply.conf /etc/lemonldap-ng
debian/manager-apache*.conf /etc/lemonldap-ng
......
build/lemonldap-ng/debian/rules
View file @ cae4cbad
......@@ -75,7 +75,7 @@ install: build
# System to use /etc/lemonldap-ng/storage.conf instead of setting
# manually the configStorage parameter
perl -000 -i -pe 's/(Lemonldap::NG::Manager::Conf.*new\s*\(\s*){[^}]+}/$$1\$$Lemonldap::NG::Conf::configStorage/; s#^use#\nrequire "/usr/share/lemonldap-ng/configStorage.pm";\nuse#m;' \
perl -000 -i -pe 's/(Lemonldap::NG::Common::Conf.*new\s*\(\s*){[^}]+}/$$1\$$Lemonldap::NG::Conf::configStorage/; s#^use#\nrequire "/usr/share/lemonldap-ng/configStorage.pm";\nuse#m;' \
$(DEB_TMP_LM_ROOT)manager/scripts/lmConfigEditor \
$(DEB_TMP_LM_ROOT)portal/scripts/purgeCentralCache
......
build/lemonldap-ng/lemonldap-ng-common 0 → 120000
View file @ cae4cbad
../../modules/lemonldap-ng-common
\ No newline at end of file
modules/lemonldap-ng-common/Changes 0 → 100644
View file @ cae4cbad
Revision history for Perl extension Lemonldap::NG::Common.
0.1 Mon Nov 17 16:34:56 2008
- New package including the old Lemonldap::NG::manager::Conf
modules/lemonldap-ng-common/MANIFEST 0 → 100644
View file @ cae4cbad
Changes
lib/Lemonldap/NG/Common.pm
lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm
lib/Lemonldap/NG/Common/Conf.pm
lib/Lemonldap/NG/Common/Conf/Constants.pm
lib/Lemonldap/NG/Common/Conf/DBI.pm
lib/Lemonldap/NG/Common/Conf/File.pm
lib/Lemonldap/NG/Common/Conf/SOAP.pm
Makefile.PL
MANIFEST
README
scripts/lmConfig_File2MySQL
t/01-Manager-Conf.t
t/02-Manager-Conf-File.t
t/03-Manager-Conf-DBI.t
t/04-Manager-Conf-SOAP.t
t/10-Common.t
modules/lemonldap-ng-common/Makefile.PL 0 → 100644
View file @ cae4cbad
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
WriteMakefile(
NAME => 'Lemonldap::NG::Common',
VERSION_FROM => 'lib/Lemonldap/NG/Common.pm', # finds $VERSION
PREREQ_PM => {
'DBI' => 0,
'Storable' => 0,
}, # e.g., Module::Name => 1.1
EXE_FILES => [
'scripts/lmConfig_File2MySQL',
],
($] >= 5.005 ? ## Add these new keywords supported since 5.005
(ABSTRACT_FROM => 'lib/Lemonldap/NG/Common.pm', # retrieve abstract from module
AUTHOR => 'guimard <guimard@>') : ()),
);
modules/lemonldap-ng-common/README 0 → 100644
View file @ cae4cbad
Lemonldap-NG-Common version 0.01
================================
Lemonldap::NG infrastructure common files
INSTALLATION
To install this module type the following:
perl Makefile.PL
make
make test
make install
DEPENDENCIES
This module requires these other modules and libraries:
blah blah blah
COPYRIGHT AND LICENCE
Copyright (C) 2008 by guimard
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself, either Perl version 5.10.0 or,
at your option, any later version of Perl 5 you may have available.
modules/lemonldap-ng-common/lib/Lemonldap/NG/Common.pm 0 → 100644
View file @ cae4cbad
package Lemonldap::NG::Common;
use strict;
require Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(
);
our $VERSION = '0.1';
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Lemonldap::NG::Common - Common files for Lemonldap::NG infrastructure
=head1 DESCRIPTION
Lemonldap::NG is a modular Web-SSO based on Apache::Session modules. It
simplifies the build of a protected area with a few changes in the application.
This package contains common files.
=head1 SEE ALSO
L<Lemonldap::NG::Manager>, L<Lemonldap::NG::Portal>, L<Lemonldap::NG::Handler>
=head1 AUTHOR
Xavier Guimard, E<lt>x.guimard@free.frE<gt>
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2008 by guimard
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself, either Perl version 5.10.0 or,
at your option, any later version of Perl 5 you may have available.
=cut
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Apache/Session/SOAP.pm → modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm
View file @ cae4cbad
package Lemonldap::NG::Manager::Apache::Session::SOAP;
package Lemonldap::NG::Common::Apache::Session::SOAP;
use strict;
use SOAP::Lite;
......@@ -10,7 +10,7 @@ our ( $user, $password ) = ( '', '' );
BEGIN {
sub SOAP::Transport::HTTP::Client::get_basic_credentials {
return $Lemonldap::NG::Manager::Apache::Session::SOAP::user => $Lemonldap::NG::Manager::Apache::Session::SOAP::password;
return $Lemonldap::NG::Common::Apache::Session::SOAP::user => $Lemonldap::NG::Common::Apache::Session::SOAP::password;
}
}
......@@ -146,7 +146,7 @@ __END__
=head1 NAME
Lemonldap::NG::Manager::Apache::Session::SOAP - Perl extension written to
Lemonldap::NG::Common::Apache::Session::SOAP - Perl extension written to
access to Lemonldap::NG Web-SSO sessions via SOAP.
=head1 SYNOPSIS
......@@ -161,7 +161,7 @@ access to Lemonldap::NG Web-SSO sessions via SOAP.
our @ISA = qw(Lemonldap::NG::Handler::Simple);
__PACKAGE__->init ({
globalStorage => 'Lemonldap::NG::Manager::Apache::Session::SOAP',
globalStorage => 'Lemonldap::NG::Common::Apache::Session::SOAP',
globalStorageOptions => {
proxy => 'http://manager/cgi-bin/soapserver.pl',
proxyOptions => {
......@@ -178,7 +178,7 @@ access to Lemonldap::NG Web-SSO sessions via SOAP.
use Lemonldap::NG::Portal::SharedConf;
my $portal = new Lemonldap::NG::Portal::SharedConf (
globalStorage => 'Lemonldap::NG::Manager::Apache::Session::SOAP',
globalStorage => 'Lemonldap::NG::Common::Apache::Session::SOAP',
globalStorageOptions => {
proxy => 'http://manager/cgi-bin/soapserver.pl',
proxyOptions => {
......@@ -198,18 +198,18 @@ manager.
=head1 DESCRIPTION
Lemonldap::NG::Manager::Conf provides a simple interface to access to
Lemonldap::NG::Common::Conf provides a simple interface to access to
Lemonldap::NG Web-SSO configuration. It is used by L<Lemonldap::NG::Handler>,
L<Lemonldap::NG::Portal> and L<Lemonldap::NG::Manager>.
Lemonldap::NG::Manager::Apache::Session::SOAP used with
Lemonldap::NG::Common::Apache::Session::SOAP used with
L<Lemonldap::NG::Manager::SOAPServer> provides the ability to acces to
Lemonldap::NG sessions via SOAP: They act as a proxy to access to the real
Apache::Session module (set as Lemonldap::NG::Manager::SOAPServer parameter).
=head2 SECURITY
As Lemonldap::NG::Manager::Conf::SOAP use SOAP::Lite, you have to see
As Lemonldap::NG::Common::Conf::SOAP use SOAP::Lite, you have to see
L<SOAP::Transport> to know arguments that can be passed to C<proxyOptions>.
Lemonldap::NG provides a system for HTTP basic authentication.
......@@ -272,7 +272,7 @@ set environment variables.
=head1 SEE ALSO
L<Lemonldap::NG::Manager::SOAPServer>,
L<Lemonldap::NG::Manager>, L<Lemonldap::NG::Manager::Conf::SOAP>,
L<Lemonldap::NG::Manager>, L<Lemonldap::NG::Common::Conf::SOAP>,
L<Lemonldap::NG::Handler>, L<Lemonldap::NG::Portal>,
http://wiki.lemonldap.objectweb.org/xwiki/bin/view/NG/Presentation
......
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm → modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View file @ cae4cbad
package Lemonldap::NG::Manager::Conf;
package Lemonldap::NG::Common::Conf;
use strict;
no strict 'refs';
use Data::Dumper;
use Lemonldap::NG::Manager::Conf::Constants;
use Lemonldap::NG::Common::Conf::Constants;
our $VERSION = 0.51;
our @ISA;
......@@ -24,7 +24,7 @@ sub new {
print STDERR "configStorage: type is not defined\n";
return 0;
}
$self->{type} = "Lemonldap::NG::Manager::Conf::$self->{type}"
$self->{type} = "Lemonldap::NG::Common::Conf::$self->{type}"
unless $self->{type} =~ /^Lemonldap/;
eval "require $self->{type}";
die($@) if ($@);
......@@ -142,23 +142,23 @@ __END__
=head1 NAME
Lemonldap::NG::Manager::Conf - Perl extension written to manage Lemonldap::NG
Lemonldap::NG::Common::Conf - Perl extension written to manage Lemonldap::NG
Web-SSO configuration.
=head1 SYNOPSIS
use Lemonldap::NG::Manager::Conf;
my $confAccess = new Lemonldap::NG::Manager::Conf(
use Lemonldap::NG::Common::Conf;
my $confAccess = new Lemonldap::NG::Common::Conf(
{
type=>'File',
dirName=>"/tmp/",
},
) or die "Unable to build Lemonldap::NG::Manager::Conf, see Apache logs";
) or die "Unable to build Lemonldap::NG::Common::Conf, see Apache logs";
my $config = $confAccess->getConf();
=head1 DESCRIPTION
Lemonldap::NG::Manager::Conf provides a simple interface to access to
Lemonldap::NG::Common::Conf provides a simple interface to access to
Lemonldap::NG Web-SSO configuration. It is used by L<Lemonldap::NG::Handler>,
L<Lemonldap::NG::Portal> and L<Lemonldap::NG::Manager>.
......@@ -172,14 +172,14 @@ choosen type. Examples:
=over
=item * B<File>:
$confAccess = new Lemonldap::NG::Manager::Conf(
$confAccess = new Lemonldap::NG::Common::Conf(
{
type => 'File',
dirName => '/var/lib/lemonldap-ng/',
});
=item * B<DBI>:
$confAccess = new Lemonldap::NG::Manager::Conf(
$confAccess = new Lemonldap::NG::Common::Conf(
{
type => 'DBI',
dbiChain => 'DBI:mysql:database=lemonldap-ng;host=1.2.3.4',
......@@ -189,7 +189,7 @@ choosen type. Examples:
});
=item * B<SOAP>:
$confAccess = new Lemonldap::NG::Manager::Conf(
$confAccess = new Lemonldap::NG::Common::Conf(
{
type => 'SOAP',
proxy => 'https://manager.example.com/soapmanager.pl',
......
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Constants.pm → modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm
View file @ cae4cbad
package Lemonldap::NG::Manager::Conf::Constants;
package Lemonldap::NG::Common::Conf::Constants;
use strict;
use Exporter 'import';
......
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/DBI.pm → modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DBI.pm
View file @ cae4cbad
package Lemonldap::NG::Manager::Conf::DBI;
package Lemonldap::NG::Common::Conf::DBI;
use strict;
use DBI;
use MIME::Base64;
use Lemonldap::NG::Manager::Conf::Constants;
use Lemonldap::NG::Common::Conf::Constants;
our $VERSION = 0.17;
BEGIN {
*Lemonldap::NG::Manager::Conf::dbh = \&dbh;
*Lemonldap::NG::Common::Conf::dbh = \&dbh;
}
sub prereq {
......
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/File.pm → modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/File.pm
View file @ cae4cbad
package Lemonldap::NG::Manager::Conf::File;
package Lemonldap::NG::Common::Conf::File;
use strict;
use Lemonldap::NG::Manager::Conf::Constants;
use Lemonldap::NG::Common::Conf::Constants;
our $VERSION = 0.22;
......
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/SOAP.pm → modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/SOAP.pm
View file @ cae4cbad
package Lemonldap::NG::Manager::Conf::SOAP;
package Lemonldap::NG::Common::Conf::SOAP;
use strict;
use SOAP::Lite;
......@@ -6,10 +6,10 @@ use SOAP::Lite;
our $VERSION = 0.2;
BEGIN {
*Lemonldap::NG::Manager::Conf::_soapCall = \&_soapCall;
*Lemonldap::NG::Manager::Conf::_connect = \&_connect;
*Lemonldap::NG::Common::Conf::_soapCall = \&_soapCall;
*Lemonldap::NG::Common::Conf::_connect = \&_connect;
sub SOAP::Transport::HTTP::Client::get_basic_credentials {
return $Lemonldap::NG::Manager::Conf::SOAP::username => $Lemonldap::NG::Manager::Conf::SOAP::password;
return $Lemonldap::NG::Common::Conf::SOAP::username => $Lemonldap::NG::Common::Conf::SOAP::password;
}
}
......@@ -84,7 +84,7 @@ __END__
=head1 NAME
Lemonldap::NG::Manager::Conf::SOAP - Perl extension written to access to
Lemonldap::NG::Common::Conf::SOAP - Perl extension written to access to
Lemonldap::NG Web-SSO configuration via SOAP.
=head1 SYNOPSIS
......@@ -151,7 +151,7 @@ Lemonldap::NG Web-SSO configuration via SOAP.
=head2 Server side
See L<Lemonldap::NG::Manager::Conf::SOAP> for documentation on client side.
See L<Lemonldap::NG::Common::Conf::SOAP> for documentation on client side.
use Lemonldap::NG::Manager::SOAPServer;
Lemonldap::NG::Manager::SOAPServer->start(
......@@ -162,16 +162,16 @@ See L<Lemonldap::NG::Manager::Conf::SOAP> for documentation on client side.
=head1 DESCRIPTION
Lemonldap::NG::Manager::Conf provides a simple interface to access to
Lemonldap::NG::Common::Conf provides a simple interface to access to
Lemonldap::NG Web-SSO configuration. It is used by L<Lemonldap::NG::Handler>,
L<Lemonldap::NG::Portal> and L<Lemonldap::NG::Manager>.
Lemonldap::NG::Manager::Conf::SOAP provides the "SOAP" target used to access
Lemonldap::NG::Common::Conf::SOAP provides the "SOAP" target used to access
configuration via SOAP.
=head2 SECURITY
As Lemonldap::NG::Manager::Conf::SOAP use SOAP::Lite, you have to see
As Lemonldap::NG::Common::Conf::SOAP use SOAP::Lite, you have to see
L<SOAP::Transport> to know arguments that can be passed to C<proxyOptions>.
Lemonldap::NG provides a system for HTTP basic authentication.
......@@ -230,7 +230,7 @@ set environment variables.
=head1 SEE ALSO
L<Lemonldap::NG::Manager>, L<Lemonldap::NG::Manager::Conf::SOAP>,
L<Lemonldap::NG::Manager>, L<Lemonldap::NG::Common::Conf::SOAP>,
L<Lemonldap::NG::Handler>, L<Lemonldap::NG::Portal>,
http://wiki.lemonldap.objectweb.org/xwiki/bin/view/NG/Presentation
......
modules/lemonldap-ng-manager/scripts/lmConfig_File2MySQL → modules/lemonldap-ng-common/scripts/lmConfig_File2MySQL
View file @ cae4cbad
#!/usr/bin/perl
use Getopt::Std;
use Lemonldap::NG::Manager::Conf;
use Lemonldap::NG::Common::Conf;
use strict;
# Get ARGS
......
modules/lemonldap-ng-manager/t/01-Manager-Conf.t → modules/lemonldap-ng-common/t/01-Manager-Conf.t
View file @ cae4cbad
......@@ -6,7 +6,7 @@
# change 'tests => 1' to 'tests => last_test_to_print';
use Test::More tests => 1;
BEGIN { use_ok('Lemonldap::NG::Manager::Conf') }
BEGIN { use_ok('Lemonldap::NG::Common::Conf') }
#########################
......
modules/lemonldap-ng-manager/t/02-Manager-Conf-File.t → modules/lemonldap-ng-common/t/02-Manager-Conf-File.t
View file @ cae4cbad
......@@ -6,7 +6,7 @@
# change 'tests => 1' to 'tests => last_test_to_print';
use Test::More tests => 2;
BEGIN { use_ok('Lemonldap::NG::Manager::Conf') }
BEGIN { use_ok('Lemonldap::NG::Common::Conf') }
#########################
......@@ -16,7 +16,7 @@ BEGIN { use_ok('Lemonldap::NG::Manager::Conf') }
my $h;
@ARGV = ("help=groups");
ok(
$h = new Lemonldap::NG::Manager::Conf(
$h = new Lemonldap::NG::Common::Conf(
{
type => 'File',
dirName => ".",
......
modules/lemonldap-ng-manager/t/03-Manager-Conf-DBI.t → modules/lemonldap-ng-common/t/03-Manager-Conf-DBI.t
View file @ cae4cbad
......@@ -6,7 +6,7 @@
# change 'tests => 1' to 'tests => last_test_to_print';
use Test::More tests => 3;
BEGIN { use_ok('Lemonldap::NG::Manager::Conf') }
BEGIN { use_ok('Lemonldap::NG::Common::Conf') }
#########################
......@@ -16,7 +16,7 @@ BEGIN { use_ok('Lemonldap::NG::Manager::Conf') }
my $h;
@ARGV = ("help=groups");
ok(
$h = new Lemonldap::NG::Manager::Conf(
$h = new Lemonldap::NG::Common::Conf(
{
type => 'DBI',
dbiChain => "DBI:mysql:database=lemonldap-ng",
......
modules/lemonldap-ng-manager/t/04-Manager-Conf-SOAP.t → modules/lemonldap-ng-common/t/04-Manager-Conf-SOAP.t
View file @ cae4cbad
......@@ -7,7 +7,7 @@
use Test::More tests => 4;
# SOAP::Lite is not required, so Lemonldap::NG::Manager::Conf::SOAP may
# SOAP::Lite is not required, so Lemonldap::NG::Common::Conf::SOAP may
# not run.
SKIP: {
eval { require SOAP::Lite };
......@@ -15,10 +15,10 @@ SKIP: {
"SOAP::Lite is not installed, so SOAP configuration access will not work",
4
if ($@);
use_ok('Lemonldap::NG::Manager::Conf');
use_ok('Lemonldap::NG::Common::Conf');
my $h;
ok(
$h = new Lemonldap::NG::Manager::Conf(
$h = new Lemonldap::NG::Common::Conf(
{
type => 'SOAP',
proxy => 'http://localhost',
......