Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-09-20 08:36:54 +00:00
parent 0620f5019b
commit afe200fbd5
31 changed files with 1162 additions and 231 deletions

View File

@@ -43,5 +43,12 @@
<include refid="alfresco.content.insert_ContentData_Sequence"/>
</insert>
<insert id="insert_KeyData" parameterType="ContentUrlKey">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_content_url_enc_seq')
</selectKey>
<include refid="alfresco.content.insert_KeyData_Sequence"/>
</insert>
</mapper>