mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge DEV to HEAD
ContentDiskDriver rework. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
/*
|
||||
* Copyright (C) 2006-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* Copyright (C) 2006-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
@@ -85,7 +85,7 @@ public class NodeMonitor extends TransactionListenerAdapter
|
||||
|
||||
// Filesystem driver and context
|
||||
|
||||
private ContentDiskDriver m_filesysDriver;
|
||||
// private ContentDiskDriver m_filesysDriver;
|
||||
private ContentContext m_filesysCtx;
|
||||
|
||||
// File state table and change notification handler
|
||||
@@ -113,9 +113,9 @@ public class NodeMonitor extends TransactionListenerAdapter
|
||||
* @param filesysDriver ContentDiskDriver
|
||||
* @param filesysCtx ContentContext
|
||||
*/
|
||||
protected NodeMonitor( ContentDiskDriver filesysDriver, ContentContext filesysCtx, NodeService nodeService, PolicyComponent policyComponent,
|
||||
protected NodeMonitor(ContentContext filesysCtx, NodeService nodeService, PolicyComponent policyComponent,
|
||||
FileFolderService fileFolderService, PermissionService permissionService, TransactionService transService) {
|
||||
m_filesysDriver = filesysDriver;
|
||||
// m_filesysDriver = filesysDriver;
|
||||
m_filesysCtx = filesysCtx;
|
||||
|
||||
// Set various services
|
||||
@@ -544,8 +544,7 @@ public class NodeMonitor extends TransactionListenerAdapter
|
||||
|
||||
// Use the system user as the authenticated context for the node monitor
|
||||
|
||||
AuthenticationContext authenticationContext = m_filesysDriver.getAuthenticationContext();
|
||||
authenticationContext.setSystemUserAsCurrentUser();
|
||||
AuthenticationUtil.setRunAsUserSystem();
|
||||
|
||||
// Loop until shutdown
|
||||
|
||||
|
Reference in New Issue
Block a user