You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2021/05/17 07:55:02 UTC

[directory-fortress-core] branch master updated: Switched from http:// to https://

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 986328e  Switched from http:// to https://
986328e is described below

commit 986328e4dcaca09fccd8ee0620ccf9bf6db2314c
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon May 17 09:54:54 2021 +0200

    Switched from http:// to https://
---
 LICENSE                                            |  4 ++--
 NOTICE                                             |  2 +-
 README-CONFIG.md                                   |  4 ++--
 README-LOAD-TESTING.md                             |  2 +-
 README-MULTITENANCY.md                             |  2 +-
 README-PROPERTIES.md                               |  2 +-
 README-QUICKSTART-APACHEDS.md                      | 16 +++++++--------
 README-QUICKSTART-DOCKER-APACHEDS.md               |  4 ++--
 README-QUICKSTART-DOCKER-SLAPD.md                  |  4 ++--
 README-QUICKSTART-SLAPD.md                         | 14 ++++++-------
 README-TEN-MINUTE-GUIDE.md                         |  4 ++--
 README.md                                          |  6 +++---
 build-config.xml                                   |  2 +-
 build.properties.example                           |  2 +-
 config/bootstrap/ehcache.xml                       |  2 +-
 config/bootstrap/fortress.properties.src           |  2 +-
 config/bootstrap/log4j2.xml                        |  2 +-
 config/ehcache.xml                                 |  2 +-
 config/fortress.properties.src                     |  2 +-
 config/log4j2.xml                                  |  2 +-
 ldap/schema/apacheds-fortress.ldif                 |  4 ++--
 ldap/schema/apacheds-ldaps.ldif                    |  4 ++--
 ldap/schema/fortress.schema                        |  2 +-
 ldap/schema/mavibot-setup.ldif                     |  2 +-
 ldap/schema/rbac.schema                            |  2 +-
 ldap/setup/ConfigNodeUpdate.xml                    |  2 +-
 ldap/setup/DelegatedAdminManagerLoad.xml           |  2 +-
 ldap/setup/FortressDemoUsers.xml                   |  4 ++--
 ldap/setup/HierarchicalAdminRoleExample.xml        |  2 +-
 ldap/setup/HierarchicalRoleExample.xml             |  4 ++--
 ldap/setup/JmeterTestPolicy.xml                    |  2 +-
 ldap/setup/LdapGroupSetup.xml                      |  4 ++--
 ldap/setup/LoadTestUsers.xml                       |  2 +-
 ldap/setup/OrgUnitExample.xml                      |  2 +-
 ldap/setup/RbacAbacSample.xml                      |  4 ++--
 ldap/setup/RbacAcceleratorTestUsers.xml            |  2 +-
 ldap/setup/RoleEngineeringSample.xml               |  4 ++--
 ldap/setup/TestLocaleConstraints.xml               |  4 ++--
 ldap/setup/TomcatManagerUsers.xml                  |  4 ++--
 ldap/setup/demo-fortressproject-users.xml          |  4 ++--
 ldap/setup/install.sh                              |  4 ++--
 ldap/setup/mkDir.cmd                               |  2 +-
 ldap/setup/refreshLDAPData-src.xml                 |  2 +-
 ldap/setup/startSlapd.cmd                          |  4 ++--
 ldap/setup/startSlapd.cmd.src                      |  4 ++--
 ldap/setup/startSlapd.sh                           |  4 ++--
 ldap/setup/stopSlapd.cmd                           |  2 +-
 ldap/setup/stopSlapd.sh                            |  4 ++--
 ldap/setup/uninstall.sh                            |  4 ++--
 ldap/slapd.conf.src                                |  4 ++--
 ldap/symas-openldap.conf.src                       |  4 ++--
 slapd.properties.example                           |  2 +-
 .../apacheds-for-apache-fortress-tests/Dockerfile  |  4 ++--
 .../apacheds-for-apache-fortress-tests/README.md   |  2 +-
 .../run-tests.sh                                   |  2 +-
 .../openldap-for-apache-fortress-tests/Dockerfile  |  2 +-
 .../openldap-for-apache-fortress-tests/README.md   |  2 +-
 .../run-tests.sh                                   |  2 +-
 .../openldap-for-apache-fortress-tests/slapd.conf  |  2 +-
 .../annotation/AdminPermissionOperation.java       |  2 +-
 .../apache/directory/fortress/core/AccelMgr.java   |  2 +-
 .../directory/fortress/core/AccelMgrFactory.java   |  4 ++--
 .../apache/directory/fortress/core/AccessMgr.java  |  2 +-
 .../directory/fortress/core/AccessMgrFactory.java  | 10 +++++----
 .../apache/directory/fortress/core/AdminMgr.java   |  4 ++--
 .../directory/fortress/core/AdminMgrFactory.java   |  2 +-
 .../apache/directory/fortress/core/AuditMgr.java   |  2 +-
 .../directory/fortress/core/AuditMgrFactory.java   |  4 ++--
 .../fortress/core/AuthorizationException.java      |  2 +-
 .../directory/fortress/core/BaseException.java     |  4 ++--
 .../fortress/core/BaseRuntimeException.java        |  2 +-
 .../directory/fortress/core/CfgException.java      |  2 +-
 .../fortress/core/CfgRuntimeException.java         |  2 +-
 .../apache/directory/fortress/core/ConfigMgr.java  |  2 +-
 .../directory/fortress/core/ConfigMgrFactory.java  |  4 ++--
 .../directory/fortress/core/CreateException.java   |  2 +-
 .../directory/fortress/core/DelAccessMgr.java      |  2 +-
 .../fortress/core/DelAccessMgrFactory.java         |  2 +-
 .../directory/fortress/core/DelAdminMgr.java       |  4 ++--
 .../fortress/core/DelAdminMgrFactory.java          |  2 +-
 .../directory/fortress/core/DelReviewMgr.java      |  2 +-
 .../fortress/core/DelReviewMgrFactory.java         |  2 +-
 .../directory/fortress/core/FinderException.java   |  2 +-
 .../directory/fortress/core/GlobalErrIds.java      |  2 +-
 .../apache/directory/fortress/core/GlobalIds.java  |  2 +-
 .../apache/directory/fortress/core/GroupMgr.java   |  4 ++--
 .../directory/fortress/core/GroupMgrFactory.java   |  2 +-
 .../apache/directory/fortress/core/Manageable.java |  4 ++--
 .../directory/fortress/core/PasswordException.java |  2 +-
 .../directory/fortress/core/PropertyMgr.java       |  2 +-
 .../fortress/core/PropertyMgrFactory.java          |  2 +-
 .../directory/fortress/core/PwPolicyMgr.java       |  2 +-
 .../fortress/core/PwPolicyMgrFactory.java          |  2 +-
 .../directory/fortress/core/RemoveException.java   |  2 +-
 .../directory/fortress/core/RestException.java     |  4 ++--
 .../apache/directory/fortress/core/ReviewMgr.java  |  2 +-
 .../directory/fortress/core/ReviewMgrFactory.java  |  2 +-
 .../directory/fortress/core/SecurityException.java |  4 ++--
 .../directory/fortress/core/StandardException.java |  2 +-
 .../directory/fortress/core/UpdateException.java   |  2 +-
 .../fortress/core/ValidationException.java         |  2 +-
 .../directory/fortress/core/ant/Addadminrole.java  |  2 +-
 .../fortress/core/ant/Addadminroleinheritance.java |  2 +-
 .../directory/fortress/core/ant/Addconfig.java     |  2 +-
 .../directory/fortress/core/ant/Addcontainer.java  |  2 +-
 .../directory/fortress/core/ant/Addcontext.java    |  2 +-
 .../directory/fortress/core/ant/Addgroup.java      |  4 ++--
 .../fortress/core/ant/Addgroupmember.java          |  2 +-
 .../fortress/core/ant/Addgroupproperty.java        |  2 +-
 .../directory/fortress/core/ant/Addorgunit.java    |  2 +-
 .../directory/fortress/core/ant/AddpermGrant.java  |  2 +-
 .../directory/fortress/core/ant/AddpermObj.java    |  2 +-
 .../directory/fortress/core/ant/AddpermOp.java     |  2 +-
 .../core/ant/Addpermorgunitinheritance.java        |  2 +-
 .../directory/fortress/core/ant/Addpwpolicy.java   |  2 +-
 .../directory/fortress/core/ant/Addrole.java       |  2 +-
 .../fortress/core/ant/Addroleconstraint.java       |  2 +-
 .../fortress/core/ant/Addroleinheritance.java      |  2 +-
 .../directory/fortress/core/ant/Addsdset.java      |  2 +-
 .../directory/fortress/core/ant/Addsuffix.java     |  2 +-
 .../directory/fortress/core/ant/Adduser.java       |  2 +-
 .../fortress/core/ant/Adduseradminrole.java        |  2 +-
 .../core/ant/Adduserorgunitinheritance.java        |  2 +-
 .../directory/fortress/core/ant/Adduserrole.java   |  2 +-
 .../directory/fortress/core/ant/AdminRoleAnt.java  |  2 +-
 .../directory/fortress/core/ant/ConfigAnt.java     |  2 +-
 .../directory/fortress/core/ant/Deladminrole.java  |  2 +-
 .../fortress/core/ant/Deladminroleinheritance.java |  2 +-
 .../directory/fortress/core/ant/Delconfig.java     |  2 +-
 .../directory/fortress/core/ant/Delcontainer.java  |  2 +-
 .../directory/fortress/core/ant/Delgroup.java      |  4 ++--
 .../fortress/core/ant/Delgroupmember.java          |  2 +-
 .../fortress/core/ant/Delgroupproperty.java        |  2 +-
 .../directory/fortress/core/ant/Delorgunit.java    |  4 ++--
 .../directory/fortress/core/ant/DelpermGrant.java  |  2 +-
 .../directory/fortress/core/ant/DelpermObj.java    |  2 +-
 .../directory/fortress/core/ant/DelpermOp.java     |  2 +-
 .../core/ant/Delpermorgunitinheritance.java        |  2 +-
 .../directory/fortress/core/ant/Delpwpolicy.java   |  2 +-
 .../directory/fortress/core/ant/Delrole.java       |  2 +-
 .../fortress/core/ant/Delroleconstraint.java       |  4 ++--
 .../fortress/core/ant/Delroleinheritance.java      |  2 +-
 .../directory/fortress/core/ant/Delsdset.java      |  2 +-
 .../directory/fortress/core/ant/Delsuffix.java     |  2 +-
 .../directory/fortress/core/ant/Deluser.java       |  2 +-
 .../fortress/core/ant/Deluseradminrole.java        |  2 +-
 .../core/ant/Deluserorgunitinheritance.java        |  2 +-
 .../directory/fortress/core/ant/Deluserrole.java   |  4 ++--
 .../fortress/core/ant/FortressAntTask.java         |  4 ++--
 .../directory/fortress/core/ant/OrgUnitAnt.java    |  2 +-
 .../directory/fortress/core/ant/PermAnt.java       |  2 +-
 .../fortress/core/ant/RoleConstraintAnt.java       |  2 +-
 .../directory/fortress/core/ant/SDSetAnt.java      |  2 +-
 .../directory/fortress/core/ant/Updconfig.java     |  2 +-
 .../directory/fortress/core/ant/UserAnt.java       |  4 ++--
 .../directory/fortress/core/ant/package.html       |  4 ++--
 .../directory/fortress/core/cli/CmdLineParser.java |  2 +-
 .../fortress/core/cli/CommandLineInterpreter.java  |  4 ++--
 .../directory/fortress/core/cli/Options.java       |  2 +-
 .../directory/fortress/core/cli/package.html       |  2 +-
 .../core/doc-files/apache-directory-server.html    |  8 ++++----
 .../core/doc-files/apache-directory-studio.html    | 15 +++-----------
 .../core/doc-files/apache-fortress-core.html       |  2 +-
 .../core/doc-files/apache-fortress-realm.html      |  4 ++--
 .../core/doc-files/apache-fortress-rest.html       |  2 +-
 .../core/doc-files/apache-fortress-web.html        |  2 +-
 .../fortress/core/doc-files/apache-tomcat.html     |  4 ++--
 .../fortress/core/doc-files/ten-minute-guide.html  | 14 ++++++-------
 .../directory/fortress/core/impl/AccelMgrImpl.java |  4 ++--
 .../fortress/core/impl/AcceleratorDAO.java         |  2 +-
 .../fortress/core/impl/AccessMgrImpl.java          |  4 ++--
 .../directory/fortress/core/impl/AdminMgrImpl.java |  2 +-
 .../directory/fortress/core/impl/AdminRoleDAO.java |  2 +-
 .../directory/fortress/core/impl/AdminRoleP.java   |  4 ++--
 .../fortress/core/impl/AdminRoleUtil.java          |  2 +-
 .../directory/fortress/core/impl/AdminUtil.java    |  2 +-
 .../directory/fortress/core/impl/AuditDAO.java     |  4 ++--
 .../directory/fortress/core/impl/AuditMgrImpl.java |  4 ++--
 .../directory/fortress/core/impl/AuditP.java       |  2 +-
 .../directory/fortress/core/impl/ConfigDAO.java    |  4 ++--
 .../fortress/core/impl/ConfigMgrImpl.java          |  2 +-
 .../directory/fortress/core/impl/ConfigP.java      |  2 +-
 .../directory/fortress/core/impl/DSDChecker.java   |  4 ++--
 .../fortress/core/impl/DelAccessMgrImpl.java       |  4 ++--
 .../fortress/core/impl/DelAdminMgrImpl.java        |  2 +-
 .../fortress/core/impl/DelReviewMgrImpl.java       |  2 +-
 .../fortress/core/impl/GlobalPwMsgIds.java         |  2 +-
 .../directory/fortress/core/impl/GroupDAO.java     |  4 ++--
 .../directory/fortress/core/impl/GroupMgrImpl.java |  4 ++--
 .../directory/fortress/core/impl/GroupP.java       |  4 ++--
 .../directory/fortress/core/impl/HierUtil.java     |  2 +-
 .../directory/fortress/core/impl/Manageable.java   |  4 ++--
 .../directory/fortress/core/impl/OrgUnitDAO.java   |  4 ++--
 .../directory/fortress/core/impl/OrgUnitP.java     |  4 ++--
 .../fortress/core/impl/OrganizationalUnitDAO.java  |  4 ++--
 .../fortress/core/impl/OrganizationalUnitP.java    |  2 +-
 .../directory/fortress/core/impl/PermDAO.java      |  4 ++--
 .../directory/fortress/core/impl/PermObjDAO.java   |  2 +-
 .../directory/fortress/core/impl/PermOpDAO.java    |  2 +-
 .../apache/directory/fortress/core/impl/PermP.java |  4 ++--
 .../directory/fortress/core/impl/PolicyDAO.java    |  4 ++--
 .../directory/fortress/core/impl/PolicyP.java      |  4 ++--
 .../directory/fortress/core/impl/PropertyDAO.java  |  4 ++--
 .../fortress/core/impl/PropertyMgrImpl.java        |  2 +-
 .../directory/fortress/core/impl/PropertyP.java    |  2 +-
 .../fortress/core/impl/PropertyProvider.java       |  2 +-
 .../directory/fortress/core/impl/PsoUtil.java      |  2 +-
 .../fortress/core/impl/PwPolicyControl.java        |  2 +-
 .../fortress/core/impl/PwPolicyMgrImpl.java        |  2 +-
 .../fortress/core/impl/ReviewMgrImpl.java          |  4 ++--
 .../directory/fortress/core/impl/RoleDAO.java      |  4 ++--
 .../apache/directory/fortress/core/impl/RoleP.java |  4 ++--
 .../directory/fortress/core/impl/RoleUtil.java     |  2 +-
 .../directory/fortress/core/impl/SDUtil.java       |  2 +-
 .../apache/directory/fortress/core/impl/SdDAO.java |  2 +-
 .../apache/directory/fortress/core/impl/SdP.java   |  2 +-
 .../directory/fortress/core/impl/SuffixDAO.java    |  4 ++--
 .../directory/fortress/core/impl/SuffixP.java      |  2 +-
 .../directory/fortress/core/impl/UserDAO.java      |  2 +-
 .../apache/directory/fortress/core/impl/UserP.java |  4 ++--
 .../directory/fortress/core/impl/UsoUtil.java      |  4 ++--
 .../directory/fortress/core/impl/package.html      |  4 ++--
 .../core/ldap/LdapClientTrustStoreManager.java     |  2 +-
 .../fortress/core/ldap/LdapConnectionProvider.java |  2 +-
 .../directory/fortress/core/ldap/LdapCounters.java |  4 ++--
 .../fortress/core/ldap/LdapDataProvider.java       |  2 +-
 .../directory/fortress/core/ldap/RelaxControl.java |  2 +-
 .../fortress/core/ldap/RelaxControlImpl.java       |  2 +-
 .../directory/fortress/core/ldap/package.html      |  4 ++--
 .../directory/fortress/core/model/Address.java     |  4 ++--
 .../directory/fortress/core/model/AdminRole.java   |  2 +-
 .../fortress/core/model/AdminRoleRelationship.java |  4 ++--
 .../fortress/core/model/Administrator.java         |  2 +-
 .../directory/fortress/core/model/AuthZ.java       |  2 +-
 .../apache/directory/fortress/core/model/Bind.java |  2 +-
 .../fortress/core/model/ComparisonOperator.java    |  4 ++--
 .../fortress/core/model/Configuration.java         |  2 +-
 .../directory/fortress/core/model/Constraint.java  |  4 ++--
 .../fortress/core/model/ConstraintUtil.java        |  2 +-
 .../directory/fortress/core/model/Context.java     |  2 +-
 .../directory/fortress/core/model/FortEntity.java  |  4 ++--
 .../directory/fortress/core/model/FortRequest.java |  2 +-
 .../fortress/core/model/FortResponse.java          |  2 +-
 .../directory/fortress/core/model/Graphable.java   |  4 ++--
 .../directory/fortress/core/model/Group.java       |  4 ++--
 .../apache/directory/fortress/core/model/Hier.java |  4 ++--
 .../apache/directory/fortress/core/model/Mod.java  |  4 ++--
 .../fortress/core/model/ObjectFactory.java         |  2 +-
 .../directory/fortress/core/model/OrgUnit.java     |  2 +-
 .../fortress/core/model/OrgUnitRelationship.java   |  2 +-
 .../fortress/core/model/OrganizationalUnit.java    |  2 +-
 .../directory/fortress/core/model/ParentUtil.java  |  2 +-
 .../directory/fortress/core/model/PermGrant.java   |  4 ++--
 .../directory/fortress/core/model/PermObj.java     |  2 +-
 .../directory/fortress/core/model/Permission.java  |  2 +-
 .../fortress/core/model/PermissionAttribute.java   |  4 ++--
 .../core/model/PermissionAttributeSet.java         |  2 +-
 .../directory/fortress/core/model/Props.java       |  4 ++--
 .../directory/fortress/core/model/PwMessage.java   |  2 +-
 .../directory/fortress/core/model/PwPolicy.java    |  4 ++--
 .../fortress/core/model/Relationship.java          |  2 +-
 .../apache/directory/fortress/core/model/Role.java |  2 +-
 .../fortress/core/model/RoleConstraint.java        |  4 ++--
 .../directory/fortress/core/model/RolePerm.java    |  4 ++--
 .../fortress/core/model/RoleRelationship.java      |  2 +-
 .../directory/fortress/core/model/SDSet.java       |  2 +-
 .../directory/fortress/core/model/Session.java     |  4 ++--
 .../directory/fortress/core/model/Suffix.java      |  2 +-
 .../apache/directory/fortress/core/model/User.java |  2 +-
 .../fortress/core/model/UserAdminRole.java         |  2 +-
 .../directory/fortress/core/model/UserAudit.java   |  4 ++--
 .../directory/fortress/core/model/UserRole.java    |  2 +-
 .../directory/fortress/core/model/Warning.java     |  4 ++--
 .../directory/fortress/core/model/package.html     |  2 +-
 .../apache/directory/fortress/core/overview.html   |  6 +++---
 .../apache/directory/fortress/core/package.html    |  2 +-
 .../fortress/core/rest/AccessMgrRestImpl.java      |  2 +-
 .../fortress/core/rest/AdminMgrRestImpl.java       |  4 ++--
 .../fortress/core/rest/AuditMgrRestImpl.java       |  2 +-
 .../fortress/core/rest/CachedJaxbContext.java      |  2 +-
 .../fortress/core/rest/ConfigMgrRestImpl.java      |  4 ++--
 .../fortress/core/rest/DelAccessMgrRestImpl.java   |  4 ++--
 .../fortress/core/rest/DelAdminMgrRestImpl.java    |  2 +-
 .../fortress/core/rest/DelReviewMgrRestImpl.java   |  4 ++--
 .../fortress/core/rest/GroupMgrRestImpl.java       |  2 +-
 .../directory/fortress/core/rest/HttpIds.java      |  4 ++--
 .../fortress/core/rest/JAXBCachedEntry.java        |  4 ++--
 .../fortress/core/rest/PropertyMgrRestImpl.java    |  2 +-
 .../fortress/core/rest/PwPolicyMgrRestImpl.java    |  2 +-
 .../directory/fortress/core/rest/RestUtils.java    |  4 ++--
 .../fortress/core/rest/ReviewMgrRestImpl.java      |  4 ++--
 .../directory/fortress/core/rest/package.html      |  4 ++--
 .../fortress/core/util/AdminPermissionUtil.java    |  2 +-
 .../directory/fortress/core/util/AuditUtil.java    |  2 +-
 .../fortress/core/util/AuthNValidator.java         |  4 ++--
 .../directory/fortress/core/util/ClassUtil.java    |  2 +-
 .../directory/fortress/core/util/Config.java       |  4 ++--
 .../fortress/core/util/ConstraintValidator.java    |  2 +-
 .../directory/fortress/core/util/EncryptUtil.java  |  2 +-
 .../directory/fortress/core/util/LdapUtil.java     |  2 +-
 .../directory/fortress/core/util/LogUtil.java      |  2 +-
 .../directory/fortress/core/util/PropUpdater.java  |  2 +-
 .../directory/fortress/core/util/PropUtil.java     |  2 +-
 .../directory/fortress/core/util/RegExUtil.java    |  4 ++--
 .../directory/fortress/core/util/ResourceUtil.java |  2 +-
 .../directory/fortress/core/util/Testable.java     |  2 +-
 .../apache/directory/fortress/core/util/VUtil.java |  2 +-
 .../directory/fortress/core/util/cache/Cache.java  |  4 ++--
 .../fortress/core/util/cache/CacheException.java   |  2 +-
 .../fortress/core/util/cache/CacheFactory.java     |  2 +-
 .../fortress/core/util/cache/CacheMgr.java         |  2 +-
 .../fortress/core/util/cache/DsdCacheEntry.java    |  4 ++--
 .../fortress/core/util/cache/EhCacheImpl.java      |  2 +-
 .../fortress/core/util/cache/package.html          |  2 +-
 .../directory/fortress/core/util/package.html      |  2 +-
 .../fortress/core/util/time/ClockTime.java         |  2 +-
 .../directory/fortress/core/util/time/Date.java    |  2 +-
 .../directory/fortress/core/util/time/Day.java     |  2 +-
 .../fortress/core/util/time/Discriminant.java      |  4 ++--
 .../fortress/core/util/time/LockDate.java          |  2 +-
 .../directory/fortress/core/util/time/TUtil.java   |  2 +-
 .../directory/fortress/core/util/time/Time.java    |  2 +-
 .../directory/fortress/core/util/time/Timeout.java |  2 +-
 .../core/util/time/UserRoleConstraint.java         |  4 ++--
 .../fortress/core/util/time/Validator.java         |  2 +-
 .../directory/fortress/core/util/time/package.html |  2 +-
 src/owasp/suppression.xml                          |  4 ++--
 src/test/build.xml                                 |  2 +-
 .../directory/fortress/core/AccelMgrConsole.java   |  2 +-
 .../directory/fortress/core/AccessMgrConsole.java  |  2 +-
 .../directory/fortress/core/AdminMgrConsole.java   |  2 +-
 .../directory/fortress/core/AuditMgrConsole.java   |  4 ++--
 .../directory/fortress/core/ConfigMgrConsole.java  |  4 ++--
 .../fortress/core/DelegatedAccessMgrConsole.java   |  2 +-
 .../fortress/core/DelegatedAdminMgrConsole.java    |  2 +-
 .../fortress/core/DelegatedReviewMgrConsole.java   |  2 +-
 .../directory/fortress/core/EncryptMgrConsole.java |  2 +-
 .../directory/fortress/core/FortressConsole.java   |  2 +-
 .../directory/fortress/core/GroupMgrConsole.java   |  4 ++--
 .../directory/fortress/core/PolicyMgrConsole.java  |  2 +-
 .../fortress/core/ProcessMenuCommand.java          |  2 +-
 .../apache/directory/fortress/core/ReaderUtil.java |  2 +-
 .../directory/fortress/core/ReviewMgrConsole.java  |  4 ++--
 .../fortress/core/ant/TestAddOrgunit.java          |  2 +-
 .../directory/fortress/core/ant/TestAddUsers.xml   |  4 ++--
 .../fortress/core/example/Addexample.java          |  2 +-
 .../fortress/core/example/Delexample.java          |  2 +-
 .../directory/fortress/core/example/EErrIds.java   |  2 +-
 .../directory/fortress/core/example/EIds.java      |  2 +-
 .../directory/fortress/core/example/Example.java   |  2 +-
 .../fortress/core/example/ExampleAdminMgr.java     |  2 +-
 .../core/example/ExampleAdminMgrFactory.java       |  2 +-
 .../fortress/core/example/ExampleAdminMgrImpl.java |  2 +-
 .../fortress/core/example/ExampleDAO.java          |  2 +-
 .../directory/fortress/core/example/ExampleP.java  |  2 +-
 .../directory/fortress/core/example/example.schema |  4 ++--
 .../fortress/core/group/GroupAntTest.java          |  2 +-
 .../fortress/core/group/LoadGroupTest1.xml         |  4 ++--
 .../fortress/core/group/LoadGroupTest2.xml         |  4 ++--
 .../fortress/core/group/LoadGroupTest3.xml         |  4 ++--
 .../fortress/core/impl/AccelMgrImplTest.java       |  4 ++--
 .../fortress/core/impl/AccessMgrImplTest.java      | 24 ++++++++++++++++++++--
 .../fortress/core/impl/AdminMgrImplTest.java       |  2 +-
 .../fortress/core/impl/AdminRoleTestData.java      |  2 +-
 .../fortress/core/impl/AuditMgrImplTest.java       |  2 +-
 .../directory/fortress/core/impl/CacheSample.java  |  4 ++--
 .../fortress/core/impl/DelegatedMgrImplTest.java   |  2 +-
 .../fortress/core/impl/FortressAntLoadTest.java    |  4 ++--
 .../fortress/core/impl/FortressJUnitTest.java      |  2 +-
 .../fortress/core/impl/GroupMgrImplTest.java       |  4 ++--
 .../fortress/core/impl/GroupTestData.java          |  4 ++--
 .../directory/fortress/core/impl/MyAnnotation.java |  2 +-
 .../fortress/core/impl/OrgUnitTestData.java        |  2 +-
 .../apache/directory/fortress/core/impl/PRA.java   |  2 +-
 .../directory/fortress/core/impl/PRATestData.java  |  2 +-
 .../directory/fortress/core/impl/PermTestData.java |  4 ++--
 .../fortress/core/impl/PolicyTestData.java         |  4 ++--
 .../fortress/core/impl/PropertyMgrImplTest.java    |  2 +-
 .../fortress/core/impl/PswdPolicyMgrImplTest.java  |  2 +-
 .../fortress/core/impl/ReviewMgrImplTest.java      |  2 +-
 .../directory/fortress/core/impl/RoleTestData.java |  4 ++--
 .../directory/fortress/core/impl/TestUtils.java    |  4 ++--
 .../apache/directory/fortress/core/impl/URA.java   |  2 +-
 .../directory/fortress/core/impl/URATestData.java  |  2 +-
 .../directory/fortress/core/impl/UserTestData.java |  4 ++--
 .../core/impl/accelerator/TestAccelerator.java     |  4 ++--
 .../core/impl/apacheds/AdminManagerTest.java       |  2 +-
 .../impl/apacheds/FortressJUnitApachedsTest.java   |  2 +-
 .../fortress/core/jmeter/AccelCreateSession.java   |  2 +-
 .../directory/fortress/core/jmeter/AddUser.java    |  2 +-
 .../fortress/core/jmeter/CheckAccess.java          |  2 +-
 .../directory/fortress/core/jmeter/CheckUser.java  |  2 +-
 .../directory/fortress/core/jmeter/DelUser.java    |  2 +-
 .../core/jmeter/FortressCreateSession.java         |  2 +-
 .../fortress/core/jmeter/SessionPermissions.java   |  2 +-
 .../directory/fortress/core/jmeter/UserBase.java   |  2 +-
 .../fortress/core/samples/AbacSample.java          |  4 ++--
 .../fortress/core/samples/AccessMgrSample.java     |  2 +-
 .../fortress/core/samples/AllSamplesJUnitTest.java |  2 +-
 .../core/samples/CreatePermOrgHierarchySample.java |  2 +-
 .../fortress/core/samples/CreatePermOrgSample.java |  2 +-
 .../fortress/core/samples/CreatePermSample.java    |  2 +-
 .../core/samples/CreateRoleHierarchySample.java    |  4 ++--
 .../fortress/core/samples/CreateRoleSample.java    |  2 +-
 .../fortress/core/samples/CreateSessionSample.java |  2 +-
 .../core/samples/CreateUserOrgHierarchySample.java |  2 +-
 .../fortress/core/samples/CreateUserOrgSample.java |  2 +-
 .../core/samples/CreateUserRoleSample.java         |  2 +-
 .../fortress/core/samples/CreateUserSample.java    |  4 ++--
 .../fortress/core/samples/LoadTestUserSample.java  |  4 ++--
 .../directory/fortress/core/samples/overview.html  |  4 ++--
 .../directory/fortress/core/samples/package.html   |  2 +-
 .../core/util/AdminPermissionUtilTest.java         |  2 +-
 .../fortress/core/util/ResourceUtilTest.java       |  2 +-
 src/test/jmeter/acCheckAccess.jmx                  |  2 +-
 src/test/jmeter/acCreateSession.jmx                |  2 +-
 src/test/jmeter/acSessionPerms.jmx                 |  2 +-
 src/test/jmeter/ftAddUser.jmx                      |  2 +-
 src/test/jmeter/ftCheckAccess.jmx                  |  2 +-
 src/test/jmeter/ftCheckUser.jmx                    |  2 +-
 src/test/jmeter/ftCreateSession.jmx                |  4 ++--
 src/test/jmeter/ftDelUser.jmx                      |  2 +-
 src/test/jmeter/ftSessionPerms.jmx                 |  2 +-
 src/test/resources/fortress-schema.ldif            |  2 +-
 src/test/resources/init-ldap.ldif                  |  2 +-
 src/test/resources/log4j2.xml                      |  2 +-
 src/test/resources/test-data.ldif                  |  2 +-
 427 files changed, 616 insertions(+), 603 deletions(-)

