inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

APPS-455: Support for Adding to S3 Legal Holds on WORM-Locked Records

Browse Source 
- Moved Object Lock S3 Service classes to enterprise project
   - Removed ObjectLockS3Service reference from FrozenAspect
   located in the community project, will be used only in WormLockAspect
This commit is contained in:
Raluca Munteanu
2020-09-02 14:56:58 +03:00
parent da3724ec9d
commit ca5414dbc9
4 changed files with 0 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
View File

@@ -157,9 +157,6 @@
<property name="identifierService" ref="recordsManagementIdentifierService"/>
</bean>
<bean id="objectLockS3ServiceDefaultImpl"
class="org.alfresco.integrations.connector.worm.ObjectLockS3ServiceDefaultImpl"/>
<bean id="rma.scheduled" class="org.alfresco.module.org_alfresco_module_rm.model.rma.aspect.ScheduledAspect" parent="rm.baseBehaviour">
<property name="dispositionService" ref="dispositionService"/>
</bean>
@@ -176,8 +173,6 @@
<bean id="rma.freeze" class="org.alfresco.module.org_alfresco_module_rm.model.rma.aspect.FrozenAspect" parent="rm.baseBehaviour">
<property name="freezeService" ref="FreezeService" />
<property name="objectLockS3Service"
ref="#{ @'worm.objectLockS3Service' eq null ? 'objectLockS3ServiceDefaultImpl' : 'worm.objectLockS3Service' }"/>
<property name="propertyModificationAllowedCheck" ref="updateFrozenPropertyCheck"/>
</bean>

35
rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3Service.java
View File

@@ -1,35 +0,0 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2020 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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.integrations.connector.worm;
import org.alfresco.service.cmr.repository.NodeRef;
public interface ObjectLockS3Service
{
void setObjectLegalHold(NodeRef nodeRef, boolean enabled);
}

41
rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3ServiceDefaultImpl.java
View File

@@ -1,41 +0,0 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2020 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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.integrations.connector.worm;
import org.alfresco.service.cmr.repository.NodeRef;
public class ObjectLockS3ServiceDefaultImpl implements ObjectLockS3Service
{
@Override
public void setObjectLegalHold(NodeRef nodeRef, boolean enabled)
{
// do nothing
// s3 not installed, method not supported
}
}

14
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
View File

@@ -36,7 +36,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.integrations.connector.worm.ObjectLockS3Service;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
import org.alfresco.module.org_alfresco_module_rm.util.PropertyModificationAllowedCheck;
@@ -78,11 +77,6 @@ public class FrozenAspect extends BaseBehaviourBean
/** freeze service */
protected FreezeService freezeService;
/**
* Object lock S3 service
*/
private ObjectLockS3Service objectLockS3Service;
/**
* Utility class for property modification
*/
@@ -96,14 +90,6 @@ public class FrozenAspect extends BaseBehaviourBean
this.freezeService = freezeService;
}
/**
* @param objectLockS3Service service
*/
public void setObjectLockS3Service(ObjectLockS3Service objectLockS3Service)
{
this.objectLockS3Service = objectLockS3Service;
}
/**
* Setter for property modification check utility
* @param propertyModificationAllowedCheck Utility class for property modification