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

Reverted the code commits from r41534

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@41556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2012-09-13 10:14:10 +00:00
parent 0e6bda384d
commit c6af92d1a5
5 changed files with 3 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/recordsCustomModel.xml
View File

@@ -154,15 +154,6 @@
</associations>
</aspect>
<aspect name="rmc:customLoadedDataSetIds">
<properties>
<property name="rmc:loadedDataSetIds">
<type>d:text</type>
<multiple>true</multiple>
</property>
</properties>
</aspect>
</aspects>
</model>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
View File

@@ -379,8 +379,6 @@
<!-- REST impl for GET Data Sets -->
<bean id="webscript.org.alfresco.rma.datasets.get" class="org.alfresco.module.org_alfresco_module_rm.script.DataSetsGet" parent="webscript">
<property name="dataSetService" ref="DataSetService" />
<property name="siteService" ref="SiteService" />
<property name="nodeService" ref="NodeService" />
</bean>
<!-- REST impl for POST Load Data Set -->

38
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
View File

@@ -4,8 +4,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -32,7 +30,6 @@ import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.view.ImporterService;
import org.alfresco.service.cmr.view.Location;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ParameterCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -237,9 +234,6 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
// Patch data
patchLoadedData();
// Set the data set id into the file plan's custom aspect
setDataSetIdIntoFilePlan(dataSetId, filePlan);
}
catch (Exception ex)
{
@@ -262,38 +256,6 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
}
}
/**
* Helper method for setting the id of the imported data set into the file plan's custom aspect
*
* @param dataSetId The id of the imported data set
* @param filePlan The file plan into which the data set has been imported
*/
@SuppressWarnings("unchecked")
private void setDataSetIdIntoFilePlan(String dataSetId, NodeRef filePlan)
{
ArrayList<String> loadedDataSetIds;
Serializable dataSetIds = nodeService.getProperty(filePlan, PROP_LOADED_DATA_SET_IDS);
// Check if any data set has been imported
if (dataSetIds == null)
{
Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(1);
aspectProperties.put(PROP_LOADED_DATA_SET_IDS, (Serializable) new ArrayList<String>());
nodeService.addAspect(filePlan, ASPECT_LOADED_DATA_SET_IDS, aspectProperties);
loadedDataSetIds = (ArrayList<String>) nodeService.getProperty(filePlan, PROP_LOADED_DATA_SET_IDS);
}
else
{
loadedDataSetIds = (ArrayList<String>) dataSetIds;
}
// Add the new loaded data set id
loadedDataSetIds.add(dataSetId);
Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(1);
aspectProperties.put(PROP_LOADED_DATA_SET_IDS, (Serializable) loadedDataSetIds);
nodeService.addAspect(filePlan, ASPECT_LOADED_DATA_SET_IDS, aspectProperties);
}
/**
* Temp method to patch AMP'ed data
*

6
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementCustomModel.java
View File

@@ -49,10 +49,4 @@ public interface RecordsManagementCustomModel
// Some Custom references which are present on system startup.
public static QName CUSTOM_REF_VERSIONS = QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "versions");
public static QName CUSTOM_REF_SUPERSEDES = QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "supersedes");
// Custom property for loaded data set ids
public static QName PROP_LOADED_DATA_SET_IDS = QName.createQName(RM_CUSTOM_URI, "loadedDataSetIds");
// Loaded data set ids aspect
public static QName ASPECT_LOADED_DATA_SET_IDS = QName.createQName(RM_CUSTOM_URI, "customLoadedDataSetIds");
}

72
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
View File

@@ -1,6 +1,5 @@
package org.alfresco.module.org_alfresco_module_rm.script;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -8,28 +7,17 @@ import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.dataset.DataSet;
import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
import org.alfresco.module.org_alfresco_module_rm.model.RmSiteType;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteService;
import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptRequest;
public class DataSetsGet extends DeclarativeWebScript implements RecordsManagementCustomModel
public class DataSetsGet extends DeclarativeWebScript
{
/** Data set service */
private DataSetService dataSetService;
/** Node service */
private NodeService nodeService;
/** Site service */
private SiteService siteService;
/**
* Set data set service
*
@@ -40,26 +28,6 @@ public class DataSetsGet extends DeclarativeWebScript implements RecordsManageme
this.dataSetService = dataSetService;
}
/**
* Set node service
*
* @param nodeService the node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* Set site service
*
* @param siteService the site service
*/
public void setSiteService(SiteService siteService)
{
this.siteService = siteService;
}
/**
* @see org.springframework.extensions.webscripts.DeclarativeWebScript#executeImpl(org.springframework.extensions.webscripts.WebScriptRequest,
* org.springframework.extensions.webscripts.Status,
@@ -68,14 +36,10 @@ public class DataSetsGet extends DeclarativeWebScript implements RecordsManageme
@Override
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
{
// Get the list of data sets
Map<String, DataSet> dataSets = dataSetService.getDataSets();
// Filter the loaded data sets so that they won't show up in the UI
Map<String, DataSet> filteredDataSets = filterLoadedDataSets(dataSets);
List<Map<String, String>> dataSetList = new ArrayList<Map<String, String>>(dataSets.size());
List<Map<String, String>> dataSetList = new ArrayList<Map<String, String>>(filteredDataSets.size());
for (Map.Entry<String, DataSet> entry : filteredDataSets.entrySet())
for (Map.Entry<String, DataSet> entry : dataSets.entrySet())
{
Map<String, String> dataSet = new HashMap<String, String>(2);
DataSet value = entry.getValue();
@@ -91,34 +55,4 @@ public class DataSetsGet extends DeclarativeWebScript implements RecordsManageme
return model;
}
/**
* Helper method for filtering the data sets which already have been loaded
*
* @param dataSets A map of available data sets
* @return Map<String, DataSet> The new map of data sets which do not include the already loaded data sets
*/
private Map<String, DataSet> filterLoadedDataSets(Map<String, DataSet> dataSets)
{
// FIXME: SiteId
NodeRef filePlan = siteService.getContainer(RmSiteType.DEFAULT_SITE_NAME, RmSiteType.COMPONENT_DOCUMENT_LIBRARY);
Serializable dataSetIds = nodeService.getProperty(filePlan, PROP_LOADED_DATA_SET_IDS);
// Check if the property of the aspect has a value. If not return the original map
if (dataSetIds != null)
{
@SuppressWarnings("unchecked")
ArrayList<String> loadedDataSetIds = (ArrayList<String>) dataSetIds;
for (String loadedDataSetId : loadedDataSetIds)
{
if (dataSets.containsKey(loadedDataSetId))
{
dataSets.remove(loadedDataSetId);
}
}
}
return dataSets;
}
}