From 88af4a261d0e4e340070947af1c62bbbdaa8cc74 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Tue, 18 Sep 2012 14:58:38 +0000 Subject: [PATCH] Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to HEAD: 41501: Creating Quick Share branch for merging into head 41524: Merged THOR1 & THOR1_SPRINTS to HEAD_QUICK_SHARE_TMP 30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay) 36011: Merged BRANCHES/DEV/THOR1_QUICK_SHARE to BRANCHES/DEV/THOR1_SPRINTS: 34685: Creating Quick Share branch 34826: First cut of THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" 34868: More on THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" 34901: QuickShare REST API - WIP ... note: API will change :-) 34933: QuickShare REST API - WIP 34934: QuickShare REST API - WIP 34941: QuickShare REST API - WIP ... note: API will change :-) 34989: QuickShare REST API - WIP 34995: QuickShare REST API - WIP 34996: QuickShare REST API - WIP 35011: QuickShare/PublicView REST API 35025: F387: As the link receiver, I can view the Document Preview in the browser without having to login 35035: QuickShare/PublicView REST API 35052: QuickShare/PublicView REST API 35069: More on THOR-1270 "F387 As the link receiver, I can view the Document Preview in the browser without having to login" 35094: Removed cpnfig property that was commited by mistake 35111: First cut of THOR-1268 "F378: As a user I can choose to share a document" 35252: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit 35254: First cut of THOR-1268 "F378: As a user I can choose to share a document" part 2 35255: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" 35264: QuickShare/PublicView REST API 35317: THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 1) 35319: QuickShare REST API - fix tenant ref when share'ing 35330: QuickShare REST API - fix THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 2) 35368: QuickShare REST API - THOR-1336: (F418) Get context (nodeRef, siteId, tenantDomain) for a shared_id 35376: QuickShare REST API - fix THOR-1273 (unshare document) 35424: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit 35425: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit 35566: Fixed THOR-1268 "F378: As a user I can choose to share a document" 35617: THOR-1350: Update Slingshot API (doclib2) - make the "qshare:sharedBy" return full details (instead of just userName) 35624: THOR-1339: QuickShare REST API 35682: Fixed THOR-1268, THOR-1339 & THOR-1269 35935: QuickShare REST API - add "system.quickshare.enabled" prop (if set to false then disables QuickShare service/API) 35996: Fixed THOR-1369 & THOR-1270 35997: Fixed THOR-1369 & THOR-1270 part 2 36000: Fixed THOR-1369 & THOR-1270 part 3 41550: Merged THOR1 & THOR1_SPRINTS to HEAD_QUICK_SHARE_TMP part 2 41569: Updated web.xml to add support for URLRewrite filtering for Quick Share 41572: Merged THOR1 & THOR1_SPRINTS to HEAD_QUICK_SHARE_TMP part 3 41640: Merged THOR1_SPRINTS to HEAD_QUICK_SHARE_TMP 36082: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" - Re-added "Document Details" link public share page git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/core-services-context.xml | 3 ++ config/alfresco/model/quickShareModel.xml | 41 +++++++++++++++++++ config/alfresco/repository.properties | 3 ++ config/alfresco/script-services-context.xml | 1 + .../org/alfresco/model/QuickShareModel.java | 40 ++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 config/alfresco/model/quickShareModel.xml create mode 100644 source/java/org/alfresco/model/QuickShareModel.java diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml index fd17fd7ed0..ff0aa7a6df 100644 --- a/config/alfresco/core-services-context.xml +++ b/config/alfresco/core-services-context.xml @@ -778,6 +778,9 @@ alfresco/model/datalistModel.xml + + + alfresco/model/quickShareModel.xml diff --git a/config/alfresco/model/quickShareModel.xml b/config/alfresco/model/quickShareModel.xml new file mode 100644 index 0000000000..bc685c5596 --- /dev/null +++ b/config/alfresco/model/quickShareModel.xml @@ -0,0 +1,41 @@ + + + QuickShare Model Definitions + 0.1 + + + + + + + + + + + + + + + Shared Id + d:text + true + true + false + + false + + + + Shared By + d:text + true + true + false + + false + + + + + + \ No newline at end of file diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties index 286a29f313..210683ae24 100644 --- a/config/alfresco/repository.properties +++ b/config/alfresco/repository.properties @@ -1017,3 +1017,6 @@ ticket.cleanup.cronExpression=0 0 * * * ? # Disable load of sample site # sample.site.disabled=false + +# enable QuickShare - if false then the QuickShare-specific REST APIs will return 403 Forbidden +system.quickshare.enabled=true \ No newline at end of file diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml index 058ef44570..7d69b68e92 100644 --- a/config/alfresco/script-services-context.xml +++ b/config/alfresco/script-services-context.xml @@ -266,6 +266,7 @@ cm:workingCopyOwner cm:lockOwner cm:owner + qshare:sharedBy diff --git a/source/java/org/alfresco/model/QuickShareModel.java b/source/java/org/alfresco/model/QuickShareModel.java new file mode 100644 index 0000000000..434458e320 --- /dev/null +++ b/source/java/org/alfresco/model/QuickShareModel.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2005-2012 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.model; + +import org.alfresco.service.namespace.QName; + + +/** + * QuickShare Model Constants + * + * @author janv + */ +public interface QuickShareModel +{ + // Namespaces + static final String QSHARE_MODEL_1_0_URI = "http://www.alfresco.org/model/qshare/1.0"; + + // Aspects + static final QName ASPECT_QSHARE = QName.createQName(QSHARE_MODEL_1_0_URI, "shared"); + + // Properties + static final QName PROP_QSHARE_SHAREDID = QName.createQName(QSHARE_MODEL_1_0_URI, "sharedId"); + static final QName PROP_QSHARE_SHAREDBY = QName.createQName(QSHARE_MODEL_1_0_URI, "sharedBy"); +}