Move conf regexp constants to common (#970)

Makefile

@@ -190,7 +190,7 @@ MANAGERJSONSRC= scripts/jsongenerator.pl \
 MANAGERJSONDST=$(SRCMANAGERDIR)/site/static/struct.json \
 		$(SRCMANAGERDIR)/site/static/js/conftree.js \
 		$(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/Constants.pm \
 		_example/conf/lmConf-1.js

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm

@@ -3,7 +3,7 @@ package Lemonldap::NG::Common::Conf::RESTServer;
 use strict;
 use Mouse;
 use Lemonldap::NG::Common::Conf::Constants;
-use Lemonldap::NG::Manager::Constants;
+use Lemonldap::NG::Common::Conf::ReConstants;
 
 our $VERSION = '2.0.0';
 
@@ -290,7 +290,7 @@ sub _samlMetaDataNodes {
     }
 
     # These regexps are generated by jsongenerator.pl and stored in
-    # Lemonldap::NG::Manager::Constants
+    # Lemonldap::NG::Common::Conf::ReConstants
     elsif (
         $query =~ {
             IDP => qr/^$samlIDPMetaDataNodeKeys$/o,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm → lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm

 # 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 Exporter 'import';

lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm

@@ -180,7 +180,7 @@ the main file that contains the tree view;
 
 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;
 

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm

@@ -161,7 +161,7 @@ sub run {
       . 'Keys $specialNodeHash $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters';
     print F <<EOF;
 # 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 Exporter 'import';
@@ -616,7 +616,7 @@ system.
   Lemonldap::NG::Manager::Build->run(
     structFile            => "site/static/struct.json",
     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',
     defaultValuesFile     => "lib/Lemonldap/NG/Common/Conf/DefaultValues.pm",
     firstLmConfFile       => "_example/conf/lmConf-1.js",

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm

@@ -3,7 +3,7 @@ package Lemonldap::NG::Manager::Cli;
 use strict;
 use Mouse;
 use Data::Dumper;
-use Lemonldap::NG::Manager::Constants;
+use Lemonldap::NG::Common::Conf::ReConstants;
 
 extends('Lemonldap::NG::Manager::Cli::Lib');
 

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm

@@ -21,7 +21,7 @@ package Lemonldap::NG::Manager::Conf::Parser;
 use strict;
 use utf8;
 use Mouse;
-use Lemonldap::NG::Manager::Constants;
+use Lemonldap::NG::Common::Conf::ReConstants;
 use Lemonldap::NG::Manager::Attributes;
 
 our $VERSION = '2.0.0';

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Notifications.pm

@@ -6,7 +6,7 @@ use Mouse;
 
 use Lemonldap::NG::Common::Conf::Constants;
 use Lemonldap::NG::Common::PSGI::Constants;
-use Lemonldap::NG::Manager::Constants;
+use Lemonldap::NG::Common::Conf::ReConstants;
 use Lemonldap::NG::Common::Notifications;
 
 use feature 'state';

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm

@@ -9,7 +9,7 @@ use Lemonldap::NG::Common::Session;
 use Lemonldap::NG::Common::Conf::Constants;
 use Lemonldap::NG::Common::Session;
 use Lemonldap::NG::Common::PSGI::Constants;
-use Lemonldap::NG::Manager::Constants;
+use Lemonldap::NG::Common::Conf::ReConstants;
 
 use feature 'state';
 

lemonldap-ng-manager/t/20-test-coverage.t

@@ -4,7 +4,7 @@
 
 use Test::More;
 use strict;
-use Lemonldap::NG::Manager::Constants;
+use Lemonldap::NG::Common::Conf::ReConstants;
 
 use_ok('Lemonldap::NG::Manager::Build::Attributes');
 my $count = 1;

scripts/jsongenerator.pl

@@ -5,7 +5,7 @@ use Lemonldap::NG::Manager::Build;
 Lemonldap::NG::Manager::Build->run(
     structFile            => 'lemonldap-ng-manager/site/static/struct.json',
     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',
     defaultValuesFile     => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm',
     confConstantsFile     => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm',