From c53c26aefb0de56e3bba74483f83d0bf99bdf933 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 11:00:12 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126391 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 120592 jvonka: FileFolder API - trivial (add/udpate lic header) - note: at some point, we should do a sweep through the rest of the (remote-)api source code git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/model/ContentInfo.java | 18 ++++++++++++++++++ .../org/alfresco/rest/api/model/Folder.java | 1 - .../org/alfresco/rest/api/model/PathInfo.java | 19 ++++++++++++++++++- .../org/alfresco/rest/api/model/UserInfo.java | 3 +-- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/rest/api/model/ContentInfo.java b/source/java/org/alfresco/rest/api/model/ContentInfo.java index 96b271a990..482b07b2d1 100644 --- a/source/java/org/alfresco/rest/api/model/ContentInfo.java +++ b/source/java/org/alfresco/rest/api/model/ContentInfo.java @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2005-2016 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * 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 . + */ package org.alfresco.rest.api.model; /** diff --git a/source/java/org/alfresco/rest/api/model/Folder.java b/source/java/org/alfresco/rest/api/model/Folder.java index 54005048dd..17dcb39e83 100644 --- a/source/java/org/alfresco/rest/api/model/Folder.java +++ b/source/java/org/alfresco/rest/api/model/Folder.java @@ -23,7 +23,6 @@ * along with Alfresco. If not, see . * #L% */ - package org.alfresco.rest.api.model; import java.io.Serializable; diff --git a/source/java/org/alfresco/rest/api/model/PathInfo.java b/source/java/org/alfresco/rest/api/model/PathInfo.java index 07763aaffa..145afda598 100644 --- a/source/java/org/alfresco/rest/api/model/PathInfo.java +++ b/source/java/org/alfresco/rest/api/model/PathInfo.java @@ -1,4 +1,21 @@ - +/* + * Copyright (C) 2005-2016 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * 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 . + */ package org.alfresco.rest.api.model; import java.util.List; diff --git a/source/java/org/alfresco/rest/api/model/UserInfo.java b/source/java/org/alfresco/rest/api/model/UserInfo.java index 9c7d3eee45..75618831ca 100644 --- a/source/java/org/alfresco/rest/api/model/UserInfo.java +++ b/source/java/org/alfresco/rest/api/model/UserInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2015 Alfresco Software Limited. + * Copyright (C) 2005-2016 Alfresco Software Limited. * * This file is part of Alfresco * @@ -16,7 +16,6 @@ * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . */ - package org.alfresco.rest.api.model; import java.io.Serializable;