Merged V3.1 to HEAD

13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 21:48:15 +00:00
parent ae58306cf9
commit 198ebe371e
48 changed files with 461 additions and 368 deletions

View File

@@ -80,7 +80,6 @@ import org.apache.commons.logging.LogFactory;
public class AVMExpiredContentProcessor
{
// defaults in case these properties are not configured in Spring
protected String adminUserName = "admin";
protected String workflowName = "jbpm$wcmwf:changerequest";
protected List<String> workflowStores;
@@ -109,7 +108,7 @@ public class AVMExpiredContentProcessor
public void setAdminUserName(String adminUserName)
{
this.adminUserName = adminUserName;
// NOTE: ignore, just for backwards compatible Spring config
}
public void setWorkflowName(String workflowName)
@@ -201,7 +200,7 @@ public class AVMExpiredContentProcessor
};
// perform the work as the system user
AuthenticationUtil.runAs(authorisedWork, this.adminUserName);
AuthenticationUtil.runAs(authorisedWork, AuthenticationUtil.getAdminRoleName());
// now we know everything worked ok, let the virtualisation server
// know about all the new workflow sandboxes created (just the main stores)