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

RM: fix build

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@52346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-07-10 08:21:18 +00:00
parent aa8fa18157
commit bdf1b2d742
2 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
View File

@@ -59,6 +59,7 @@
<property name="sinceVersion" value="2.0"/> <property name="sinceVersion" value="2.0"/>
<property name="appliesFromVersion" value="2.0"/> <property name="appliesFromVersion" value="2.0"/>
<property name="recordsManagementSearchService" ref="RecordsManagementSearchService" /> <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
<property name="siteService" ref="SiteService" />
</bean> </bean>
</beans> </beans>

48
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
View File

@@ -25,6 +25,7 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails; import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
import org.alfresco.repo.module.AbstractModuleComponent; import org.alfresco.repo.module.AbstractModuleComponent;
import org.alfresco.service.cmr.site.SiteService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.BeanNameAware;
@@ -47,6 +48,9 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
/** Records management search service */ /** Records management search service */
private RecordsManagementSearchService recordsManagementSearchService; private RecordsManagementSearchService recordsManagementSearchService;
/** Site service */
private SiteService siteService;
/** /**
* @param recordsManagementSearchService records management search service * @param recordsManagementSearchService records management search service
*/ */
@@ -55,6 +59,14 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
this.recordsManagementSearchService = recordsManagementSearchService; this.recordsManagementSearchService = recordsManagementSearchService;
} }
/**
* @param siteService site service
*/
public void setSiteService(SiteService siteService)
{
this.siteService = siteService;
}
/** /**
* @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal() * @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal()
*/ */
@@ -66,30 +78,32 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
logger.debug("RM Module RMv2SavedSearchPatch ..."); logger.debug("RM Module RMv2SavedSearchPatch ...");
} }
// get the saved searches if (siteService.getSite(RM_SITE_ID) != null)
List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
if (logger.isDebugEnabled() == true)
{ {
logger.debug(" ... updating " + savedSearches.size() + " saved searches"); // get the saved searches
} List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
for (SavedSearchDetails savedSearchDetails : savedSearches) if (logger.isDebugEnabled() == true)
{ {
// re-save each search so that the query is regenerated correctly logger.debug(" ... updating " + savedSearches.size() + " saved searches");
recordsManagementSearchService.deleteSavedSearch(RM_SITE_ID, savedSearchDetails.getName()); }
recordsManagementSearchService.saveSearch(RM_SITE_ID,
savedSearchDetails.getName(), for (SavedSearchDetails savedSearchDetails : savedSearches)
savedSearchDetails.getDescription(), {
savedSearchDetails.getSearch(), // re-save each search so that the query is regenerated correctly
savedSearchDetails.getSearchParameters(), recordsManagementSearchService.deleteSavedSearch(RM_SITE_ID, savedSearchDetails.getName());
savedSearchDetails.isPublic()); recordsManagementSearchService.saveSearch(RM_SITE_ID,
savedSearchDetails.getName(),
savedSearchDetails.getDescription(),
savedSearchDetails.getSearch(),
savedSearchDetails.getSearchParameters(),
savedSearchDetails.isPublic());
}
} }
if (logger.isDebugEnabled() == true) if (logger.isDebugEnabled() == true)
{ {
logger.debug(" ... complete"); logger.debug(" ... complete");
} }
} }
} }