Move conf regexp constants to common (#970)
This commit is contained in:
parent
7234f907aa
commit
990006ce80
2
Makefile
2
Makefile
|
@ -190,7 +190,7 @@ MANAGERJSONSRC= scripts/jsongenerator.pl \
|
||||||
MANAGERJSONDST=$(SRCMANAGERDIR)/site/static/struct.json \
|
MANAGERJSONDST=$(SRCMANAGERDIR)/site/static/struct.json \
|
||||||
$(SRCMANAGERDIR)/site/static/js/conftree.js \
|
$(SRCMANAGERDIR)/site/static/js/conftree.js \
|
||||||
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Attributes.pm \
|
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Attributes.pm \
|
||||||
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Constants.pm \
|
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/ReConstants.pm \
|
||||||
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm \
|
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm \
|
||||||
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/Constants.pm \
|
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/Constants.pm \
|
||||||
_example/conf/lmConf-1.js
|
_example/conf/lmConf-1.js
|
||||||
|
|
|
@ -3,7 +3,7 @@ package Lemonldap::NG::Common::Conf::RESTServer;
|
||||||
use strict;
|
use strict;
|
||||||
use Mouse;
|
use Mouse;
|
||||||
use Lemonldap::NG::Common::Conf::Constants;
|
use Lemonldap::NG::Common::Conf::Constants;
|
||||||
use Lemonldap::NG::Manager::Constants;
|
use Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
|
|
||||||
our $VERSION = '2.0.0';
|
our $VERSION = '2.0.0';
|
||||||
|
|
||||||
|
@ -290,7 +290,7 @@ sub _samlMetaDataNodes {
|
||||||
}
|
}
|
||||||
|
|
||||||
# These regexps are generated by jsongenerator.pl and stored in
|
# These regexps are generated by jsongenerator.pl and stored in
|
||||||
# Lemonldap::NG::Manager::Constants
|
# Lemonldap::NG::Common::Conf::ReConstants
|
||||||
elsif (
|
elsif (
|
||||||
$query =~ {
|
$query =~ {
|
||||||
IDP => qr/^$samlIDPMetaDataNodeKeys$/o,
|
IDP => qr/^$samlIDPMetaDataNodeKeys$/o,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand
|
# This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand
|
||||||
package Lemonldap::NG::Manager::Constants;
|
package Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use Exporter 'import';
|
use Exporter 'import';
|
|
@ -180,7 +180,7 @@ the main file that contains the tree view;
|
||||||
|
|
||||||
generates sub tree for virtualhosts and SAML and OpenID-Connect partners;
|
generates sub tree for virtualhosts and SAML and OpenID-Connect partners;
|
||||||
|
|
||||||
=item `Lemonldap::NG::Manager::Constants`:
|
=item `Lemonldap::NG::Common::Conf::ReConstants`:
|
||||||
|
|
||||||
constants used by all Perl manager components;
|
constants used by all Perl manager components;
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,7 @@ sub run {
|
||||||
. 'Keys $specialNodeHash $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters';
|
. 'Keys $specialNodeHash $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters';
|
||||||
print F <<EOF;
|
print F <<EOF;
|
||||||
# This file is generated by $module. Don't modify it by hand
|
# This file is generated by $module. Don't modify it by hand
|
||||||
package Lemonldap::NG::Manager::Constants;
|
package Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use Exporter 'import';
|
use Exporter 'import';
|
||||||
|
@ -616,7 +616,7 @@ system.
|
||||||
Lemonldap::NG::Manager::Build->run(
|
Lemonldap::NG::Manager::Build->run(
|
||||||
structFile => "site/static/struct.json",
|
structFile => "site/static/struct.json",
|
||||||
confTreeFile => "site/static/js/conftree.js",
|
confTreeFile => "site/static/js/conftree.js",
|
||||||
managerConstantsFile => "lib/Lemonldap/NG/Manager/Constants.pm",
|
managerConstantsFile => "lib/Lemonldap/NG/Common/Conf/ReConstants.pm",
|
||||||
managerAttributesFile => 'lib/Lemonldap/NG/Manager/Attributes.pm',
|
managerAttributesFile => 'lib/Lemonldap/NG/Manager/Attributes.pm',
|
||||||
defaultValuesFile => "lib/Lemonldap/NG/Common/Conf/DefaultValues.pm",
|
defaultValuesFile => "lib/Lemonldap/NG/Common/Conf/DefaultValues.pm",
|
||||||
firstLmConfFile => "_example/conf/lmConf-1.js",
|
firstLmConfFile => "_example/conf/lmConf-1.js",
|
||||||
|
|
|
@ -3,7 +3,7 @@ package Lemonldap::NG::Manager::Cli;
|
||||||
use strict;
|
use strict;
|
||||||
use Mouse;
|
use Mouse;
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
use Lemonldap::NG::Manager::Constants;
|
use Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
|
|
||||||
extends('Lemonldap::NG::Manager::Cli::Lib');
|
extends('Lemonldap::NG::Manager::Cli::Lib');
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ package Lemonldap::NG::Manager::Conf::Parser;
|
||||||
use strict;
|
use strict;
|
||||||
use utf8;
|
use utf8;
|
||||||
use Mouse;
|
use Mouse;
|
||||||
use Lemonldap::NG::Manager::Constants;
|
use Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
use Lemonldap::NG::Manager::Attributes;
|
use Lemonldap::NG::Manager::Attributes;
|
||||||
|
|
||||||
our $VERSION = '2.0.0';
|
our $VERSION = '2.0.0';
|
||||||
|
|
|
@ -6,7 +6,7 @@ use Mouse;
|
||||||
|
|
||||||
use Lemonldap::NG::Common::Conf::Constants;
|
use Lemonldap::NG::Common::Conf::Constants;
|
||||||
use Lemonldap::NG::Common::PSGI::Constants;
|
use Lemonldap::NG::Common::PSGI::Constants;
|
||||||
use Lemonldap::NG::Manager::Constants;
|
use Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
use Lemonldap::NG::Common::Notifications;
|
use Lemonldap::NG::Common::Notifications;
|
||||||
|
|
||||||
use feature 'state';
|
use feature 'state';
|
||||||
|
|
|
@ -9,7 +9,7 @@ use Lemonldap::NG::Common::Session;
|
||||||
use Lemonldap::NG::Common::Conf::Constants;
|
use Lemonldap::NG::Common::Conf::Constants;
|
||||||
use Lemonldap::NG::Common::Session;
|
use Lemonldap::NG::Common::Session;
|
||||||
use Lemonldap::NG::Common::PSGI::Constants;
|
use Lemonldap::NG::Common::PSGI::Constants;
|
||||||
use Lemonldap::NG::Manager::Constants;
|
use Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
|
|
||||||
use feature 'state';
|
use feature 'state';
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
use Test::More;
|
use Test::More;
|
||||||
use strict;
|
use strict;
|
||||||
use Lemonldap::NG::Manager::Constants;
|
use Lemonldap::NG::Common::Conf::ReConstants;
|
||||||
|
|
||||||
use_ok('Lemonldap::NG::Manager::Build::Attributes');
|
use_ok('Lemonldap::NG::Manager::Build::Attributes');
|
||||||
my $count = 1;
|
my $count = 1;
|
||||||
|
|
|
@ -5,7 +5,7 @@ use Lemonldap::NG::Manager::Build;
|
||||||
Lemonldap::NG::Manager::Build->run(
|
Lemonldap::NG::Manager::Build->run(
|
||||||
structFile => 'lemonldap-ng-manager/site/static/struct.json',
|
structFile => 'lemonldap-ng-manager/site/static/struct.json',
|
||||||
confTreeFile => 'lemonldap-ng-manager/site/static/js/conftree.js',
|
confTreeFile => 'lemonldap-ng-manager/site/static/js/conftree.js',
|
||||||
managerConstantsFile => 'lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm',
|
managerConstantsFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm',
|
||||||
managerAttributesFile => 'lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm',
|
managerAttributesFile => 'lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm',
|
||||||
defaultValuesFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm',
|
defaultValuesFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm',
|
||||||
confConstantsFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm',
|
confConstantsFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user