From 0802442c2054e421e62cb09caca72424a5c586ce Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 6 Jun 2016 09:10:00 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 126994 amorarasu: Update source headers - add new Copyrights for new Java files synced from Head (part 1). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/model/ContentInfo.java | 19 +++++++++++++------ .../org/alfresco/rest/api/model/PathInfo.java | 19 +++++++++++++------ .../org/alfresco/rest/api/model/UserInfo.java | 19 +++++++++++++------ .../rest/api/nodes/NodeChildrenRelation.java | 19 +++++++++++++------ 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/source/java/org/alfresco/rest/api/model/ContentInfo.java b/source/java/org/alfresco/rest/api/model/ContentInfo.java index 4d03ab62fb..348b164cb4 100644 --- a/source/java/org/alfresco/rest/api/model/ContentInfo.java +++ b/source/java/org/alfresco/rest/api/model/ContentInfo.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Remote API + * %% + * 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.rest.api.model; diff --git a/source/java/org/alfresco/rest/api/model/PathInfo.java b/source/java/org/alfresco/rest/api/model/PathInfo.java index d060fe864f..4bccfe77ed 100644 --- a/source/java/org/alfresco/rest/api/model/PathInfo.java +++ b/source/java/org/alfresco/rest/api/model/PathInfo.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Remote API + * %% + * 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.rest.api.model; diff --git a/source/java/org/alfresco/rest/api/model/UserInfo.java b/source/java/org/alfresco/rest/api/model/UserInfo.java index 75618831ca..b17c529f66 100644 --- a/source/java/org/alfresco/rest/api/model/UserInfo.java +++ b/source/java/org/alfresco/rest/api/model/UserInfo.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Remote API + * %% + * 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.rest.api.model; diff --git a/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java b/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java index c14b9f0a4b..0584040e12 100644 --- a/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java +++ b/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java @@ -1,20 +1,27 @@ /* - * Copyright (C) 2005-2016 Alfresco Software Limited. - * - * This file is part of Alfresco - * + * #%L + * Alfresco Remote API + * %% + * 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.rest.api.nodes;