RM-781: RM Dependency update (update to HEAD QA build #165, Deleted overriding files, Bug fixes)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/UPDATE@52789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml

@@ -180,7 +180,6 @@
       class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogPost"
       parent="webscript">
       <property name="nodeService" ref="nodeService" />
-      <property name="contentService" ref="ContentService" />
       <property name="permissionService" ref="PermissionService" />
       <property name="mimetypeService" ref="mimetypeService" />
       <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
@@ -205,10 +204,10 @@
       class="org.alfresco.module.org_alfresco_module_rm.script.ExportPost"
       parent="webscript">
       <property name="nodeService" ref="nodeService" />
-      <property name="contentService" ref="ContentService" />
       <property name="permissionService" ref="PermissionService" />
       <property name="mimetypeService" ref="mimetypeService" />
       <property name="exporterService" ref="ExporterService" />
+      <property name="contentStreamer" ref="webscript.content.streamer" />
    </bean>
 
    <!-- REST impl for POST import -->
@@ -226,7 +225,6 @@
    <!-- Base bean for transfer web scripts -->
    <bean id="rmBaseTransferWebscript" parent="webscript" abstract="true">
       <property name="nodeService" ref="nodeService" />
-      <property name="contentService" ref="ContentService" />
       <property name="permissionService" ref="PermissionService" />
       <property name="mimetypeService" ref="mimetypeService" />
       <property name="exporterService" ref="ExporterService" />
@@ -236,6 +234,7 @@
    <bean id="webscript.org.alfresco.rma.transfer.get"
       class="org.alfresco.module.org_alfresco_module_rm.script.TransferGet"
       parent="rmBaseTransferWebscript">
+      <property name="contentStreamer" ref="webscript.content.streamer" />
    </bean>
 
    <!-- REST impl for GET transfer report -->
@@ -245,6 +244,7 @@
       <property name="dictionaryService" ref="DictionaryService" />
       <property name="recordsManagementService" ref="RecordsManagementService" />
       <property name="dispositionService" ref="DispositionService" />
+      <property name="contentStreamer" ref="webscript.content.streamer" />
    </bean>
 
    <!-- REST impl for POST transfer report -->
@@ -255,6 +255,7 @@
       <property name="recordsManagementService" ref="RecordsManagementService" />
       <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
       <property name="dispositionService" ref="DispositionService" />
+      <property name="contentService" ref="ContentService"/>
    </bean>
 
    <!-- RM Role API-->
@@ -522,10 +523,10 @@
     <!-- REST impl for GET Audit Log -->
     <bean id="webscript.org.alfresco.rma.rmauditlog.get" class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogGet" parent="webscript">
         <property name="nodeService" ref="nodeService"/>
-        <property name="contentService" ref="ContentService"/>
         <property name="permissionService" ref="PermissionService"/>
         <property name="mimetypeService" ref="mimetypeService"/>
         <property name="recordsManagementAuditService" ref="RecordsManagementAuditService"/>
+        <property name="contentStreamer" ref="webscript.content.streamer" />
     </bean>
 
    <!-- REST impl for GET Class Definitions for RM/DM -->

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java

@@ -23,6 +23,7 @@ import java.io.IOException;
 
 import org.springframework.extensions.webscripts.WebScriptRequest;
 import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.alfresco.repo.web.scripts.content.ContentStreamer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -39,6 +40,17 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript
 
     protected final static String PARAM_EXPORT = "export";
 
+    /** Content Streamer */
+    protected ContentStreamer contentStreamer;
+
+    /**
+     * @param contentStreamer
+     */
+    public void setContentStreamer(ContentStreamer contentStreamer)
+    {
+        this.contentStreamer = contentStreamer;
+    }
+
     @Override
     public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
     {
@@ -65,7 +77,7 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript
             }
 
             // stream the file back to the client
-            streamContent(req, res, auditTrail, attach, attachFileName);
+            contentStreamer.streamContent(req, res, auditTrail, null, attach, attachFileName, null);
         }
         finally
         {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ExportPost.java

@@ -28,6 +28,7 @@ import org.alfresco.model.RenditionModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RecordsManagementSearchBehaviour;
 import org.alfresco.repo.exporter.ACPExportPackageHandler;
+import org.alfresco.repo.web.scripts.content.ContentStreamer;
 import org.alfresco.repo.web.scripts.content.StreamACP;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.view.ExporterCrawlerParameters;
@@ -56,6 +57,17 @@ public class ExportPost extends StreamACP
 
     protected static final String PARAM_TRANSFER_FORMAT = "transferFormat";
 
+    /** Content Streamer */
+    private ContentStreamer contentStreamer;
+
+    /**
+     * @param contentStreamer
+     */
+    public void setContentStreamer(ContentStreamer contentStreamer)
+    {
+        this.contentStreamer = contentStreamer;
+    }
+
     /**
      * @see org.alfresco.web.scripts.WebScript#execute(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
      */
@@ -117,7 +129,7 @@ public class ExportPost extends StreamACP
                         transferFormat);
 
             // stream the ACP back to the client as an attachment (forcing save as)
