From 37d1b200a21e61cc6a2882222e4743cab34347b5 Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Fri, 16 Jun 2017 18:44:14 +0300 Subject: [PATCH 01/12] RM-5309 - Remove shared link if exists when a record is declared --- .../rm-model-context.xml | 1 + .../model/rma/aspect/RecordAspect.java | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml index dde414270d..033da4a348 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml @@ -133,6 +133,7 @@ + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index a2ece30962..7d32f30d3f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Set; import org.alfresco.model.ContentModel; +import org.alfresco.model.QuickShareModel; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies; import org.alfresco.module.org_alfresco_module_rm.model.behaviour.AbstractDisposableItem; import org.alfresco.module.org_alfresco_module_rm.record.RecordService; @@ -46,7 +47,9 @@ import org.alfresco.repo.policy.Behaviour.NotificationFrequency; import org.alfresco.repo.policy.annotation.Behaviour; import org.alfresco.repo.policy.annotation.BehaviourBean; import org.alfresco.repo.policy.annotation.BehaviourKind; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; +import org.alfresco.service.cmr.quickshare.QuickShareService; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.ScriptService; @@ -64,6 +67,7 @@ import org.alfresco.service.namespace.QName; ) public class RecordAspect extends AbstractDisposableItem implements NodeServicePolicies.OnCreateChildAssociationPolicy, + NodeServicePolicies.OnAddAspectPolicy, RecordsManagementPolicies.OnCreateReference, RecordsManagementPolicies.OnRemoveReference, NodeServicePolicies.OnMoveNodePolicy, @@ -81,6 +85,9 @@ public class RecordAspect extends AbstractDisposableItem /** record service */ protected RecordService recordService; + + /** quickShare service */ + private QuickShareService quickShareService; /** * @param extendedSecurityService extended security service @@ -106,6 +113,15 @@ public class RecordAspect extends AbstractDisposableItem this.recordService = recordService; } + /** + * + * @param quickShareService + */ + public void setQuickShareService(QuickShareService quickShareService) + { + this.quickShareService = quickShareService; + } + /** * Behaviour to ensure renditions have the appropriate extended security. * @@ -336,4 +352,30 @@ public class RecordAspect extends AbstractDisposableItem extendedSecurityService.remove(targetNodeRef); } } + + /** + * Behaviour to remove the shared link when record is declared + * + * @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, + * org.alfresco.service.namespace.QName) + */ + @Override + @Behaviour(kind = BehaviourKind.CLASS, notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT) + public void onAddAspect(final NodeRef nodeRef, final QName aspectTypeQName) + { + AuthenticationUtil.runAs(new RunAsWork() + { + @Override + public Void doWork() + { + String sharedId = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDID); + if (sharedId != null) + { + quickShareService.unshareContent(sharedId); + } + + return null; + } + }, AuthenticationUtil.getSystemUserName()); + } } From 15e308a547ac6e4dba48bc1ef1e5ad356639a10d Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Mon, 19 Jun 2017 17:46:34 +0300 Subject: [PATCH 02/12] RM-5309 - Added integration test for the case: when a record is declared, the shared link is removed --- .../record/CreateInplaceRecordTest.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateInplaceRecordTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateInplaceRecordTest.java index e5f5137695..d8b3a918ba 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateInplaceRecordTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateInplaceRecordTest.java @@ -27,12 +27,14 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.record; +import org.alfresco.model.QuickShareModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.service.cmr.model.FileExistsException; import org.alfresco.service.cmr.model.FileNotFoundException; +import org.alfresco.service.cmr.quickshare.QuickShareService; import org.alfresco.service.cmr.security.AccessStatus; /** @@ -42,12 +44,25 @@ import org.alfresco.service.cmr.security.AccessStatus; */ public class CreateInplaceRecordTest extends BaseRMTestCase { + private QuickShareService quickShareService; + @Override protected boolean isCollaborationSiteTest() { return true; } + /** + * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices() + */ + @Override + protected void initServices() + { + super.initServices(); + + quickShareService = (QuickShareService) applicationContext.getBean("quickShareService"); + } + /** * Given a document in a collaboration site * When the document is declared by a site collaborator @@ -185,4 +200,49 @@ public class CreateInplaceRecordTest extends BaseRMTestCase } }); } + + /** + * Given a shared document in a collaboration site + * When the document is declared as record by a site collaborator + * Then the document becomes a record and is not shared anymore + */ + public void testCreateInplaceRecordFromCollabSiteRemovesSharedLink() + { + doBehaviourDrivenTest(new BehaviourDrivenTest() + { + public void given() + { + // Check that the document is not a record + assertFalse("The document should not be a record", recordService.isRecord(dmDocument)); + + quickShareService.shareContent(dmDocument); + // Check the document is shared + assertTrue("The document is shared", nodeService.hasAspect(dmDocument, QuickShareModel.ASPECT_QSHARE)); + } + + public void when() + { + // Declare the document as a record + AuthenticationUtil.runAs(new RunAsWork() + { + public Void doWork() throws Exception + { + // Declare record + recordService.createRecord(filePlan, dmDocument); + + return null; + } + }, dmCollaborator); + } + + public void then() + { + // Check that the document is a record now + assertTrue("The document should now be a record", recordService.isRecord(dmDocument)); + + // Check that the record is not shared anymore + assertFalse("The document should not be shared anymore", nodeService.hasAspect(dmDocument, QuickShareModel.ASPECT_QSHARE)); + } + }); + } } From e3cecf0f895bc84c5a851ad125654c6f72f032b4 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 19 Jun 2017 22:08:25 +0100 Subject: [PATCH 03/12] Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer for Repo/Share 5.1.g combination. --- rm-community/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 43bb9e188a..08dc021dd4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -24,6 +24,6 @@ 5.1.g - ${alfresco.version} + 5.1.f From 8214f6d23eaa77c4fa11e5625d35cdeee5cfea18 Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Tue, 20 Jun 2017 14:33:28 +0300 Subject: [PATCH 04/12] RM-5309 - fix after review --- .../model/rma/aspect/RecordAspect.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index 7d32f30d3f..55d41f1db2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -67,7 +67,7 @@ import org.alfresco.service.namespace.QName; ) public class RecordAspect extends AbstractDisposableItem implements NodeServicePolicies.OnCreateChildAssociationPolicy, - NodeServicePolicies.OnAddAspectPolicy, + NodeServicePolicies.BeforeAddAspectPolicy, RecordsManagementPolicies.OnCreateReference, RecordsManagementPolicies.OnRemoveReference, NodeServicePolicies.OnMoveNodePolicy, @@ -360,8 +360,8 @@ public class RecordAspect extends AbstractDisposableItem * org.alfresco.service.namespace.QName) */ @Override - @Behaviour(kind = BehaviourKind.CLASS, notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT) - public void onAddAspect(final NodeRef nodeRef, final QName aspectTypeQName) + @Behaviour(kind = BehaviourKind.CLASS, notificationFrequency = NotificationFrequency.FIRST_EVENT) + public void beforeAddAspect(final NodeRef nodeRef, final QName aspectTypeQName) { AuthenticationUtil.runAs(new RunAsWork() { From 5e906d878caad7a58d58b9c295a0092fe7db4b83 Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Tue, 20 Jun 2017 14:34:47 +0300 Subject: [PATCH 05/12] RM-5309 - typo --- .../org_alfresco_module_rm/model/rma/aspect/RecordAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index 55d41f1db2..fb5fc43d10 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -354,9 +354,9 @@ public class RecordAspect extends AbstractDisposableItem } /** - * Behaviour to remove the shared link when record is declared + * Behaviour to remove the shared link before declare a record * - * @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, + * @see org.alfresco.repo.node.NodeServicePolicies.BeforeAddAspectPolicy#beforeAddAspect(org.alfresco.service.cmr.repository.NodeRef, * org.alfresco.service.namespace.QName) */ @Override From 7c71da72d1f87d8eaaab2e1534eb0dbc95e56e6e Mon Sep 17 00:00:00 2001 From: Andy Healey Date: Wed, 21 Jun 2017 16:09:37 +0100 Subject: [PATCH 06/12] Update gs-core-api.yaml --- .../main/webapp/definitions/gs-core-api.yaml | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml index a9a7e3f9a7..fac196b7ee 100644 --- a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml +++ b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml @@ -46,11 +46,10 @@ paths: - gs-sites summary: Create the Records Management (RM) site description: | - **Note:** this endpoint is available in Records Management 2.6 and newer versions. Creates the RM site with the given details. - **Note:** the id of a site cannot be updated once the site has been created. + **Note:** The default site id is rm and the default site name is Records Management. The id of a site cannot be updated once the site has been created. For example, to create an RM site named "Records Management" with "Records Management Description" as description, the following body could be used: ```JSON @@ -62,7 +61,7 @@ paths: The creator will be added as a member with Site Manager role. - When you create the RM site, the **filePlan** structure is also created. + When you create the RM site, the **filePlan** structure is also created including special containers, such as containers for transfers, holds and, unfiled records. operationId: createRMSite produces: @@ -102,8 +101,7 @@ paths: - gs-sites summary: Get the Records Management (RM) site description: | - **Note:** this endpoint is available in Records Management 2.6 and newer versions. - + Gets information for RM site. operationId: getRMSite @@ -133,7 +131,6 @@ paths: - gs-sites summary: Delete the Records Management (RM) site description: | - **Note:** this endpoint is available in Records Management 2.6 and newer versions. Deletes the RM site. operationId: deleteRMSite @@ -161,7 +158,6 @@ paths: - gs-sites summary: Update the Records Management (RM) site description: | - **Note:** this endpoint is available in Records Management 2.6 and newer versions. Update the details for the RM site. Site Manager or other (site) admin can update title or description. @@ -795,7 +791,7 @@ paths: delete: tags: - unfiled-record-folders - summary : Delete an unfiled record folder + summary : Delete an unfiled record folder. Deleted file plan components cannot be recovered, they are deleted permanently. description: | Deletes the unfiled record folder **unfiledRecordFolderId**. operationId: deleteUnfiledRecordFolder @@ -1403,7 +1399,7 @@ paths: - record-folders summary : Delete a record folder description: | - Deletes record folder **recordFolderId**. + Deletes record folder **recordFolderId**. Deleted file plan components cannot be recovered, they are deleted permanently. operationId: deleteRecordFolder parameters: - $ref: '#/parameters/recordFolderIdParam' @@ -1661,7 +1657,7 @@ paths: - $ref: '#/parameters/fieldsParam' - in: body name: recordBodyUpdate - description: The node information to update. + description: The record information to update. required: true schema: $ref: '#/definitions/FilePlanComponentBodyUpdate' @@ -1694,7 +1690,7 @@ paths: - records summary : Delete a record description: | - Deletes the record **recordId**. + Deletes the record **recordId**. Deleted file plan components cannot be recovered, they are deleted permanently. operationId: deleteRecord parameters: - $ref: '#/parameters/recordIdParam' @@ -1756,7 +1752,7 @@ paths: description: | Files the record **recordId** in the target record folder. - You can specify the target record folder by providing its id **targetParentId** + You need to specify the target record folder by providing its id **targetParentId** If the record is already filed, a link to the target record folder is created. @@ -1805,7 +1801,7 @@ paths: tags: - files summary: Declare as record - description: Declares the file **fileId** in the unfiled records container. + description: Declares the file **fileId** in the unfiled records container. The original file node is moved to the Records Management site and a secondary association is created to it's original location, so the file and the record share a single node. operationId: declareRecord parameters: - name: fileId From 89dc4f110138226aa87854482dc17c77656aebc8 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 21 Jun 2017 16:39:00 +0100 Subject: [PATCH 07/12] Update gs-core-api.yaml --- .../src/main/webapp/definitions/gs-core-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml index fac196b7ee..e9136066a8 100644 --- a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml +++ b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml @@ -1801,7 +1801,7 @@ paths: tags: - files summary: Declare as record - description: Declares the file **fileId** in the unfiled records container. The original file node is moved to the Records Management site and a secondary association is created to it's original location, so the file and the record share a single node. + description: Declares the file **fileId** in the unfiled records container. The original file node is moved to the Records Management site and a secondary association is created to it's original location. operationId: declareRecord parameters: - name: fileId From 228cd2cff82669bdb66c76d73f6ad7357f4fc30d Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 21 Jun 2017 16:43:34 +0100 Subject: [PATCH 08/12] Update gs-core-api.yaml --- .../src/main/webapp/definitions/gs-core-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml index e9136066a8..53122ac49e 100644 --- a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml +++ b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml @@ -1801,7 +1801,7 @@ paths: tags: - files summary: Declare as record - description: Declares the file **fileId** in the unfiled records container. The original file node is moved to the Records Management site and a secondary association is created to it's original location. + description: Declares the file **fileId** in the unfiled records container. The original file is moved to the Records Management site and a secondary association is created in the file's original site. operationId: declareRecord parameters: - name: fileId From 39802faa65b93dad15bae35d941389f0e3a558a1 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 21 Jun 2017 16:44:42 +0100 Subject: [PATCH 09/12] Update gs-core-api.yaml --- .../src/main/webapp/definitions/gs-core-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml index 53122ac49e..ff1ee40224 100644 --- a/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml +++ b/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml @@ -1801,7 +1801,7 @@ paths: tags: - files summary: Declare as record - description: Declares the file **fileId** in the unfiled records container. The original file is moved to the Records Management site and a secondary association is created in the file's original site. + description: Declares the file **fileId** in the unfiled records container. The original file is moved to the Records Management site and a secondary parent association is created in the file's original site. operationId: declareRecord parameters: - name: fileId From cfc88fbcd219ddff11f019990175ec18943dfcc9 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 21 Jun 2017 21:43:03 +0100 Subject: [PATCH 10/12] [maven-release-plugin] prepare release V2.6.a --- pom.xml | 5 +++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c5733a041f..faf6228152 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.6-SNAPSHOT + 2.6.a Alfresco Records Management @@ -24,7 +24,8 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - + V2.6.a + JIRA diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index d98b337c2a..e47ad87dd6 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.6-SNAPSHOT + 2.6.a diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 151b0bcce1..399b6cedb7 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.6-SNAPSHOT + 2.6.a diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 3e968cbb1d..d74e6b8b7b 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.6-SNAPSHOT + 2.6.a diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 4a59bbbdb7..63c764e4f1 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.6-SNAPSHOT + 2.6.a diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index e771a9ff00..f9b9e6c9f1 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.6-SNAPSHOT + 2.6.a From a3bf6676d45512fc333acf85f23145f37647bdba Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 21 Jun 2017 21:43:06 +0100 Subject: [PATCH 11/12] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index faf6228152..0c0e109041 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.6.a + 2.6-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - V2.6.a + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index e47ad87dd6..d98b337c2a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.6.a + 2.6-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 399b6cedb7..151b0bcce1 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.6.a + 2.6-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index d74e6b8b7b..3e968cbb1d 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.6.a + 2.6-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 63c764e4f1..4a59bbbdb7 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.6.a + 2.6-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index f9b9e6c9f1..e771a9ff00 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.6.a + 2.6-SNAPSHOT From 85db28d4ff531b4eb857c9412ab3c0793e814136 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 22 Jun 2017 09:26:33 +0100 Subject: [PATCH 12/12] RM-5311 - Fix the caching of swagger files --- .../src/main/webapp/index.html | 229 ++++++++++-------- 1 file changed, 130 insertions(+), 99 deletions(-) diff --git a/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html b/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html index 9739da746c..0a66c86a80 100644 --- a/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html +++ b/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html @@ -1,116 +1,147 @@ - - - Alfresco Governance Services REST API Explorer - - - - - - - - - - - - - - - - - - - - - - + + + + + + + Alfresco Governance Services REST API Explorer + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - +