From 1ad1f74dc8cb74752c5c835dac7b49200fabf623 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 4 Jun 2016 11:00:31 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 125793 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 125629 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl) - Fixed build on 5.1.N (Plat) due to new license header plugin checks (updated headers to the 3 new files) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ...ryServiceUserAccountStatusInterpreter.java | 19 +++++++++++++------ .../LDAPUserAccountStatusInterpreter.java | 19 +++++++++++++------ .../LDAPADUserAccountStatusInterpreter.java | 19 +++++++++++++------ 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/source/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java b/source/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java index ce3c02c85c..d93733cd5c 100644 --- a/source/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java +++ b/source/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Alfresco is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . + * #L% */ package org.alfresco.repo.security.sync.ldap; diff --git a/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java b/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java index c3d4a99595..44dcf7c0d7 100644 --- a/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java +++ b/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Alfresco is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . + * #L% */ package org.alfresco.repo.security.sync.ldap; diff --git a/source/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java b/source/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java index 8656099522..2eb8000fe1 100644 --- a/source/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java +++ b/source/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Alfresco is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . + * #L% */ package org.alfresco.repo.security.sync.ldap_ad;