-            streamContent(req, res, tempACPFile, true, tempACPFile.getName());
+            contentStreamer.streamContent(req, res, tempACPFile, null, true, tempACPFile.getName(), null);
         }
         catch (IOException ioe)
         {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferGet.java

@@ -25,6 +25,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.model.RenditionModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RecordsManagementSearchBehaviour;
+import org.alfresco.repo.web.scripts.content.ContentStreamer;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.view.ExporterCrawlerParameters;
 import org.alfresco.service.cmr.view.Location;
@@ -47,6 +48,17 @@ public class TransferGet extends BaseTransferWebScript
     /** Logger */
     private static Log logger = LogFactory.getLog(TransferGet.class);
 
+    /** Content Streamer */
+    private ContentStreamer contentStreamer;
+
+    /**
+     * @param contentStreamer
+     */
+    public void setContentStreamer(ContentStreamer contentStreamer)
+    {
+        this.contentStreamer = contentStreamer;
+    }
+
     @SuppressWarnings("deprecation")
     @Override
     protected File executeTransfer(NodeRef transferNode,
@@ -78,7 +90,7 @@ public class TransferGet extends BaseTransferWebScript
         }
 
         // stream the archive back to the client as an attachment (forcing save as)
-        streamContent(req, res, tempFile, true, tempFile.getName());
+        contentStreamer.streamContent(req, res, tempFile, null, true, tempFile.getName(), null);
 
         // return the temp file for deletion
         return tempFile;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java

@@ -31,6 +31,7 @@ import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedul
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.content.ContentStreamer;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -60,6 +61,7 @@ public class TransferReportGet extends BaseTransferWebScript
     protected DictionaryService ddService;
     protected RecordsManagementService rmService;
     protected DispositionService dispositionService;
+    protected ContentStreamer contentStreamer;
 
     /**
      * Sets the DictionaryService instance
@@ -91,6 +93,14 @@ public class TransferReportGet extends BaseTransferWebScript
         this.rmService = rmService;
     }
 
+    /**
+     * @param contentStreamer
+     */
+    public void setContentStreamer(ContentStreamer contentStreamer)
+    {
+        this.contentStreamer = contentStreamer;
+    }
+
     @Override
     protected File executeTransfer(NodeRef transferNode,
                 WebScriptRequest req, WebScriptResponse res,
@@ -100,7 +110,7 @@ public class TransferReportGet extends BaseTransferWebScript
         File report = generateJSONTransferReport(transferNode);
 
         // stream the report back to the client
-        streamContent(req, res, report, false);
+        contentStreamer.streamContent(req, res, report, null, false, null, null);
 
         // return the file for deletion
         return report;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java

@@ -39,6 +39,7 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -78,6 +79,7 @@ public class TransferReportPost extends BaseTransferWebScript
     protected RecordsManagementActionService rmActionService;
     protected RecordsManagementService rmService;
     protected DispositionService dispositionService;
+    protected ContentService contentService;
 
     /**
      * Sets the DictionaryService instance
@@ -119,6 +121,16 @@ public class TransferReportPost extends BaseTransferWebScript
         this.rmActionService = rmActionService;
     }
 
+    /**
+     * Sets the ContentSerivce instance
+     *
+     * @param contentService ContentService instance
+     */
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
     @Override
     protected File executeTransfer(NodeRef transferNode,
                 WebScriptRequest req, WebScriptResponse res,
@@ -436,7 +448,7 @@ public class TransferReportPost extends BaseTransferWebScript
                     ContentModel.TYPE_CONTENT, properties).getChildRef();
 
         // Set the content
-        ContentWriter writer = this.contentService.getWriter(record, ContentModel.PROP_CONTENT, true);
+        ContentWriter writer = contentService.getWriter(record, ContentModel.PROP_CONTENT, true);
         writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
         writer.setEncoding("UTF-8");
         writer.putContent(report);