From bd2cf2c35d88967376a3f9b6fd2afdb67bacbc95 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 4 Jun 2016 11:00:15 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 125790 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 125618 rmunteanu: MNT-16155 : Change source headers to new version - fixed more license headers git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AlfrescoMySQLClusterNDBDialect.java | 19 +++++++++++++------ .../domain/permissions/FixedAclUpdater.java | 19 +++++++++++++------ .../permissions/FixedAclUpdaterJob.java | 19 +++++++++++++------ .../permissions/FixedAclUpdaterTest.java | 19 +++++++++++++------ 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.java b/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.java index 74e714a243..7927b6ee41 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.java +++ b/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.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.domain.hibernate.dialect; diff --git a/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java b/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java index 57570df828..e24b8cc8cc 100644 --- a/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java +++ b/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.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.domain.permissions; diff --git a/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java b/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java index f9b39272d7..9086f405e4 100644 --- a/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java +++ b/source/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.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.domain.permissions; diff --git a/source/test-java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java b/source/test-java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java index 49c8a1e9af..d8966ba918 100644 --- a/source/test-java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java +++ b/source/test-java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.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.domain.permissions;