Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java


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

source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml

@@ -144,4 +144,14 @@
          ace.authority.recipient = :authorityRecipient
    </query>
    
+   <query name="permission.patch.GetAccessControlEntriesToChangePermissionOn" >
+      select
+         entry
+      from
+         org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl entry
+      where
+         entry.permission.typeQname = :oldTypeQName and
+         entry.permission.name = :oldName
+   </query>
+    
 </hibernate-mapping>