diff --git a/LICENSE b/LICENSE
index d645695..62589ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/NOTICE b/NOTICE
index a8fa2f5..cab5faf 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,6 +3,6 @@ Apache Fortress Core
 Copyright 2003-2018 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
 
 
diff --git a/README-CONFIG.md b/README-CONFIG.md
index 3fec824..ba4ceed 100644
--- a/README-CONFIG.md
+++ b/README-CONFIG.md
@@ -6,7 +6,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -189,4 +189,4 @@ B. just updates the config node with the new values, preserving the other data.
  * For more info on which parameters are used where, look at the **init-fortress-config** target located inside the [build-config.xml](build-config.xml) file.
 
  ___________________________________________________________________________________
-  #### END OF README-CONFIG
\ No newline at end of file
+  #### END OF README-CONFIG
diff --git a/README-LOAD-TESTING.md b/README-LOAD-TESTING.md
index d45f005..da8eae5 100644
--- a/README-LOAD-TESTING.md
+++ b/README-LOAD-TESTING.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/README-MULTITENANCY.md b/README-MULTITENANCY.md
index c995e01..2fd4494 100644
--- a/README-MULTITENANCY.md
+++ b/README-MULTITENANCY.md
@@ -6,7 +6,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/README-PROPERTIES.md b/README-PROPERTIES.md
index e47bc33..c8c42a5 100644
--- a/README-PROPERTIES.md
+++ b/README-PROPERTIES.md
@@ -6,7 +6,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/README-QUICKSTART-APACHEDS.md b/README-QUICKSTART-APACHEDS.md
index 0f81c34..0cf9a68 100644
--- a/README-QUICKSTART-APACHEDS.md
+++ b/README-QUICKSTART-APACHEDS.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -53,7 +53,7 @@ ________________________________________________________________________________
 
 1. Download and install Apache Directory Server
 
