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

RM-1771 (SOLR dependent integration tests failing)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@90205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-11-10 22:32:04 +00:00
parent 2a4e0a3f84
commit 4f1b541035
3 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,9 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
for (NodeRef nodeRef : nodeRefs) for (NodeRef nodeRef : nodeRefs)
{ {
if (nodeService.exists(nodeRef)) if (nodeService.exists(nodeRef))
{
boolean publishing = ((Boolean)nodeService.getProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS)).booleanValue();
if (!publishing)
{ {
// Mark the update node as publishing in progress // Mark the update node as publishing in progress
markPublishInProgress(nodeRef); markPublishInProgress(nodeRef);
@@ -164,6 +167,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
} }
} }
} }
}
return null; return null;
}; };
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
@@ -290,7 +294,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
return null; return null;
} }
}; };
retryingTransactionHelper.doInTransaction(execution, false, true); retryingTransactionHelper.doInTransaction(execution);
} }
/** /**

1
rm-server/test/resources/alfresco-global-test.properties
View File

@@ -1 +0,0 @@
index.subsystem.name=buildonly

17
rm-server/test/resources/test-context.xml
View File

@@ -218,13 +218,20 @@
</property> </property>
</bean> </bean>
<bean id="testPlaceholderConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"> <bean id="Search" class="org.alfresco.repo.management.subsystems.SwitchableApplicationContextFactory" parent="abstractPropertyBackedBean">
<property name="locations"> <property name="autoStart">
<value>false</value>
</property>
<property name="category">
<value>Search</value>
</property>
<property name="sourceBeanName">
<value>buildonly</value>
</property>
<property name="instancePath">
<list> <list>
<value>classpath:alfresco-global-test.properties</value> <value>manager</value>
</list> </list>
</property> </property>
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="-1" />
</bean> </bean>
</beans> </beans>