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

Merged DEV to HEAD:

Browse Source 
29876: Removed emotive language from build.xml
   29877: Made getter final; should make members final.
   29879: Extra check for erroneous, pre-existing transactions
   29880: ALF-8966: RSOLR 042: Node deletes keep DB ID (ALF-8965)
          - There is no longer code to change the store ID and UUID for an entry in alf_node
          - During store moves, new node entries are created and node data is moved onto the new node
          - Primarily affects archive/restore use cases
          - Any NodeRef can be tracked using the DB ID associated with it (see NodeService.getNodeStatus)
   29926: Minor toString modification
   29927: Code cleanup: line endings, non-javadoc and isDebugEnabled
   29928: Moved exception absorbtion out of the non-propagating txn (and cleaned up unused code)
   29930: Test for ALF-5714: Write transactions serialized on MySQL
          - The fix is to add this to the MySQL configuration and restart the MySQL server
            innodb_locks_unsafe_for_binlog = true
            See: http://dev.mysql.com/doc/refman/5.1/en/innodb-parameters.html#sysvar_innodb_locks_unsafe_for_binlog
          - The test holds DB resources from one archive process while doing another.  It fails without the setting given.
          - TODO: Documentation required
   29969: ALF-8966: RSOLR 042: Node deletes keep DB ID (ALF-8965)
          - Fixed timing of circular hierarchy detection
   29972: ALF-8966: RSOLR 042: Node deletes keep DB ID (ALF-8965)
          - Fixed ACL retrieval from old parent node during move
          - Fixes PermissionServiceTest failures
   29979: Fix test's initialization
   29987: Fixed txn demarcation during write of transfer report


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-08-24 23:09:39 +00:00
parent 9c5e894a97
commit c72a19b637
16 changed files with 2316 additions and 2096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java
View File

@@ -115,6 +115,7 @@ public class TransferServiceCallbackTest extends TestCase
applicationContext = ApplicationContextHelper.getApplicationContext();
// Get the required services
descriptorService = (DescriptorService) this.applicationContext.getBean("DescriptorService");
transferServiceImpl = (TransferServiceImpl2) this.applicationContext.getBean("transferService2");
transferService = transferServiceImpl;
authenticationComponent = (AuthenticationComponent) applicationContext.getBean("authenticationComponent");
@@ -122,8 +123,8 @@ public class TransferServiceCallbackTest extends TestCase
repository = (Repository) applicationContext.getBean("repositoryHelper");
fileFolderService = (FileFolderService) applicationContext.getBean("fileFolderService");
localRepositoryId = transferServiceImpl.getDescriptorService().getCurrentRepositoryDescriptor().getId();
version = new TransferVersionImpl(transferServiceImpl.getDescriptorService().getServerDescriptor());
localRepositoryId = descriptorService.getCurrentRepositoryDescriptor().getId();
version = new TransferVersionImpl(descriptorService.getServerDescriptor());
mockedTransferTransmitter = mock(TransferTransmitter.class);
mockedCallback = mock(TransferCallback.class);