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-6723 Added ActiveMQ

Browse Source
This commit is contained in:
rlucanu
2019-04-05 14:44:30 +03:00
parent 36ac3edc5d
commit a0c4cd579c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rm-community/rm-community-repo/pom.xml
View File

@@ -27,10 +27,10 @@
<skip.integrationtests>true</skip.integrationtests> <skip.integrationtests>true</skip.integrationtests>
<!-- 6.0 changes --> <!-- 6.0 changes -->
<dependency.alfresco-core.version>7.5</dependency.alfresco-core.version> <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version>
<dependency.alfresco-repository.version>7.43</dependency.alfresco-repository.version> <dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>7.35</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version>
<alfresco.alfresco-share-services.version>6.1.0-RC3</alfresco.alfresco-share-services.version> <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
<image.name>alfresco/alfresco-governance-repository-community</image.name> <image.name>alfresco/alfresco-governance-repository-community</image.name>
</properties> </properties>
@@ -155,6 +155,15 @@
</wait> </wait>
</run> </run>
</image> </image>
<image>
<name>alfresco/alfresco-activemq:5.15.6</name>
<run>
<ports>
<port>61616:61616</port>
<port>5672:5672</port>
</ports>
</run>
</image>
</images> </images>
<skip>${skip.integrationtests}</skip> <skip>${skip.integrationtests}</skip>
</configuration> </configuration>

5
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
View File

@@ -548,11 +548,6 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected void setupTestDataImpl() protected void setupTestDataImpl()
{ {
AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO"); AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO");
if (!authDao.authorityExists(AuthenticationUtil.getSystemUserName()))
{
createPerson(AuthenticationUtil.getSystemUserName(), false);
}
assertTrue("No person object for System available.", authDao.authorityExists(AuthenticationUtil.getSystemUserName()));
storeRef = StoreRef.STORE_REF_WORKSPACE_SPACESSTORE; storeRef = StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
rootNodeRef = nodeService.getRootNode(storeRef); rootNodeRef = nodeService.getRootNode(storeRef);