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

Investigation of build issues:

Browse Source 
* Revert to 5.0.b-SNAPSHOT (so enterprise build works)
  * convert public job to use FTS rather than Lucene



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@89169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-10-27 02:48:49 +00:00
parent 4e542a6a60
commit b47290b010
3 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -66,7 +66,7 @@
</modules>
<properties>
<alfresco.base.version>5.0.b</alfresco.base.version>
<alfresco.base.version>5.0.b-SNAPSHOT</alfresco.base.version>
<!-- Database properties - default values to be overridden in settings.xml -->
<db.driver>org.postgresql.Driver</db.driver>

88
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java
View File

@@ -34,7 +34,9 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.QueryConsistency;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -128,37 +130,41 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
{
if (nodeService.exists(nodeRef))
{
// Mark the update node as publishing in progress
markPublishInProgress(nodeRef);
try
boolean publishing = (Boolean)nodeService.getProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS);
if (!publishing)
{
Date start = new Date();
if (logger.isDebugEnabled())
// Mark the update node as publishing in progress
markPublishInProgress(nodeRef);
try
{
logger.debug("Starting publish of updates ...");
logger.debug(" - for " + nodeRef.toString());
logger.debug(" - at " + start.toString());
Date start = new Date();
if (logger.isDebugEnabled())
{
logger.debug("Starting publish of updates ...");
logger.debug(" - for " + nodeRef.toString());
logger.debug(" - at " + start.toString());
}
// Publish updates
publishUpdates(nodeRef);
if (logger.isDebugEnabled())
{
Date end = new Date();
long duration = end.getTime() - start.getTime();
logger.debug("Completed publish of updates ...");
logger.debug(" - for " + nodeRef.toString());
logger.debug(" - at " + end.toString());
logger.debug(" - duration " + Long.toString(duration));
}
}
// Publish updates
publishUpdates(nodeRef);
if (logger.isDebugEnabled())
finally
{
Date end = new Date();
long duration = end.getTime() - start.getTime();
logger.debug("Completed publish of updates ...");
logger.debug(" - for " + nodeRef.toString());
logger.debug(" - at " + end.toString());
logger.debug(" - duration " + Long.toString(duration));
// Ensure the update node has either completed the publish or is marked as no longer in progress
unmarkPublishInProgress(nodeRef);
}
}
finally
{
// Ensure the update node has either completed the publish or is marked as no longer in progress
unmarkPublishInProgress(nodeRef);
}
}
}
}
@@ -205,8 +211,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
{
// Build the query string
StringBuilder sb = new StringBuilder();
sb.append("+ASPECT:\"rma:").append(ASPECT_UNPUBLISHED_UPDATE.getLocalName()).append("\" ");
sb.append("@rma\\:").append(PROP_PUBLISH_IN_PROGRESS.getLocalName()).append(":false ");
sb.append("ASPECT:\"rma:").append(ASPECT_UNPUBLISHED_UPDATE.getLocalName()).append("\"");
String query = sb.toString();
if (logger.isDebugEnabled())
@@ -216,17 +221,32 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
// Execute query to find updates awaiting publishing
List<NodeRef> resultNodes = null;
ResultSet results = searchService.query(
StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
SearchService.LANGUAGE_LUCENE,
query);
SearchParameters searchParameters = new SearchParameters();
searchParameters.setQueryConsistency(QueryConsistency.TRANSACTIONAL);
searchParameters.setQuery(query);
searchParameters.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
searchParameters.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
try
{
resultNodes = results.getNodeRefs();
ResultSet results = searchService.query(searchParameters);
try
{
resultNodes = results.getNodeRefs();
}
finally
{
results.close();
}
}
finally
catch (AlfrescoRuntimeException exception)
{
results.close();
if (logger.isDebugEnabled())
{
logger.debug("Error executing query, " + exception.getMessage());
}
throw exception;
}
if (logger.isDebugEnabled())

6
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
View File

@@ -981,10 +981,16 @@ public class DispositionServiceImplTest extends BaseRMTestCase
@Override
public void test(DispositionActionDefinition result) throws Exception
{
DispositionActionDefinition actionDefinition = testRM386DispositionSchedule.getDispositionActionDefinitionByName("cutoff");
assertNotNull(actionDefinition);
assertTrue(nodeService.hasAspect(actionDefinition.getNodeRef(), ASPECT_UNPUBLISHED_UPDATE));
// Publish the updates
PublishUpdatesJobExecuter updater = (PublishUpdatesJobExecuter)applicationContext.getBean("publishUpdatesJobExecuter");
updater.executeImpl();
assertFalse(nodeService.hasAspect(actionDefinition.getNodeRef(), ASPECT_UNPUBLISHED_UPDATE));
// Check the record has been updated
DispositionAction dispositionAction = dispositionService.getNextDispositionAction(testRM386Record);
assertNotNull(dispositionAction);