Merged V3.4-BUG-FIX to HEAD

28513: Merged DEV/SKYITALIA to V3.4-BUG-FIX
      26917: ALF-9145: AVM: fix "get store" (+ store not found)
         - if root node id is not found - remove from cache and throw concurrency failure (see also r26916)
         - add missing error info - report store name (if not found)
   28514: ALF-9145: Fixed merge issue
   28518: Fixed ALF-8511: Share - Property with prefix name with - can't be updated/found by Share
   28525: Merged DEV to V3.4-BUG-FIX
      28522: ALF-8197: Replication service fails to replicate Multilingual Containers
             1) Inject list of excluded aspects into ReplicationActionExecutor using replication-services-context.xml.
             2) Don't write value in XMLTransferManifestWriter.writeMLValue if it is null. 
   28534: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      28533: ALF-9085: Share version numbers wrong when uploading initial change, initial Inline edit or adding versionable aspect.
         1. In ScriptNode.addAspect() if ContentModel.ASPECT_VERSIONABLE aspect added than call ensureVersioningEnabled(true, true) otherwise this.nodeService.addAspect (this.nodeRef, aspectQName, aspectProps)
         2. In VersionServiceImpl.ensureVersioningEnabled() the call of createVersion(nodeRef, null) is replaced on createVersion(nodeRef, Collections.<String,Serializable>singletonMap(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR));
   28536: Merged V3.4 to V3.4-BUG-FIX
      28246: ALF-3037: Fixed English in patch message
      28313: Latest L10N Updates from Gloria.
      28335: Removed translations of untranslated bundle!
      28364: Merged V3.4-TEAM to V3.4
         26978: Fixes: ALF-6107 - Fixes Tab order issues with Add event form.
      28387: Merged V3.4-BUG-FIX to V3.4
         28386: ALF-9100: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX
            28249: ALF-8946: Avoid one full table scan per batch in full reindex
               - Now each batch scans a single time sample, dynamically adjusted based on the number of transactions in the previous sample, always aiming for 1000 transactions per sample.
      28421: ALF-9064: commas in "tinymce_languages=en,de,es,fr,it,ja" had been translated.
      28422: ALF-7882: security setting incorrect. FileFolderService.moveFrom arguments changed position, but not reflected in RM security file
      28496: ALF-2740 - File Types are not properly recognized by Alfresco
   28537: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
      28240: Merged V3.4-BUG-FIX to V3.4 (3.4.3)
      28535: Merged V3.4-BUG-FIX to V3.4
         28534: Merged DEV/TEMPORARY to V3.4-BUG-FIX
            28533: ALF-9085: Share version numbers wrong when uploading initial change, initial Inline edit or adding versionable aspect.
               1. In ScriptNode.addAspect() if ContentModel.ASPECT_VERSIONABLE aspect added than call ensureVersioningEnabled(true, true) otherwise this.nodeService.addAspect (this.nodeRef, aspectQName, aspectProps)
               2. In VersionServiceImpl.ensureVersioningEnabled() the call of createVersion(nodeRef, null) is replaced on createVersion(nodeRef, Collections.<String,Serializable>singletonMap(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR));
   28538: ALF-8589: Fixes "Message could not be displayed" errors with IMAP in Outlook Express
   - Corrected generation of subtypes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/replication/ReplicationActionExecutor.java

@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.replication;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -28,7 +29,6 @@ import org.alfresco.repo.action.ActionCancelledException;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.lock.LockAcquisitionException;
-import org.alfresco.repo.rule.RuleModel;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transfer.ChildAssociatedNodeFinder;
 import org.alfresco.repo.transfer.ContentClassFilter;
@@ -51,6 +51,7 @@ import org.alfresco.service.cmr.transfer.TransferEventEnterState;
 import org.alfresco.service.cmr.transfer.TransferEventError;
 import org.alfresco.service.cmr.transfer.TransferFailureException;
 import org.alfresco.service.cmr.transfer.TransferService2;
+import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -73,6 +74,7 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
    private TransactionService transactionService;
    private ReplicationDefinitionPersisterImpl replicationDefinitionPersister;
    private ReplicationParams replicationParams;
+   private List<QName> excludedAspects = new ArrayList<QName>();
    
    /**
     * By default, we lock for a minute, so if this server is shutdown another can take over a 
@@ -159,6 +161,14 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
        this.replicationParams = replicationParams;
    }
    
+   public void setExcludedAspects(String[] excludedAspects)
+   {
+       for (String aspect : excludedAspects)
+       {
+           this.excludedAspects.add(QName.createQName(aspect));
+       }
+   }
+
    @Override
    protected void addParameterDefinitions(List<ParameterDefinition> paramList) {
       // Not used - our definitions hold everything on them
@@ -218,8 +228,7 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
       // Exclude aspects from transfer
       // NOTE: this list of aspects should be synced up with the NodeCrawler in expandPayload to
       //       ensure a coherent set of nodes are transferred
-      transferDefinition.setExcludedAspects(RuleModel.ASPECT_RULES,
-          ContentModel.ASPECT_VERSIONABLE);
+      transferDefinition.setExcludedAspects(excludedAspects);
             
       return transferDefinition;
    }