- a. [Download either the 32 or 64-bit linux binary](http://directory.apache.org/apacheds/download/download-linux-bin.html)
+ a. [Download either the 32 or 64-bit linux binary](https://directory.apache.org/apacheds/download/download-linux-bin.html)
 
  b. For 32-bit (as sudo or root):
 
@@ -111,7 +111,7 @@ ________________________________________________________________________________
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
+ wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
  unzip fortress-core-2.0.5-source-release.zip
  cd fortress-core-2.0.5
  ```
@@ -270,7 +270,7 @@ During this section, you will be asked to setup Apache Tomcat 8 and prepare for
 1. Download and prepare the package:
 
  ```
- wget http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/apache-tomcat-8.0.30.tar.gz
+ wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/apache-tomcat-8.0.30.tar.gz
  tar -xvf apache-tomcat-8.0.30.tar.gz
  sudo mv apache-tomcat-8.0.30 /usr/local/tomcat8
  ```
@@ -280,7 +280,7 @@ During this section, you will be asked to setup Apache Tomcat 8 and prepare for
 2. Download the fortress realm proxy jar into tomcat/lib folder:
 
   ```
-  sudo wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.5/fortress-realm-proxy-2.0.5.jar -P /usr/local/tomcat8/lib
+  sudo wget https://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.5/fortress-realm-proxy-2.0.5.jar -P /usr/local/tomcat8/lib
   ```
 
 3. Prepare tomcat fortress usage:
@@ -380,7 +380,7 @@ During this section, you will be asked to setup Apache Fortress Rest Application
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-rest-2.0.5-source-release.zip
+ wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-rest-2.0.5-source-release.zip
  unzip fortress-rest-2.0.5-source-release.zip
  cd fortress-rest-2.0.5
  ```
@@ -426,7 +426,7 @@ During this section, you will be asked to setup Apache Fortress Web Application
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-web-2.0.5-source-release.zip
+ wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-web-2.0.5-source-release.zip
  unzip fortress-web-2.0.5-source-release.zip
  cd fortress-web-2.0.5
  ```
@@ -477,4 +477,4 @@ During this section, you will be asked to setup Apache Fortress Web Application
  * [FortressWebDemoUsers](./src/main/resources/FortressWebDemoUsers.xml) policy loaded into target LDAP server.
 
 ___________________________________________________________________________________
-#### END OF README-QUICKSTART-APACHEDS
\ No newline at end of file
+#### END OF README-QUICKSTART-APACHEDS
diff --git a/README-QUICKSTART-DOCKER-APACHEDS.md b/README-QUICKSTART-DOCKER-APACHEDS.md
index c3fd1d1..7264a70 100644
--- a/README-QUICKSTART-DOCKER-APACHEDS.md
+++ b/README-QUICKSTART-DOCKER-APACHEDS.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -54,7 +54,7 @@ cd directory-fortress-core
 
 b. or from Apache:
 ```
-wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
+wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
 unzip fortress-core-2.0.5-source-release.zip
 cd fortress-core-2.0.5
 ```
diff --git a/README-QUICKSTART-DOCKER-SLAPD.md b/README-QUICKSTART-DOCKER-SLAPD.md
index 198c2b5..0fb05ce 100644
--- a/README-QUICKSTART-DOCKER-SLAPD.md
+++ b/README-QUICKSTART-DOCKER-SLAPD.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -54,7 +54,7 @@ cd directory-fortress-core
 
 b. or from Apache:
 ```
-wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
+wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
 unzip fortress-core-2.0.5-source-release.zip
 cd fortress-core-2.0.5
 ```
diff --git a/README-QUICKSTART-SLAPD.md b/README-QUICKSTART-SLAPD.md
index 7662012..aaf09e2 100644
--- a/README-QUICKSTART-SLAPD.md
+++ b/README-QUICKSTART-SLAPD.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -59,7 +59,7 @@ ________________________________________________________________________________
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
+ wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
  unzip fortress-core-2.0.5-source-release.zip
  cd fortress-core-2.0.5
  ```
@@ -293,7 +293,7 @@ During this section, you will be asked to setup Apache Tomcat 8 and prepare for
 1. Download and prepare the package:
 
  ```
- wget http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/apache-tomcat-8.0.30.tar.gz
+ wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/apache-tomcat-8.0.30.tar.gz
  tar -xvf apache-tomcat-8.0.30.tar.gz
  sudo mv apache-tomcat-8.0.30 /usr/local/tomcat8
  ```
@@ -303,7 +303,7 @@ During this section, you will be asked to setup Apache Tomcat 8 and prepare for
 2. Download the fortress realm proxy jar into tomcat/lib folder:
 
   ```
-  sudo wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.5/fortress-realm-proxy-2.0.5.jar -P /usr/local/tomcat8/lib
+  sudo wget https://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.5/fortress-realm-proxy-2.0.5.jar -P /usr/local/tomcat8/lib
   ```
 
 3. Prepare tomcat fortress usage:
@@ -404,7 +404,7 @@ During this section, you will be asked to setup Apache Fortress Rest Application
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-rest-2.0.5-source-release.zip
+ wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-rest-2.0.5-source-release.zip
  unzip fortress-rest-2.0.5-source-release.zip
  cd fortress-rest-2.0.5
  ```
@@ -450,7 +450,7 @@ During this section, you will be asked to setup Apache Fortress Web Application
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-web-2.0.5-source-release.zip
+ wget https://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-web-2.0.5-source-release.zip
  unzip fortress-web-2.0.5-source-release.zip
  cd fortress-web-2.0.5
  ```
@@ -501,4 +501,4 @@ During this section, you will be asked to setup Apache Fortress Web Application
  * [FortressWebDemoUsers](./src/main/resources/FortressWebDemoUsers.xml) policy loaded into target LDAP server.
 
  ___________________________________________________________________________________
-  #### END OF README-QUICKSTART-SLAPD
\ No newline at end of file
+  #### END OF README-QUICKSTART-SLAPD
diff --git a/README-TEN-MINUTE-GUIDE.md b/README-TEN-MINUTE-GUIDE.md
index 63201ad..e67233b 100644
--- a/README-TEN-MINUTE-GUIDE.md
+++ b/README-TEN-MINUTE-GUIDE.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -84,4 +84,4 @@ Everything else covered in steps that follow.  Tested on Debian & Centos systems
   * Build Apache Fortress Rest
 
 ___________________________________________________________________________________
-#### END OF README-TEN-MINUTE-GUIDE
\ No newline at end of file
+#### END OF README-TEN-MINUTE-GUIDE
diff --git a/README.md b/README.md
index fb5f07b..a7fdda2 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Role-Based Access Control (RBAC)
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -32,7 +32,7 @@ Role-Based Access Control (RBAC)
    - [Realm for Apache Tomcat](https://github.com/apache/directory-fortress-realm)
    - [Rest/JSON APIs](https://github.com/apache/directory-fortress-enmasse)
    - [Web Admin Pages](https://github.com/apache/directory-fortress-commander)
- * For more information, visit http://directory.apache.org/fortress/
+ * For more information, visit https://directory.apache.org/fortress/
 
 -------------------------------------------------------------------------------
 ## Table of Contents
@@ -67,7 +67,7 @@ ________________________________________________________________________________
  * The configuration subsystem manages coordinates to the targeted ldap server and more.  Here's how it works [README-CONFIG](./README-CONFIG.md).
  * This system runs within a multitenant context.  To learn how [README-MULTITENANCY](./README-MULTITENANCY.md).
  * Questions about usage may be directed to the mailing list:
-   * http://mail-archives.apache.org/mod_mbox/directory-fortress/
+   * https://mail-archives.apache.org/mod_mbox/directory-fortress/
 
 -------------------------------------------------------------------------------
 ## SECTION 1. Prerequisites
diff --git a/build-config.xml b/build-config.xml
index 9cb06b4..cf60447 100644
--- a/build-config.xml
+++ b/build-config.xml
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/build.properties.example b/build.properties.example
index 7ebe4d3..8e280db 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/config/bootstrap/ehcache.xml b/config/bootstrap/ehcache.xml
index 2ebc0af..5799192 100644
--- a/config/bootstrap/ehcache.xml
+++ b/config/bootstrap/ehcache.xml
@@ -9,7 +9,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/config/bootstrap/fortress.properties.src b/config/bootstrap/fortress.properties.src
index 8093a35..d0c4f7b 100755
--- a/config/bootstrap/fortress.properties.src
+++ b/config/bootstrap/fortress.properties.src
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/config/bootstrap/log4j2.xml b/config/bootstrap/log4j2.xml
index f9bec85..b31ab11 100755
--- a/config/bootstrap/log4j2.xml
+++ b/config/bootstrap/log4j2.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/config/ehcache.xml b/config/ehcache.xml
index 2ebc0af..5799192 100755
--- a/config/ehcache.xml
+++ b/config/ehcache.xml
@@ -9,7 +9,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index d60a297..c8b6eb5 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/config/log4j2.xml b/config/log4j2.xml
index f7361d4..fbf1af9 100755
--- a/config/log4j2.xml
+++ b/config/log4j2.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/ldap/schema/apacheds-fortress.ldif b/ldap/schema/apacheds-fortress.ldif
index 1071976..9abbb5f 100644
--- a/ldap/schema/apacheds-fortress.ldif
+++ b/ldap/schema/apacheds-fortress.ldif
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -745,4 +745,4 @@ ou: syntaxcheckers
 dn: ou=syntaxes, cn=fortress, ou=schema
 objectclass: organizationalUnit
 objectclass: top
-ou: syntaxes
\ No newline at end of file
+ou: syntaxes
diff --git a/ldap/schema/apacheds-ldaps.ldif b/ldap/schema/apacheds-ldaps.ldif
index fdd163e..9f33c24 100644
--- a/ldap/schema/apacheds-ldaps.ldif
+++ b/ldap/schema/apacheds-ldaps.ldif
@@ -9,7 +9,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -27,4 +27,4 @@ replace: ads-keystoreFile
 ads-keystorefile: /var/lib/apacheds-2.0.0-M20/default/conf/mykeystore
 -
 replace: ads-certificatepassword
-ads-certificatepassword:: Y2hhbmdlaXQ=
\ No newline at end of file
+ads-certificatepassword:: Y2hhbmdlaXQ=
diff --git a/ldap/schema/fortress.schema b/ldap/schema/fortress.schema
index 1c0310f..a33783f 100644
--- a/ldap/schema/fortress.schema
+++ b/ldap/schema/fortress.schema
@@ -9,7 +9,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/ldap/schema/mavibot-setup.ldif b/ldap/schema/mavibot-setup.ldif
index e36ca2e..40f91ae 100644
--- a/ldap/schema/mavibot-setup.ldif
+++ b/ldap/schema/mavibot-setup.ldif
@@ -6,7 +6,7 @@
 #    (the "License"); you may not use this file except in compliance with
 #    the License.  You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#       https://www.apache.org/licenses/LICENSE-2.0
 #
 #    Unless required by applicable law or agreed to in writing, software
 #    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ldap/schema/rbac.schema b/ldap/schema/rbac.schema
index f870a1e..728194d 100644
--- a/ldap/schema/rbac.schema
+++ b/ldap/schema/rbac.schema
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/ldap/setup/ConfigNodeUpdate.xml b/ldap/setup/ConfigNodeUpdate.xml
index 7a1a1a4..eca97f1 100644
--- a/ldap/setup/ConfigNodeUpdate.xml
+++ b/ldap/setup/ConfigNodeUpdate.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/DelegatedAdminManagerLoad.xml b/ldap/setup/DelegatedAdminManagerLoad.xml
index 8967254..781a699 100644
--- a/ldap/setup/DelegatedAdminManagerLoad.xml
+++ b/ldap/setup/DelegatedAdminManagerLoad.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/FortressDemoUsers.xml b/ldap/setup/FortressDemoUsers.xml
index d07636d..a1b98b0 100755
--- a/ldap/setup/FortressDemoUsers.xml
+++ b/ldap/setup/FortressDemoUsers.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -286,4 +286,4 @@
 
          </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/HierarchicalAdminRoleExample.xml b/ldap/setup/HierarchicalAdminRoleExample.xml
index 60291c8..78909ad 100755
--- a/ldap/setup/HierarchicalAdminRoleExample.xml
+++ b/ldap/setup/HierarchicalAdminRoleExample.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/HierarchicalRoleExample.xml b/ldap/setup/HierarchicalRoleExample.xml
index 5212cd0..614bd09 100755
--- a/ldap/setup/HierarchicalRoleExample.xml
+++ b/ldap/setup/HierarchicalRoleExample.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -53,4 +53,4 @@
 
          </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/JmeterTestPolicy.xml b/ldap/setup/JmeterTestPolicy.xml
index f6fa30c..e0a6b9a 100644
--- a/ldap/setup/JmeterTestPolicy.xml
+++ b/ldap/setup/JmeterTestPolicy.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/LdapGroupSetup.xml b/ldap/setup/LdapGroupSetup.xml
index 58abd05..81fdb5a 100644
--- a/ldap/setup/LdapGroupSetup.xml
+++ b/ldap/setup/LdapGroupSetup.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -67,4 +67,4 @@
 
         </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/LoadTestUsers.xml b/ldap/setup/LoadTestUsers.xml
index 5b3e1ce..dc15b63 100644
--- a/ldap/setup/LoadTestUsers.xml
+++ b/ldap/setup/LoadTestUsers.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/OrgUnitExample.xml b/ldap/setup/OrgUnitExample.xml
index 25f3031..74534cb 100755
--- a/ldap/setup/OrgUnitExample.xml
+++ b/ldap/setup/OrgUnitExample.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/RbacAbacSample.xml b/ldap/setup/RbacAbacSample.xml
index a50a767..1ff929f 100644
--- a/ldap/setup/RbacAbacSample.xml
+++ b/ldap/setup/RbacAbacSample.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -157,4 +157,4 @@
 
         </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/RbacAcceleratorTestUsers.xml b/ldap/setup/RbacAcceleratorTestUsers.xml
index 759bcf7..5197c47 100644
--- a/ldap/setup/RbacAcceleratorTestUsers.xml
+++ b/ldap/setup/RbacAcceleratorTestUsers.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/RoleEngineeringSample.xml b/ldap/setup/RoleEngineeringSample.xml
index 894a297..6d7c125 100644
--- a/ldap/setup/RoleEngineeringSample.xml
+++ b/ldap/setup/RoleEngineeringSample.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -84,4 +84,4 @@
 
         </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/TestLocaleConstraints.xml b/ldap/setup/TestLocaleConstraints.xml
index 3206c16..42286dd 100644
--- a/ldap/setup/TestLocaleConstraints.xml
+++ b/ldap/setup/TestLocaleConstraints.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -69,4 +69,4 @@
 
         </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/TomcatManagerUsers.xml b/ldap/setup/TomcatManagerUsers.xml
index 6513015..46a81d5 100755
--- a/ldap/setup/TomcatManagerUsers.xml
+++ b/ldap/setup/TomcatManagerUsers.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -47,4 +47,4 @@
 
          </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/demo-fortressproject-users.xml b/ldap/setup/demo-fortressproject-users.xml
index 6bf480a..26d2c5f 100644
--- a/ldap/setup/demo-fortressproject-users.xml
+++ b/ldap/setup/demo-fortressproject-users.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
@@ -209,4 +209,4 @@
 
         </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldap/setup/install.sh b/ldap/setup/install.sh
index 8111464..02504ca 100755
--- a/ldap/setup/install.sh
+++ b/ldap/setup/install.sh
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -20,4 +20,4 @@
 
 export SLAPD_INSTALL="$1"
 echo 'install cds server ' $SLAPD_INSTALL
-$SLAPD_INSTALL
\ No newline at end of file
+$SLAPD_INSTALL
diff --git a/ldap/setup/mkDir.cmd b/ldap/setup/mkDir.cmd
index b2af0db..e5c74bb 100644
--- a/ldap/setup/mkDir.cmd
+++ b/ldap/setup/mkDir.cmd
@@ -7,7 +7,7 @@
 @rem   "License"); you may not use this file except in compliance
 @rem   with the License.  You may obtain a copy of the License at
 @rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem     https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem   Unless required by applicable law or agreed to in writing,
 @rem   software distributed under the License is distributed on an
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index 2ed6c95..523fe8f 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -8,7 +8,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/ldap/setup/startSlapd.cmd b/ldap/setup/startSlapd.cmd
index 9cbe234..604c3a2 100644
--- a/ldap/setup/startSlapd.cmd
+++ b/ldap/setup/startSlapd.cmd
@@ -7,7 +7,7 @@
 @rem   "License"); you may not use this file except in compliance
 @rem   with the License.  You may obtain a copy of the License at
 @rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem     https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem   Unless required by applicable law or agreed to in writing,
 @rem   software distributed under the License is distributed on an
@@ -18,4 +18,4 @@
 @rem
 echo 'Starting OpenLDAP...'
 @rem cd C:\JavaTools\symas-openldap-gold-win
-slapd.exe -f ${slapd.exe.location}\etc\openldap\slapd.conf
\ No newline at end of file
+slapd.exe -f ${slapd.exe.location}\etc\openldap\slapd.conf
diff --git a/ldap/setup/startSlapd.cmd.src b/ldap/setup/startSlapd.cmd.src
index 3349c18..87cfe96 100644
--- a/ldap/setup/startSlapd.cmd.src
+++ b/ldap/setup/startSlapd.cmd.src
@@ -7,7 +7,7 @@
 @rem   "License"); you may not use this file except in compliance
 @rem   with the License.  You may obtain a copy of the License at
 @rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem     https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem   Unless required by applicable law or agreed to in writing,
 @rem   software distributed under the License is distributed on an
@@ -18,4 +18,4 @@
 @rem
 echo 'Starting OpenLDAP...'
 @rem cd C:\JavaTools\symas-openldap-gold-win
-slapd.exe -f @SLAPD_LOCATION@\etc\openldap\slapd.conf
\ No newline at end of file
+slapd.exe -f @SLAPD_LOCATION@\etc\openldap\slapd.conf
diff --git a/ldap/setup/startSlapd.sh b/ldap/setup/startSlapd.sh
index 3a160a9..aeaa49e 100755
--- a/ldap/setup/startSlapd.sh
+++ b/ldap/setup/startSlapd.sh
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -20,4 +20,4 @@
 #Echo on
 
 export SLAPD="$1"
-$SLAPD
\ No newline at end of file
+$SLAPD
diff --git a/ldap/setup/stopSlapd.cmd b/ldap/setup/stopSlapd.cmd
index 02469f8..b3eb9f8 100644
--- a/ldap/setup/stopSlapd.cmd
+++ b/ldap/setup/stopSlapd.cmd
@@ -7,7 +7,7 @@
 @rem   "License"); you may not use this file except in compliance
 @rem   with the License.  You may obtain a copy of the License at
 @rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem     https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem   Unless required by applicable law or agreed to in writing,
 @rem   software distributed under the License is distributed on an
diff --git a/ldap/setup/stopSlapd.sh b/ldap/setup/stopSlapd.sh
index d6aad66..81a7ed1 100755
--- a/ldap/setup/stopSlapd.sh
+++ b/ldap/setup/stopSlapd.sh
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -32,4 +32,4 @@ do
 	break;
   fi
   x=$(( $x + 1 ))
-done
\ No newline at end of file
+done
diff --git a/ldap/setup/uninstall.sh b/ldap/setup/uninstall.sh
index a0ffbe4..70158ef 100755
--- a/ldap/setup/uninstall.sh
+++ b/ldap/setup/uninstall.sh
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -34,4 +34,4 @@ if [ $SUDO ]
     echo $SUPW | $SLAPD_REMOVE
   else
     $SLAPD_REMOVE
-fi
\ No newline at end of file
+fi
diff --git a/ldap/slapd.conf.src b/ldap/slapd.conf.src
index 6806feb..66c848b 100755
--- a/ldap/slapd.conf.src
+++ b/ldap/slapd.conf.src
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -199,4 +199,4 @@ ppolicy_hash_cleartext
 #######################################################################
 # Monitor database
 #######################################################################
-@IS_RBAC_ACCELERATOR@database monitor
\ No newline at end of file
+@IS_RBAC_ACCELERATOR@database monitor
diff --git a/ldap/symas-openldap.conf.src b/ldap/symas-openldap.conf.src
index 0fdd4e0..6a9c25e 100755
--- a/ldap/symas-openldap.conf.src
+++ b/ldap/symas-openldap.conf.src
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -71,4 +71,4 @@ SLAPD_TIMEOUT=60
 # BIN and LIB - select which binaries and libraries to use,
 # for architectures where several possible ABIs may be available.
 BIN=/opt/symas/bin
-LIB=/opt/symas/lib64
\ No newline at end of file
+LIB=/opt/symas/lib64
diff --git a/slapd.properties.example b/slapd.properties.example
index ff827d7..1a3b5e4 100644
--- a/slapd.properties.example
+++ b/slapd.properties.example
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/docker/apacheds-for-apache-fortress-tests/Dockerfile b/src/docker/apacheds-for-apache-fortress-tests/Dockerfile
index 34e20b4..fafd30f 100644
--- a/src/docker/apacheds-for-apache-fortress-tests/Dockerfile
+++ b/src/docker/apacheds-for-apache-fortress-tests/Dockerfile
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -32,7 +32,7 @@ ENV APACHEDS_SERVICE_NAME=apacheds-${APACHEDS_VERSION}-default
 
 # Install ApacheDS
 RUN \
-    wget http://archive.apache.org/dist/directory/apacheds/dist/${APACHEDS_VERSION}/apacheds-${APACHEDS_VERSION}-amd64.deb -q -O /tmp/apacheds.deb && \
+    wget https://archive.apache.org/dist/directory/apacheds/dist/${APACHEDS_VERSION}/apacheds-${APACHEDS_VERSION}-amd64.deb -q -O /tmp/apacheds.deb && \
     dpkg -i /tmp/apacheds.deb && \
     rm /tmp/apacheds.deb
 
diff --git a/src/docker/apacheds-for-apache-fortress-tests/README.md b/src/docker/apacheds-for-apache-fortress-tests/README.md
index 24cd953..edfdc6a 100644
--- a/src/docker/apacheds-for-apache-fortress-tests/README.md
+++ b/src/docker/apacheds-for-apache-fortress-tests/README.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/src/docker/apacheds-for-apache-fortress-tests/run-tests.sh b/src/docker/apacheds-for-apache-fortress-tests/run-tests.sh
index 76549c3..fd216ff 100755
--- a/src/docker/apacheds-for-apache-fortress-tests/run-tests.sh
+++ b/src/docker/apacheds-for-apache-fortress-tests/run-tests.sh
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/docker/openldap-for-apache-fortress-tests/Dockerfile b/src/docker/openldap-for-apache-fortress-tests/Dockerfile
index f43d4de..f620d65 100644
--- a/src/docker/openldap-for-apache-fortress-tests/Dockerfile
+++ b/src/docker/openldap-for-apache-fortress-tests/Dockerfile
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/docker/openldap-for-apache-fortress-tests/README.md b/src/docker/openldap-for-apache-fortress-tests/README.md
index c68e4c9..bcebd46 100644
--- a/src/docker/openldap-for-apache-fortress-tests/README.md
+++ b/src/docker/openldap-for-apache-fortress-tests/README.md
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/src/docker/openldap-for-apache-fortress-tests/run-tests.sh b/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
index 1d366a6..ebcc830 100755
--- a/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
+++ b/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/docker/openldap-for-apache-fortress-tests/slapd.conf b/src/docker/openldap-for-apache-fortress-tests/slapd.conf
index 9348a0c..a0ac9ff 100644
--- a/src/docker/openldap-for-apache-fortress-tests/slapd.conf
+++ b/src/docker/openldap-for-apache-fortress-tests/slapd.conf
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/annotation/AdminPermissionOperation.java b/src/main/java/org/apache/directory/fortress/annotation/AdminPermissionOperation.java
index 913df16..6d00b49 100644
--- a/src/main/java/org/apache/directory/fortress/annotation/AdminPermissionOperation.java
+++ b/src/main/java/org/apache/directory/fortress/annotation/AdminPermissionOperation.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgr.java b/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
index eee5413..0afc322 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
index da75718..4473881 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -75,4 +75,4 @@ public final class AccelMgrFactory
         accelMgr.setContextId(contextId);
         return accelMgr;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgr.java b/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
index 020259b..b56534b 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
index 76f057d..311c4e9 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -61,14 +61,15 @@ public final class AccessMgrFactory
      */
     public static AccessMgr createInstance( String contextId) throws SecurityException
     {
-        VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+        VUtil.assertNotNull( contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance" );
 
         String accessClassName = Config.getInstance().getProperty(GlobalIds.ACCESS_IMPLEMENTATION);
         
         AccessMgr accessMgr;
+        
         if ( StringUtils.isEmpty( accessClassName ) )
         {
-            if(Config.getInstance().isRestEnabled())
+            if ( Config.getInstance().isRestEnabled() )
             {
                 accessMgr = new AccessMgrRestImpl();
             }
@@ -83,6 +84,7 @@ public final class AccessMgrFactory
         }
 
         accessMgr.setContextId(contextId);
+        
         return accessMgr;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
index 127ff7b..dcb6e74 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1439,4 +1439,4 @@ public interface AdminMgr extends Manageable
     SDSet setDsdSetCardinality( SDSet dsdSet, int cardinality )
         throws SecurityException;
     
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index feca277..24dbaa5 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgr.java b/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
index ccfa44c..d41d98b 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index 9fe3513..96e1754 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -116,4 +116,4 @@ public final class AuditMgrFactory
         auditMgr.setAdmin(adminSess);
         return auditMgr;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java b/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
index 4ca4873..d2f35b5 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/BaseException.java b/src/main/java/org/apache/directory/fortress/core/BaseException.java
index d08838a..338b564 100755
--- a/src/main/java/org/apache/directory/fortress/core/BaseException.java
+++ b/src/main/java/org/apache/directory/fortress/core/BaseException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -89,4 +89,4 @@ public abstract class BaseException extends Exception implements StandardExcepti
     {
         this.httpStatus = httpStatus;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java b/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
index 1fac065..12abd06 100755
--- a/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
+++ b/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/CfgException.java b/src/main/java/org/apache/directory/fortress/core/CfgException.java
index b52e55e..0ec9597 100755
--- a/src/main/java/org/apache/directory/fortress/core/CfgException.java
+++ b/src/main/java/org/apache/directory/fortress/core/CfgException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java b/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
index f3e6362..e68a812 100755
--- a/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
+++ b/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ConfigMgr.java b/src/main/java/org/apache/directory/fortress/core/ConfigMgr.java
index f585cd9..ca908da 100755
--- a/src/main/java/org/apache/directory/fortress/core/ConfigMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/ConfigMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ConfigMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ConfigMgrFactory.java
index 2b3c779..d82c11d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ConfigMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ConfigMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -73,4 +73,4 @@ public final class ConfigMgrFactory
 
         return (ConfigMgr) ClassUtil.createInstance(configClassName);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/CreateException.java b/src/main/java/org/apache/directory/fortress/core/CreateException.java
index 961e11a..b3e4750 100755
--- a/src/main/java/org/apache/directory/fortress/core/CreateException.java
+++ b/src/main/java/org/apache/directory/fortress/core/CreateException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
index 974c3dd..418f623 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index 5486f36..0897c2e 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
index 7195faa..c68ebd5 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1005,4 +1005,4 @@ public interface DelAdminMgr extends Manageable
      */
     void revokePermission( Permission perm, User user )
         throws SecurityException;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
index 36dd0f2..fe28c27 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
index 4542566..b67ff8d 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
index bdc93a0..6d59fd5 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/FinderException.java b/src/main/java/org/apache/directory/fortress/core/FinderException.java
index bacd5c1..fb77c42 100755
--- a/src/main/java/org/apache/directory/fortress/core/FinderException.java
+++ b/src/main/java/org/apache/directory/fortress/core/FinderException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
index 04a8c5a..06aa4f0 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 462300f..fee7aaa 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/GroupMgr.java b/src/main/java/org/apache/directory/fortress/core/GroupMgr.java
index da72f16..f4ae97d 100755
--- a/src/main/java/org/apache/directory/fortress/core/GroupMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/GroupMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -162,4 +162,4 @@ public interface GroupMgr extends Manageable
      * @throws org.apache.directory.fortress.core.SecurityException in the event entry already present or other system error.
      */
     Group deassign( Group group, String member ) throws SecurityException;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
index 8776da8..3b64a0f 100755
--- a/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/Manageable.java b/src/main/java/org/apache/directory/fortress/core/Manageable.java
index fa67612..e20d6f8 100644
--- a/src/main/java/org/apache/directory/fortress/core/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/Manageable.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -52,4 +52,4 @@ public interface Manageable
      * @param contextId maps to sub-tree in DIT, e.g. ou=contextId, dc=example, dc=com.
      */
     void setContextId( String contextId );
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/PasswordException.java b/src/main/java/org/apache/directory/fortress/core/PasswordException.java
index 1d1cb09..0737d81 100755
--- a/src/main/java/org/apache/directory/fortress/core/PasswordException.java
+++ b/src/main/java/org/apache/directory/fortress/core/PasswordException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/PropertyMgr.java b/src/main/java/org/apache/directory/fortress/core/PropertyMgr.java
index b849c37..e398846 100644
--- a/src/main/java/org/apache/directory/fortress/core/PropertyMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/PropertyMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java
index 8f17d81..ddc406e 100644
--- a/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
index 63340ce..b9b15be 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
index aebebb6..aec8805 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/RemoveException.java b/src/main/java/org/apache/directory/fortress/core/RemoveException.java
index 928cb1e..6e82b47 100755
--- a/src/main/java/org/apache/directory/fortress/core/RemoveException.java
+++ b/src/main/java/org/apache/directory/fortress/core/RemoveException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/RestException.java b/src/main/java/org/apache/directory/fortress/core/RestException.java
index 3e9df9a..987d42c 100644
--- a/src/main/java/org/apache/directory/fortress/core/RestException.java
+++ b/src/main/java/org/apache/directory/fortress/core/RestException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -56,4 +56,4 @@ public class RestException extends SecurityException
     {
         super( errorId, msg, previousException );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
index 930e9bf..b88f4b6 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index c173536..c3db060 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/SecurityException.java b/src/main/java/org/apache/directory/fortress/core/SecurityException.java
index b528e6a..401eb2f 100755
--- a/src/main/java/org/apache/directory/fortress/core/SecurityException.java
+++ b/src/main/java/org/apache/directory/fortress/core/SecurityException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -478,4 +478,4 @@ public class SecurityException extends BaseException
     {
         super( errorId, msg, previousException );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/StandardException.java b/src/main/java/org/apache/directory/fortress/core/StandardException.java
index 84775ef..7c0fafc 100755
--- a/src/main/java/org/apache/directory/fortress/core/StandardException.java
+++ b/src/main/java/org/apache/directory/fortress/core/StandardException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/UpdateException.java b/src/main/java/org/apache/directory/fortress/core/UpdateException.java
index 0994604..0a015ee 100755
--- a/src/main/java/org/apache/directory/fortress/core/UpdateException.java
+++ b/src/main/java/org/apache/directory/fortress/core/UpdateException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ValidationException.java b/src/main/java/org/apache/directory/fortress/core/ValidationException.java
index a69c05d..97c3cae 100755
--- a/src/main/java/org/apache/directory/fortress/core/ValidationException.java
+++ b/src/main/java/org/apache/directory/fortress/core/ValidationException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
index 2de4b7f..3d27c89 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
index f3952fb..7b746bc 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java b/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
index 1f98786..a30b0f8 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java b/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
index 30c40ee..2172f00 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java b/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
index ccd6ff9..3bdcc94 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java b/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
index 98a2d4c..5c812d7 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -83,4 +83,4 @@ public class Addgroup
     {
         return this.groups;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
index 4338d40..115884b 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
index f43f03c..00733e1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java b/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
index 19ec674..adcfca4 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
index 9bfd89f..59a1e79 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
index 830779f..a00c0f7 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
index 275181b..ed59e3c 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
index f6e5001..3fa39b0 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java b/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
index 781f304..009c12a 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
index fcc75e3..60d0626 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addroleconstraint.java b/src/main/java/org/apache/directory/fortress/core/ant/Addroleconstraint.java
index 519da48..f19622c 100644
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addroleconstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addroleconstraint.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
index db8492a..e99607e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java b/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
index deecad9..2d558b8 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java b/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
index 65e18cc..a480426 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
index 5cead70..b16e9d3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
index 1341a0c..da2a244 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
index cfdec8c..6c71710 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
index 952f716..a713994 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
index 85878f1..34bc49e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
index 3d64ea9..7fa4bd2 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
index ae90455..b41bf95 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
index 2bd16db..4197c1b 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java b/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
index d5c18d8..8658bdc 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java b/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
index c9b4684..78489d1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java b/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
index 5f234f2..60ee5c0 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -83,4 +83,4 @@ public class Delgroup
     {
         return this.groups;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
index 1c29897..07cb626 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
index 7e119e5..5a72cf0 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java b/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
index f1b81ea..bbd4a55 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -87,4 +87,4 @@ public class Delorgunit
     {
         return this.ous;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
index 93a1855..4f7689b 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
index 1083b52..59d87f3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
index 7b01228..ff79dd4 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
index b5c48dd..c6d3ea0 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java b/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
index 0d288c9..3258f28 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
index 2f5fa10..0f71355 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delroleconstraint.java b/src/main/java/org/apache/directory/fortress/core/ant/Delroleconstraint.java
index 20a921c..aaeccca 100644
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delroleconstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delroleconstraint.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -83,4 +83,4 @@ public class Delroleconstraint
     {
         return this.roleconstraints;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
index ea7961b..06971d4 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java b/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
index c9a0fb7..afc06f4 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java b/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
index b6f7bd9..2078bd3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
index d335bd7..eaa6251 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
index 6991c36..ae3b080 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
index deae2e2..75903a7 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
index 12dfcb2..d781dc2 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -85,4 +85,4 @@ public class Deluserrole
     {
         return this.userroles;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
index 63be5c9..2f63102 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -2780,4 +2780,4 @@ public class FortressAntTask extends Task implements InputHandler
     {
         return addgroups;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java
index 0094b56..a457b3e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
index 80d1c4d..7f8bf79 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/RoleConstraintAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/RoleConstraintAnt.java
index ab757b2..2091e48 100644
--- a/src/main/java/org/apache/directory/fortress/core/ant/RoleConstraintAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/RoleConstraintAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
index bb734f7..7d0b59a 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Updconfig.java b/src/main/java/org/apache/directory/fortress/core/ant/Updconfig.java
index 7d07aab..567b88c 100644
--- a/src/main/java/org/apache/directory/fortress/core/ant/Updconfig.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Updconfig.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
index 44ead7b..d56fd6a 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -466,4 +466,4 @@ public class UserAnt extends User
         }
         return image;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/package.html b/src/main/java/org/apache/directory/fortress/core/ant/package.html
index 6fe4ccd..fb89f76 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/ant/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -23,7 +23,7 @@
 </head>
 <body>
 <p>
-    This package use <a href="http://ant.apache.org/">Apache Ant</a> to provide utility to provision fortress entities
+    This package use <a href="https://ant.apache.org/">Apache Ant</a> to provide utility to provision fortress entities
     and policies
     using XML files.
 </p>
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java b/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
index d6e963b..c85df32 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
@@ -713,4 +713,4 @@ public class CmdLineParser
     private String[] remainingArgs = null;
     private final Hashtable options = new Hashtable( 10 );
     private Hashtable values = new Hashtable( 10 );
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
index 39b61af..3ea19fd 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1486,4 +1486,4 @@ public class CommandLineInterpreter
         }
         return success;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/Options.java b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
index 8d414f8..a3c34be 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/Options.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/package.html b/src/main/java/org/apache/directory/fortress/core/cli/package.html
index 8d388f4..77bb947 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/cli/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
index 32da286..c50d0d2 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -53,7 +53,7 @@ Steps to install:
         For 32-bit (as sudo or root):
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget http://www.trieuvan.com/apache//directory/apacheds/dist/2.0.0-M20/apacheds-2.0.0-M20-32bit.bin
+wget https://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M20/apacheds-2.0.0-M20-32bit.bin
 chmod a+x *.bin
 ./apacheds-2.0.0-M20-32bit.bin
           </p>
@@ -62,7 +62,7 @@ chmod a+x *.bin
         For 64-bit (as sudo or root):
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget http://www.trieuvan.com/apache//directory/apacheds/dist/2.0.0-M20/apacheds-2.0.0-M20-64bit.bin
+wget https://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M20/apacheds-2.0.0-M20-64bit.bin
 chmod a+x *.bin
 ./apacheds-2.0.0-M20-64bit.bin
           </p>
@@ -74,7 +74,7 @@ chmod a+x *.bin
 
     <li>
         If you have trouble pulling you can get binaries here:
-        <a href="http://directory.apache.org/apacheds/downloads.html">Apache Directory Downloads Page</a>.
+        <a href="https://directory.apache.org/apacheds/downloads.html">Apache Directory Downloads Page</a>.
     </li>
 
     <br/>
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
index 2fda1a5..f2f82a0 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -50,18 +50,9 @@ Steps to install:
     <li>
         Download and install Apache Directory Studio
         <br/><br/>
-        For 32-bit:
         <pre>
             <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget http://mirror.metrocast.net/apache/directory/studio/2.0.0.v20150606-M9/ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86.tar.gz
-tar xvf ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86.tar.gz
-cd ApacheDirectoryStudio/
-            </p>
-        </pre>
-        For 64-bit:
-        <pre>
-            <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget http://mirror.metrocast.net/apache/directory/studio/2.0.0.v20150606-M9/ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86_64.tar.gz
+wget https://archive.apache.org/dist/directory/studio/2.0.0.v20210213-M16/ApacheDirectoryStudio-2.0.0.v20210213-M16-linux.gtk.x86_64.tar.gz
 tar xvf ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86_64.tar.gz
 cd ApacheDirectoryStudio/
             </p>
@@ -70,7 +61,7 @@ cd ApacheDirectoryStudio/
 
     <li>
         If you have trouble pulling you can get binaries here: <a
-            href="http://directory.apache.org/studio/downloads.html">Apache Directory Studio Downloads Page</a>
+            href="https://directory.apache.org/studio/downloads.html">Apache Directory Studio Downloads Page</a>
     </li>
 
     <br/>
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
index 932e00d..dc33662 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
index 7e018b1..67b5720 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -74,4 +74,4 @@ mvn clean install
 </body>
 <p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2018, The Apache Software Foundation. All Rights
     Reserved.</p>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
index 244aeae..1f64e2a 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
index adfa116..fafaccb 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
index 9ca3ecd..4be0b4d 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -53,7 +53,7 @@ This document contains instructions to install Tomcat 7 and configure for use wi
         As root, issue the following commands:
         <pre>
             <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/apache-tomcat-8.0.30.tar.gz
+wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/apache-tomcat-8.0.30.tar.gz
 tar xzf apache-tomcat-8.0.30.tar.gz
 mv apache-tomcat-8.0.30 /usr/local/tomcat8
 /usr/local/tomcat8/bin/startup.sh
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
index efb1dab..02bce41 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -56,7 +56,7 @@ Fortress is written in Java, runs on various platforms, but the others are not b
 <ol>
     <li>Java 7 (or greater) sdk installed.</li>
     <li><a href="http://git-scm.com/download/linux">Git Download for Linux and Unix</a></li>
-    <li><a href="http://maven.apache.org/">Apache Maven 3</a></li>
+    <li><a href="https://maven.apache.org/">Apache Maven 3</a></li>
     <li><a href="https://www.mozilla.org/en-GB/firefox/new/">Firefox Web Browser</a></li>
 </ol>
 <hr>
@@ -127,15 +127,15 @@ mvn javadoc:javadoc
 <hr/>
 <h4>Infrastructure Installed</h4>
 <ol>
-    <li><a href="http://directory.apache.org/apacheds/">Apache Directory Server</a></li>
-    <li><a href="http://directory.apache.org/studio/">Apache Directory Studio</a></li>
-    <li><a href="http://directory.apache.org/fortress/">Apache Fortress</a></li>
-    <li><a href="http://tomcat.apache.org/">Apache Tomcat Servlet Container</a></li>
+    <li><a href="https://directory.apache.org/apacheds/">Apache Directory Server</a></li>
+    <li><a href="https://directory.apache.org/studio/">Apache Directory Studio</a></li>
+    <li><a href="https://directory.apache.org/fortress/">Apache Fortress</a></li>
+    <li><a href="https://tomcat.apache.org/">Apache Tomcat Servlet Container</a></li>
 </ol>
 </p>
 <hr/>
 If you find security flaws, or have questions about Apache Fortress, submit to <a
-        href="http://mail-archives.apache.org/mod_mbox/directory-fortress/">Apache Fortress Discussion list</a>.
+        href="https://mail-archives.apache.org/mod_mbox/directory-fortress/">Apache Fortress Discussion list</a>.
 </BODY>
 <p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2018, The Apache Software Foundation. All Rights
     Reserved.</p>
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AccelMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AccelMgrImpl.java
index 68f475c..78f05da 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/AccelMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AccelMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -190,4 +190,4 @@ public class AccelMgrImpl extends Manageable implements AccelMgr, Serializable
             methodName ) );
         aDao.dropActiveRole( session, role );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
index c741258..ee68c68 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
index 4c618e7..5a53206 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -384,4 +384,4 @@ public class AccessMgrImpl extends Manageable implements AccessMgr, Serializable
 
         return session.getUser();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
index f66cb0a..078ad74 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index ab525b5..0ce2cb1 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
index 443864c..cc4b777 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -414,4 +414,4 @@ final class AdminRoleP
             op.read( inOe );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
index c842169..d28bd1f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminUtil.java
index fa092ff..6665de3 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
index f593d40..dc07157 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -788,4 +788,4 @@ final class AuditDAO extends LdapDataProvider
 
         return mod;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java
index d98b719..ac2b97c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -204,4 +204,4 @@ public class AuditMgrImpl extends Manageable implements AuditMgr, Serializable
         checkAccess(CLS_NM, methodName);
         return auditP.searchInvalidAuthNs(uAudit);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
index a5ea3a8..1cbd264 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
index 4db5e9f..191968c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -404,4 +404,4 @@ final class ConfigDAO extends LdapDataProvider
     {
         return SchemaConstants.CN_AT + "=" + name + "," + Config.getInstance().getProperty( GlobalIds.CONFIG_ROOT_PARAM );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigMgrImpl.java
index 53b3210..cbeab29 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
index 0471aae..193c8c3 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java b/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
index 077ddea..70cb515 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -168,4 +168,4 @@ public class DSDChecker
         }
         return rc;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
index d255b4e..09c06ec 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -495,4 +495,4 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr, Ser
         }
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index fb179d9..ae26866 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelReviewMgrImpl.java
index 6d87ac1..9a97c03 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelReviewMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GlobalPwMsgIds.java b/src/main/java/org/apache/directory/fortress/core/impl/GlobalPwMsgIds.java
index 1241b85..cbb55e8 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GlobalPwMsgIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GlobalPwMsgIds.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
index 3ddb83a..af94546 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -575,4 +575,4 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
     {
         return this.get( entity );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
index 95aab61..1048858 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -306,4 +306,4 @@ public class GroupMgrImpl extends Manageable implements GroupMgr, Serializable
         Role outRole = reviewMgr.readRole( inRole );
         inRole.setDn( outRole.getDn() );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupP.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupP.java
index 20a7ff2..c97dbb8 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -369,4 +369,4 @@ final class GroupP
             VUtil.description( entity.getDescription() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
index 8023e43..991766a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
index bb8e605..18d785f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -179,4 +179,4 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
     {
         return className + "." + opName;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
index 1d0fcdc..188a51d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -733,4 +733,4 @@ final class OrgUnitDAO extends LdapDataProvider
         entity.setParents( getAttributeSet( le, GlobalIds.PARENT_NODES ) );
         return entity;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
index 643fba5..3f3092f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -456,4 +456,4 @@ final class OrgUnitP
 
         return key;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
index 8a4b0e0..4dccd5d 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -161,4 +161,4 @@ final class OrganizationalUnitDAO extends LdapDataProvider
             closeAdminConnection( ld );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
index 14907a9..4304886 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index bc1b1cd..9b674a2 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -2160,4 +2160,4 @@ class PermDAO extends LdapDataProvider
 
         return dn;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermObjDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermObjDAO.java
index 19e0d15..508dbf8 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermObjDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermObjDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermOpDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermOpDAO.java
index 096aada..c29894d 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermOpDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermOpDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermP.java b/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
index 7a079f9..c2561b3 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -775,4 +775,4 @@ final class PermP
             VUtil.description( pa.getDescription() );
         }        
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
index 2539510..1564dbb 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -694,4 +694,4 @@ final class PolicyDAO extends LdapDataProvider
             szDn = getRootDn( contextId, GlobalIds.PPOLICY_ROOT );
         return szDn;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
index 5ae0e93..575a889 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -435,4 +435,4 @@ final class PolicyP
 
         return key;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
index efbb1f8..253777d 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -182,4 +182,4 @@ final class PropertyDAO extends LdapDataProvider
 
         return props;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PropertyMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/PropertyMgrImpl.java
index 21d0a15..9cdb351 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PropertyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PropertyMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PropertyP.java b/src/main/java/org/apache/directory/fortress/core/impl/PropertyP.java
index ba08fc9..3da4c15 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PropertyP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PropertyP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PropertyProvider.java b/src/main/java/org/apache/directory/fortress/core/impl/PropertyProvider.java
index aae26d3..605f2b0 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PropertyProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PropertyProvider.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
index 11b1835..5c04994 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyControl.java b/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyControl.java
index 3185df7..fc5a7ac 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyControl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyControl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
index 47bb4a7..2414750 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
index 24d452c..79a15ca 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -820,4 +820,4 @@ public class ReviewMgrImpl extends Manageable implements ReviewMgr, Serializable
         return userP.findRoleConstraints(authorizedRoles, user, rcType, pe.getPaSets());                
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
index 3a26886..4dcb9c1 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -814,4 +814,4 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
     {
         return this.getRole( entity );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
index f7077a9..d0b8b26 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -323,4 +323,4 @@ final class RoleP
             constraintValidator.endDate( entity.getEndLockDate() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
index 1c3cdc8..e2d21bd 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
index 7ffd867..696417b 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
index 4aca105..1a51ca5 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdP.java b/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
index 58d75f4..ff9e945 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
index fe9acde..ecdf7a0 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -167,4 +167,4 @@ final class SuffixDAO extends LdapDataProvider
 
         return dn;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
index 55db66f..a03df5f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index dd9dbe7..e9248ee 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index 837fd31..c9e2af3 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1004,4 +1004,4 @@ final class UserP
         
         return matchingConstraints;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
index 4eff1e6..54cc16a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -303,4 +303,4 @@ final class UsoUtil
         }
         return key;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/package.html b/src/main/java/org/apache/directory/fortress/core/impl/package.html
index 7a1bd0d..15b1e75 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/impl/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -95,4 +95,4 @@
     <li><a href="GroupMgrImpl.html">GroupMgrImpl</a> - CRUD for LDAP group objects.</li>
 </ol>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
index b5e8bbe..4c8f4c8 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
index e922ff5..0a46cb0 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapCounters.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapCounters.java
index 0ef99e4..d796c64 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapCounters.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapCounters.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -169,4 +169,4 @@ public class LdapCounters
     {
         return bindCtr.intValue();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
index 6119743..768b985 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControl.java b/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControl.java
index b08c53c..8550e7f 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControl.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControlImpl.java b/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControlImpl.java
index e4088fe..db4fe9f 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControlImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/RelaxControlImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/package.html b/src/main/java/org/apache/directory/fortress/core/ldap/package.html
index ea50d5c..ac3d1ac 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -23,7 +23,7 @@
 </head>
 <body>
 <p>
-    This package uses <a href="http://directory.apache.org/api/">Apache Directory LDAP APIâ„¢</a> to provide ldap data
+    This package uses <a href="https://directory.apache.org/api/">Apache Directory LDAP APIâ„¢</a> to provide ldap data
     access.
 </p>
 
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Address.java b/src/main/java/org/apache/directory/fortress/core/model/Address.java
index 20676b3..d04b355 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Address.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Address.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -461,4 +461,4 @@ public class Address implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index 0c0c06e..f0ed41a 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
index 9a97fc2..4433c6f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -82,4 +82,4 @@ public class AdminRoleRelationship extends FortEntity implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 7e31c50..35e5b62 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java b/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
index 06509ce..d204910 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Bind.java b/src/main/java/org/apache/directory/fortress/core/model/Bind.java
index 1bcea9a..14a7e5f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Bind.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Bind.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ComparisonOperator.java b/src/main/java/org/apache/directory/fortress/core/model/ComparisonOperator.java
index 417fb2c..ce187e4 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/ComparisonOperator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ComparisonOperator.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -65,4 +65,4 @@ public enum ComparisonOperator
         return this.name;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Configuration.java b/src/main/java/org/apache/directory/fortress/core/model/Configuration.java
index a2d06e8..b3c548b 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Configuration.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Configuration.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Constraint.java b/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
index 7f6d26d..fef0bdb 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -249,4 +249,4 @@ public interface Constraint
      */
     List<RoleConstraint> getConstraints();
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java b/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
index 91d9fee..47b9ea4 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Context.java b/src/main/java/org/apache/directory/fortress/core/model/Context.java
index eac9d1f..384f07a 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Context.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Context.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java b/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
index 88084cc..9c4d954 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -241,4 +241,4 @@ public abstract class FortEntity
     {
         this.sequenceId = sequenceId;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java b/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
index 90af558..a8c3d7a 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java b/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
index 8a4d310..d3244ff 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Graphable.java b/src/main/java/org/apache/directory/fortress/core/model/Graphable.java
index 6000e6b..a2edbde 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Graphable.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Graphable.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -90,4 +90,4 @@ public interface Graphable
      * @param name The name to set
      */
     void setName( String name );
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Group.java b/src/main/java/org/apache/directory/fortress/core/model/Group.java
index 3bc932f..8d19e20 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Group.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Group.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -564,4 +564,4 @@ public class Group extends FortEntity implements Serializable
             ", description='" + description + '\'' +
             '}';
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Hier.java b/src/main/java/org/apache/directory/fortress/core/model/Hier.java
index 12b4140..57057dc 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Hier.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Hier.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -385,4 +385,4 @@ public class Hier extends FortEntity implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Mod.java b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
index e7ef9e7..a122a4d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Mod.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -342,4 +342,4 @@ public class Mod extends FortEntity implements Serializable
     {
         this.sequenceId = sequenceId;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java b/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java
index 90a9975..1ed5b5c 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java b/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
index 9a0514b..33e2187 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java
index f0a11ed..38e1ac9 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/OrganizationalUnit.java b/src/main/java/org/apache/directory/fortress/core/model/OrganizationalUnit.java
index 1d2b9b6..1c91f8d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/OrganizationalUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/OrganizationalUnit.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ParentUtil.java b/src/main/java/org/apache/directory/fortress/core/model/ParentUtil.java
index e4e24b2..b774a85 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/ParentUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ParentUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java b/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java
index 77e031d..24f8ca6 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -209,4 +209,4 @@ public class PermGrant extends FortEntity implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermObj.java b/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
index 5ce03a6..fee7cdd 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Permission.java b/src/main/java/org/apache/directory/fortress/core/model/Permission.java
index b05cfe0..87199dc 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Permission.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Permission.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
index cba69c5..9b044bb 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
@@ -7,7 +7,7 @@
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *    https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
@@ -262,4 +262,4 @@ public class PermissionAttribute extends FortEntity implements Serializable
         this.description = description;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
index 5fdd6b5..1019cd6 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
@@ -7,7 +7,7 @@
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *    https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Props.java b/src/main/java/org/apache/directory/fortress/core/model/Props.java
index 95d689f..abcdd51 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Props.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Props.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -219,4 +219,4 @@ public class Props extends FortEntity implements Serializable
             return result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PwMessage.java b/src/main/java/org/apache/directory/fortress/core/model/PwMessage.java
index af373aa..c60a59f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PwMessage.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PwMessage.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java b/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
index a064bb3..e14e325 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -864,4 +864,4 @@ public class PwPolicy extends FortEntity implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Relationship.java b/src/main/java/org/apache/directory/fortress/core/model/Relationship.java
index eeb3764..a0e93a1 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Relationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Relationship.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Role.java b/src/main/java/org/apache/directory/fortress/core/model/Role.java
index ee58d69..ea5b69e 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Role.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Role.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
index dfc434b..7e49855 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
@@ -7,7 +7,7 @@
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *    https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
@@ -293,4 +293,4 @@ public class RoleConstraint extends FortEntity implements Serializable
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java b/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java
index f0fdb63..8686e68 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -82,4 +82,4 @@ public class RolePerm extends FortEntity implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java
index 6dbcd02..d4bcc8f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/SDSet.java b/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
index 1aae514..7001a03 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Session.java b/src/main/java/org/apache/directory/fortress/core/model/Session.java
index 8866ac4..2e65f73 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Session.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Session.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -890,4 +890,4 @@ public class Session  extends FortEntity implements PwMessage, Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Suffix.java b/src/main/java/org/apache/directory/fortress/core/model/Suffix.java
index ce73eb8..bc8c551 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Suffix.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Suffix.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/User.java b/src/main/java/org/apache/directory/fortress/core/model/User.java
index 72aa18a..27eaab9 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/User.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index e4c3201..99819ec 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java b/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
index c7fd33a..293c327 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -306,4 +306,4 @@ public class UserAudit extends FortEntity implements java.io.Serializable
     {
         this.admin = admin;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index d9e2156..8fa2c1f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Warning.java b/src/main/java/org/apache/directory/fortress/core/model/Warning.java
index f42fead..595df0e 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Warning.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Warning.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -184,4 +184,4 @@ public class Warning implements Serializable
 
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/model/package.html b/src/main/java/org/apache/directory/fortress/core/model/package.html
index 960dab2..ef49c7e 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/model/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/overview.html b/src/main/java/org/apache/directory/fortress/core/overview.html
index 568e80b..9643e8a 100755
--- a/src/main/java/org/apache/directory/fortress/core/overview.html
+++ b/src/main/java/org/apache/directory/fortress/core/overview.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -102,8 +102,8 @@ These APIs throw checked exceptions defined in <a href="org/apache/directory/for
 <h2>What are the conditions of use?</h2>
 
 <p>
-    This software is released under <a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a>.
+    This software is released under <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/java/org/apache/directory/fortress/core/package.html b/src/main/java/org/apache/directory/fortress/core/package.html
index 4a74d9c..91e7f13 100755
--- a/src/main/java/org/apache/directory/fortress/core/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
index 70921f5..be2d90e 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
index 2117cf6..99d4b90 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1282,4 +1282,4 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
             throw new SecurityException( response.getErrorCode(), response.getErrorMessage() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
index e06a313..86f82a3 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java b/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
index 6f71030..99016ea 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
index 2400908..059f5b3 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -182,4 +182,4 @@ public class ConfigMgrRestImpl implements ConfigMgr
     {
         throw new UnsupportedOperationException( "not implemented" );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
index 82a910a..e962788 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -404,4 +404,4 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
     {
         throw new UnsupportedOperationException( "not implemented" );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
index 4d42fe9..406cd86 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
index eba8429..99ab481 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -240,4 +240,4 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         // TODO Auto-generated method stub
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
index baca3b7..2c081a9 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java b/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
index 1e72682..f3fbec2 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -181,4 +181,4 @@ public class HttpIds
     public static final String GROUP_ASGNED = "groupAsigned";
     public static final String GROUP_ASGN = "groupAsgn";
     public static final String GROUP_DEASGN = "groupDeasgn";
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java b/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
index 78d817a..3e548a8 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -65,4 +65,4 @@ public class JAXBCachedEntry
     {
         return context;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
index d9d3915..0926e09 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
index e262527..4ee7b21 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index 83c7507..db4e998 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -563,4 +563,4 @@ public final class RestUtils
         }
         return props;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
index a2f2760..fc7ee44 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1243,4 +1243,4 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         }
         return uRoles;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/package.html b/src/main/java/org/apache/directory/fortress/core/rest/package.html
index 55d6e5e..79741b7 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/rest/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -23,7 +23,7 @@
 </head>
 <body>
 <p>
-    This package uses <a href="http://hc.apache.org/">Commons HTTP</a> to provide HTTP functionality that is reused
+    This package uses <a href="https://hc.apache.org/">Commons HTTP</a> to provide HTTP functionality that is reused
     across several components in this package.
 </p>
 
diff --git a/src/main/java/org/apache/directory/fortress/core/util/AdminPermissionUtil.java b/src/main/java/org/apache/directory/fortress/core/util/AdminPermissionUtil.java
index 18c9e4c..67ec947 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/AdminPermissionUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/AdminPermissionUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/AuditUtil.java b/src/main/java/org/apache/directory/fortress/core/util/AuditUtil.java
index 0e23683..c91d27d 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/AuditUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/AuditUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/AuthNValidator.java b/src/main/java/org/apache/directory/fortress/core/util/AuthNValidator.java
index 71f6608..82b1ba3 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/AuthNValidator.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/AuthNValidator.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -128,4 +128,4 @@ public abstract class AuthNValidator implements Validator
     {
         this.isAuthenticated = isAuthenticated;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/ClassUtil.java b/src/main/java/org/apache/directory/fortress/core/util/ClassUtil.java
index 07cd707..17884aa 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/ClassUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/ClassUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index f672a0b..8e9a326 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -7,7 +7,7 @@ cs *   Licensed to the Apache Software Foundation (ASF) under one
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -39,7 +39,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This class wraps <a href="http://commons.apache.org/cfg/">Apache Commons Config</a> utility and is used by internal components to retrieve name-value
+ * This class wraps <a href="https://commons.apache.org/cfg/">Apache Commons Config</a> utility and is used by internal components to retrieve name-value
  * pair properties from its cfg context.  The class will combine properties that it finds in its local property
  * file along with data that is retrieved by name from the ldap server if name is specified within
  * the {@link org.apache.directory.fortress.core.GlobalIds#CONFIG_REALM} switch.
diff --git a/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java b/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
index 404698f..ae4d7e1 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java b/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java
index 1b79a9b..9cd9dee 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java b/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java
index 0f72b7d..43f4c49 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
index cbe5b36..a46c948 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/PropUpdater.java b/src/main/java/org/apache/directory/fortress/core/util/PropUpdater.java
index a423346..83351f1 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/PropUpdater.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/PropUpdater.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/PropUtil.java b/src/main/java/org/apache/directory/fortress/core/util/PropUtil.java
index 3b18265..839196b 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/PropUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/PropUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/RegExUtil.java b/src/main/java/org/apache/directory/fortress/core/util/RegExUtil.java
index 4739868..46c3221 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/RegExUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/RegExUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -103,4 +103,4 @@ final class RegExUtil
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/ResourceUtil.java b/src/main/java/org/apache/directory/fortress/core/util/ResourceUtil.java
index 076d9d5..7cd491e 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/ResourceUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/ResourceUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Testable.java b/src/main/java/org/apache/directory/fortress/core/util/Testable.java
index 98a8a5e..735c0ab 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/Testable.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Testable.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
index f550bda..56bd5a5 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java b/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
index 1cefc4f..0a70a06 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -86,4 +86,4 @@ public interface Cache
      * @return a new Query builder
      */
     Query createQuery();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
index 4885164..c7ee818 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
index 65e873d..f307698 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
index da85a4a..d53a477 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java b/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
index d13dd4c..8b45cb0 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -150,4 +150,4 @@ public class DsdCacheEntry
     {
         this.contextId = contextId;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java b/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
index 4d21840..1bf0bf1 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/package.html b/src/main/java/org/apache/directory/fortress/core/util/cache/package.html
index 98c7948..f0f1829 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/package.html b/src/main/java/org/apache/directory/fortress/core/util/package.html
index fb58fca..3b2e812 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/util/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
index 3e20a7d..b99594a 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Date.java b/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
index 9d81347..e0568b3 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Day.java b/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
index a870b64..80cb2d3 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java b/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java
index cb6e0f6..5bbd1d9 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -103,4 +103,4 @@ public class Discriminant
         return values;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java b/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
index 36182fa..76abb40 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
index 9deed15..61787e8 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Time.java b/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
index aa1d5fd..9382b04 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
index b101ced..c7b5c23 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java b/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java
index 6edfec8..f0da076 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -91,4 +91,4 @@ public class UserRoleConstraint
         }
         return rc;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java b/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
index 848ed73..2b39763 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/package.html b/src/main/java/org/apache/directory/fortress/core/util/time/package.html
index a3c230a..db1d8a7 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/owasp/suppression.xml b/src/owasp/suppression.xml
index 4a269c7..78fb1f7 100644
--- a/src/owasp/suppression.xml
+++ b/src/owasp/suppression.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -34,4 +34,4 @@
         <gav regex="true">^org\.openldap:accelerator-impl:.*$</gav>
         <cpe>cpe:/a:openldap:openldap</cpe>
     </suppress>
-</suppressions>
\ No newline at end of file
+</suppressions>
diff --git a/src/test/build.xml b/src/test/build.xml
index 08fe631..b16e636 100755
--- a/src/test/build.xml
+++ b/src/test/build.xml
@@ -7,7 +7,7 @@
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
index 5f5941d..1418aa6 100644
--- a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
index b308057..6815d14 100755
--- a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index ed264b1..ab56f69 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
index a911a9d..725e635 100755
--- a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -985,4 +985,4 @@ class AuditMgrConsole
         }
         return pOp;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
index 7fe9ca7..81e0c90 100755
--- a/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -182,4 +182,4 @@ class ConfigMgrConsole
         ReaderUtil.readChar();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
index 2e65b66..630996c 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
index 016bc87..65de5bc 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
index f425d52..9d39fc8 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
index 6c3980b..52afb61 100755
--- a/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/FortressConsole.java b/src/test/java/org/apache/directory/fortress/core/FortressConsole.java
index 1721c0a..591605d 100755
--- a/src/test/java/org/apache/directory/fortress/core/FortressConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/FortressConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
index 083d26b..05a657e 100755
--- a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -347,4 +347,4 @@ class GroupMgrConsole
         }
         ReaderUtil.readChar();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
index 7fab3ed..48786a0 100755
--- a/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
index 990317e..8a6c378 100755
--- a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
+++ b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java b/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
index e45e4cf..7f3fd6b 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
index 48da4b3..a7028c0 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -1066,4 +1066,4 @@ class ReviewMgrConsole
         ReaderUtil.readChar();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java b/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
index 5e221b0..1d3f69c 100644
--- a/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
+++ b/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
@@ -7,7 +7,7 @@
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
  *  
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *    https://www.apache.org/licenses/LICENSE-2.0
  *  
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/ant/TestAddUsers.xml b/src/test/java/org/apache/directory/fortress/core/ant/TestAddUsers.xml
index 394ce25..cd415d8 100755
--- a/src/test/java/org/apache/directory/fortress/core/ant/TestAddUsers.xml
+++ b/src/test/java/org/apache/directory/fortress/core/ant/TestAddUsers.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -166,4 +166,4 @@
 
          </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/java/org/apache/directory/fortress/core/example/Addexample.java b/src/test/java/org/apache/directory/fortress/core/example/Addexample.java
index 7017347..830fb71 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/Addexample.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/Addexample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/Delexample.java b/src/test/java/org/apache/directory/fortress/core/example/Delexample.java
index 547bae2..07560e8 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/Delexample.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/Delexample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/EErrIds.java b/src/test/java/org/apache/directory/fortress/core/example/EErrIds.java
index 86e0972..ac22c6d 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/EErrIds.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/EErrIds.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/EIds.java b/src/test/java/org/apache/directory/fortress/core/example/EIds.java
index 4067c25..9d93da9 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/EIds.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/EIds.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/Example.java b/src/test/java/org/apache/directory/fortress/core/example/Example.java
index 21fb6b0..78c254f 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/Example.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/Example.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
index 01a4259..7bb90e6 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
index 8c67de5..73eb4ee 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
index ba3ada0..9ae648e 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
index 9c15716..64d3bae 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
index 36b35df..b42d3c9 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/example/example.schema b/src/test/java/org/apache/directory/fortress/core/example/example.schema
index e0ac63b..6b5f646 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/example.schema
+++ b/src/test/java/org/apache/directory/fortress/core/example/example.schema
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
@@ -50,4 +50,4 @@ objectclass	( 1.3.6.1.4.1.38088.2.101
     MAY (
 		description
 		)
-	)		
\ No newline at end of file
+	)		
diff --git a/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java b/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
index fb5e916..be8cfc8 100644
--- a/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest1.xml b/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest1.xml
index a4864b8..4c6dcb4 100644
--- a/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest1.xml
+++ b/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest1.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -87,4 +87,4 @@
 
         </GroupTest>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest2.xml b/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest2.xml
index 81e40e5..aecf274 100644
--- a/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest2.xml
+++ b/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest2.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -151,4 +151,4 @@
 
         </GroupTest>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest3.xml b/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest3.xml
index 63301d4..1a0fba9 100644
--- a/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest3.xml
+++ b/src/test/java/org/apache/directory/fortress/core/group/LoadGroupTest3.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -37,4 +37,4 @@
 
         </GroupTest>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java
index 308726b..186d4ae 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -455,4 +455,4 @@ public class AccelMgrImplTest extends TestCase
             fail( ex.getMessage() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
index ad971ec..1e5d43a 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -41,6 +41,8 @@ import org.slf4j.LoggerFactory;
 
 import org.apache.directory.fortress.core.AccessMgr;
 import org.apache.directory.fortress.core.AccessMgrFactory;
+import org.apache.directory.fortress.core.AdminMgr;
+import org.apache.directory.fortress.core.AdminMgrFactory;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.PwPolicyMgr;
 import org.apache.directory.fortress.core.SecurityException;
@@ -99,6 +101,7 @@ public class AccessMgrImplTest extends TestCase
     public void testGetSession() throws Exception
     {
         //TODO: Test goes here...
+        
     }
 
 
@@ -345,6 +348,21 @@ public class AccessMgrImplTest extends TestCase
     public void testCreateSession()
     {
         // public Session createSession(User user, boolean isTrusted)
+        try
+        {
+            // Instantiate the AdminMgr first
+            AdminMgr adminMgr = AdminMgrFactory.createInstance();
+            
+            User myUser = new User( "myUserId", "myPassword", "Test", "People" );
+            
+            adminMgr.addUser( myUser );
+        }
+        catch (SecurityException ex)
+        {
+         // log or throw
+        }
+        
+        
         createSessions( "CREATE-SESS TU1_UPD TR1", UserTestData.USERS_TU1_UPD, RoleTestData.ROLES_TR1 );
         createSessions( "CREATE-SESS TU3 TR3", UserTestData.USERS_TU3, RoleTestData.ROLES_TR3 );
         createSessions( "CREATE-SESS TU4 TR2", UserTestData.USERS_TU4, RoleTestData.ROLES_TR2 );
@@ -737,9 +755,11 @@ public class AccessMgrImplTest extends TestCase
         String[][] oArrayBad, String[][] opArrayBad )
     {
         LogUtil.logIt( msg );
+        
         try
         {
             AccessMgr accessMgr = AccessMgrFactory.createInstance( TestUtils.getContext() );
+            
             for ( String[] usr : uArray )
             {
                 User user = UserTestData.getUser( usr );
@@ -1444,4 +1464,4 @@ public class AccessMgrImplTest extends TestCase
             fail( ex.getMessage() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
index 5baa762..d96c9e0 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
index a0afe92..a82a331 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AuditMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AuditMgrImplTest.java
index dc1d283..ba666a9 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AuditMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AuditMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/CacheSample.java b/src/test/java/org/apache/directory/fortress/core/impl/CacheSample.java
index 311c9d7..ed91805 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/CacheSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/CacheSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -178,4 +178,4 @@ public class CacheSample
             this.sdSet = sdSet;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/DelegatedMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/DelegatedMgrImplTest.java
index 275929e..99d34b9 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/DelegatedMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/DelegatedMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/FortressAntLoadTest.java b/src/test/java/org/apache/directory/fortress/core/impl/FortressAntLoadTest.java
index a6f8967..34d61a8 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/FortressAntLoadTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/FortressAntLoadTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -418,4 +418,4 @@ public class FortressAntLoadTest implements Testable
             fail( ex.getMessage() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
index 66f4268..25f60f5 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/GroupMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/GroupMgrImplTest.java
index 09fd8af..d20c3e8 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/GroupMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/GroupMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -322,4 +322,4 @@ public class GroupMgrImplTest extends TestCase {
             fail(ex.getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/GroupTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/GroupTestData.java
index ff95a15..f1097ac 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/GroupTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/GroupTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -91,4 +91,4 @@ public class GroupTestData
         group.setMembers( memberNames );
         return group;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/MyAnnotation.java b/src/test/java/org/apache/directory/fortress/core/impl/MyAnnotation.java
index 29ae859..a30ac9d 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/MyAnnotation.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/MyAnnotation.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java
index 02b70d8..f35f0ce 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PRA.java b/src/test/java/org/apache/directory/fortress/core/impl/PRA.java
index f26e009..8dad96f 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/PRA.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PRA.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java b/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java
index a513196..02498c1 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PermTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/PermTestData.java
index a0ef1bf..029aaea 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/PermTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PermTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -3510,4 +3510,4 @@ public class PermTestData extends TestCase
         return permAttrs;
     }
     
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PolicyTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/PolicyTestData.java
index ebd0a02..baeed62 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/PolicyTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PolicyTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -787,4 +787,4 @@ public class PolicyTestData extends TestCase
         //return new Boolean(plcy[SAFEMODIFY_COL]);
         return Boolean.valueOf( plcy[SAFEMODIFY_COL] );
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
index 7882e76..afa68c5 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PswdPolicyMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/PswdPolicyMgrImplTest.java
index 4e5d569..256517d 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/PswdPolicyMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PswdPolicyMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
index 3254551..20de157 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java
index 18051b4..bdcd172 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -4116,4 +4116,4 @@ public class RoleTestData extends TestCase
             }
         };
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java b/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java
index 4855837..ffbc111 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -292,4 +292,4 @@ public class TestUtils extends TestCase
         }
         return vSets;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/URA.java b/src/test/java/org/apache/directory/fortress/core/impl/URA.java
index 1a0c872..084ee88 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/URA.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/URA.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java b/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java
index 3c1dcbc..2a6f4d4 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
index 519c15b..b789be7 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -7007,4 +7007,4 @@ public class UserTestData extends TestCase
      * Not currently used but will be in future for performance testing:
      */
     final static int USER_MULTIPLIER = 10;
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java b/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
index 682dfbb..7091b84 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -277,4 +277,4 @@ public class TestAccelerator
             fail();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
index 9f94e64..90583e7 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
index edc6ec1..74ed098 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
index c29a29e..520656f 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
index 441b46d..8e6798c 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index 49092af..48c50e2 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
index f2fad09..ca1e905 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/DelUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/DelUser.java
index c96b719..0f92b86 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/DelUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/DelUser.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
index 3636f7f..eb9fb5a 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/SessionPermissions.java b/src/test/java/org/apache/directory/fortress/core/jmeter/SessionPermissions.java
index 3d2a888..fc4a84d 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/SessionPermissions.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/SessionPermissions.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java b/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java
index 48fcb0d..0753654 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AbacSample.java b/src/test/java/org/apache/directory/fortress/core/samples/AbacSample.java
index 5f64ace..dad59c6 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AbacSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AbacSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -217,4 +217,4 @@ public class AbacSample extends TestCase
             fail( ex.getMessage() );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java b/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
index 08595fb..d06e8db 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
index 5e11217..cc65434 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
index b83b780..d263b80 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
index e6dfeef..c9c0dcc 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
index a5353c4..e6af354 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
index e4d0312..8c4113b 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -321,4 +321,4 @@ public class CreateRoleHierarchySample extends TestCase
             fail(ex.getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
index 4e633cd..797d75b 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
index e1ea9c6..c754ce0 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
index aff77f4..e897ffb 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
index d3cf56e..fc2453e 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
index 566d80f..243a797 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
index 941b7d9..f238659 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -194,4 +194,4 @@ public class CreateUserSample extends TestCase
             fail(ex.getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/LoadTestUserSample.java b/src/test/java/org/apache/directory/fortress/core/samples/LoadTestUserSample.java
index c736a66..b0bd0ed 100644
--- a/src/test/java/org/apache/directory/fortress/core/samples/LoadTestUserSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/LoadTestUserSample.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -261,4 +261,4 @@ public class LoadTestUserSample extends TestCase
             fail(ex.getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/overview.html b/src/test/java/org/apache/directory/fortress/core/samples/overview.html
index 3922fc5..cf6b882 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/overview.html
+++ b/src/test/java/org/apache/directory/fortress/core/samples/overview.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
@@ -50,4 +50,4 @@ mvn -Dtest=NameOfSample test
         Where NameOfSample is the name of test to run, e.g. AllSamplesJUnitTest
       </p>
    </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/package.html b/src/test/java/org/apache/directory/fortress/core/samples/package.html
index 7b5e5cd..7c61934 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/package.html
+++ b/src/test/java/org/apache/directory/fortress/core/samples/package.html
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/util/AdminPermissionUtilTest.java b/src/test/java/org/apache/directory/fortress/core/util/AdminPermissionUtilTest.java
index aa279ba..5d5d997 100644
--- a/src/test/java/org/apache/directory/fortress/core/util/AdminPermissionUtilTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/util/AdminPermissionUtilTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/java/org/apache/directory/fortress/core/util/ResourceUtilTest.java b/src/test/java/org/apache/directory/fortress/core/util/ResourceUtilTest.java
index 84e274f..96c1f72 100644
--- a/src/test/java/org/apache/directory/fortress/core/util/ResourceUtilTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/util/ResourceUtilTest.java
@@ -7,7 +7,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/acCheckAccess.jmx b/src/test/jmeter/acCheckAccess.jmx
index 1c0887c..26cdaae 100644
--- a/src/test/jmeter/acCheckAccess.jmx
+++ b/src/test/jmeter/acCheckAccess.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/acCreateSession.jmx b/src/test/jmeter/acCreateSession.jmx
index 08963f6..3f74579 100644
--- a/src/test/jmeter/acCreateSession.jmx
+++ b/src/test/jmeter/acCreateSession.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/acSessionPerms.jmx b/src/test/jmeter/acSessionPerms.jmx
index be1cff8..6db805e 100644
--- a/src/test/jmeter/acSessionPerms.jmx
+++ b/src/test/jmeter/acSessionPerms.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/ftAddUser.jmx b/src/test/jmeter/ftAddUser.jmx
index 99b1e9e..d1811ab 100644
--- a/src/test/jmeter/ftAddUser.jmx
+++ b/src/test/jmeter/ftAddUser.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/ftCheckAccess.jmx b/src/test/jmeter/ftCheckAccess.jmx
index 960ae09..4a0287e 100644
--- a/src/test/jmeter/ftCheckAccess.jmx
+++ b/src/test/jmeter/ftCheckAccess.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/ftCheckUser.jmx b/src/test/jmeter/ftCheckUser.jmx
index 4abcb5d..57d8e37 100644
--- a/src/test/jmeter/ftCheckUser.jmx
+++ b/src/test/jmeter/ftCheckUser.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/ftCreateSession.jmx b/src/test/jmeter/ftCreateSession.jmx
index f004e13..a43c30c 100644
--- a/src/test/jmeter/ftCreateSession.jmx
+++ b/src/test/jmeter/ftCreateSession.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -102,4 +102,4 @@
       </hashTree>
     </hashTree>
   </hashTree>
-</jmeterTestPlan>
\ No newline at end of file
+</jmeterTestPlan>
diff --git a/src/test/jmeter/ftDelUser.jmx b/src/test/jmeter/ftDelUser.jmx
index 7f7d478..fb70eac 100644
--- a/src/test/jmeter/ftDelUser.jmx
+++ b/src/test/jmeter/ftDelUser.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/jmeter/ftSessionPerms.jmx b/src/test/jmeter/ftSessionPerms.jmx
index 979f71c..635021f 100644
--- a/src/test/jmeter/ftSessionPerms.jmx
+++ b/src/test/jmeter/ftSessionPerms.jmx
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/src/test/resources/fortress-schema.ldif b/src/test/resources/fortress-schema.ldif
index d5767a3..c0ee680 100644
--- a/src/test/resources/fortress-schema.ldif
+++ b/src/test/resources/fortress-schema.ldif
@@ -8,7 +8,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/test/resources/init-ldap.ldif b/src/test/resources/init-ldap.ldif
index 2c27dee..efd1dc9 100644
--- a/src/test/resources/init-ldap.ldif
+++ b/src/test/resources/init-ldap.ldif
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml
index 83a4cba..c4ff8f0 100755
--- a/src/test/resources/log4j2.xml
+++ b/src/test/resources/log4j2.xml
@@ -8,7 +8,7 @@
  *   "License"); you may not use this file except in compliance
  *   with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing,
  *   software distributed under the License is distributed on an
diff --git a/src/test/resources/test-data.ldif b/src/test/resources/test-data.ldif
index 86d5376..76753be 100644
--- a/src/test/resources/test-data.ldif
+++ b/src/test/resources/test-data.ldif
@@ -7,7 +7,7 @@
 #   "License"); you may not use this file except in compliance
 #   with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing,
 #   software distributed under the License is distributed on an