From a47892abef9c241f7c4eaa7bc8cb9cfb2db94be9 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 8 Aug 2012 18:16:31 -0700 Subject: [PATCH] [FileBackend] Moved filerepo/backend/ up to filebackend Change-Id: I62ba23bd22e0f177fb48acaf6bcc38cbffacd3e7 --- includes/AutoLoader.php | 84 +++++++++---------- .../backend => filebackend}/FSFile.php | 0 .../backend => filebackend}/FSFileBackend.php | 0 .../backend => filebackend}/FileBackend.php | 0 .../FileBackendGroup.php | 0 .../FileBackendMultiWrite.php | 0 .../FileBackendStore.php | 0 .../backend => filebackend}/FileOp.php | 0 .../backend => filebackend}/FileOpBatch.php | 0 .../SwiftFileBackend.php | 0 .../backend => filebackend}/TempFSFile.php | 0 .../filejournal/DBFileJournal.php | 0 .../filejournal/FileJournal.php | 0 .../lockmanager/DBLockManager.php | 0 .../lockmanager/FSLockManager.php | 0 .../lockmanager/LSLockManager.php | 0 .../lockmanager/LockManager.php | 0 .../lockmanager/LockManagerGroup.php | 0 .../lockmanager/MemcLockManager.php | 0 19 files changed, 42 insertions(+), 42 deletions(-) rename includes/{filerepo/backend => filebackend}/FSFile.php (100%) rename includes/{filerepo/backend => filebackend}/FSFileBackend.php (100%) rename includes/{filerepo/backend => filebackend}/FileBackend.php (100%) rename includes/{filerepo/backend => filebackend}/FileBackendGroup.php (100%) rename includes/{filerepo/backend => filebackend}/FileBackendMultiWrite.php (100%) rename includes/{filerepo/backend => filebackend}/FileBackendStore.php (100%) rename includes/{filerepo/backend => filebackend}/FileOp.php (100%) rename includes/{filerepo/backend => filebackend}/FileOpBatch.php (100%) rename includes/{filerepo/backend => filebackend}/SwiftFileBackend.php (100%) rename includes/{filerepo/backend => filebackend}/TempFSFile.php (100%) rename includes/{filerepo/backend => filebackend}/filejournal/DBFileJournal.php (100%) rename includes/{filerepo/backend => filebackend}/filejournal/FileJournal.php (100%) rename includes/{filerepo/backend => filebackend}/lockmanager/DBLockManager.php (100%) rename includes/{filerepo/backend => filebackend}/lockmanager/FSLockManager.php (100%) rename includes/{filerepo/backend => filebackend}/lockmanager/LSLockManager.php (100%) rename includes/{filerepo/backend => filebackend}/lockmanager/LockManager.php (100%) rename includes/{filerepo/backend => filebackend}/lockmanager/LockManagerGroup.php (100%) rename includes/{filerepo/backend => filebackend}/lockmanager/MemcLockManager.php (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index e50430eb23..18d377387b 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -548,50 +548,50 @@ $wgAutoloadLocalClasses = array( 'LocalFileRestoreBatch' => 'includes/filerepo/file/LocalFile.php', 'OldLocalFile' => 'includes/filerepo/file/OldLocalFile.php', 'UnregisteredLocalFile' => 'includes/filerepo/file/UnregisteredLocalFile.php', - 'FSFile' => 'includes/filerepo/backend/FSFile.php', - 'TempFSFile' => 'includes/filerepo/backend/TempFSFile.php', # includes/filerepo/backend - 'FileBackendGroup' => 'includes/filerepo/backend/FileBackendGroup.php', - 'FileBackend' => 'includes/filerepo/backend/FileBackend.php', - 'FileBackendStore' => 'includes/filerepo/backend/FileBackendStore.php', - 'FileBackendStoreShardListIterator' => 'includes/filerepo/backend/FileBackendStore.php', - 'FileBackendStoreShardDirIterator' => 'includes/filerepo/backend/FileBackendStore.php', - 'FileBackendStoreShardFileIterator' => 'includes/filerepo/backend/FileBackendStore.php', - 'FileBackendMultiWrite' => 'includes/filerepo/backend/FileBackendMultiWrite.php', - 'FileBackendStoreOpHandle' => 'includes/filerepo/backend/FileBackendStore.php', - 'FSFileBackend' => 'includes/filerepo/backend/FSFileBackend.php', - 'FSFileBackendList' => 'includes/filerepo/backend/FSFileBackend.php', - 'FSFileBackendDirList' => 'includes/filerepo/backend/FSFileBackend.php', - 'FSFileBackendFileList' => 'includes/filerepo/backend/FSFileBackend.php', - 'FSFileOpHandle' => 'includes/filerepo/backend/FSFileBackend.php', - 'SwiftFileBackend' => 'includes/filerepo/backend/SwiftFileBackend.php', - 'SwiftFileBackendList' => 'includes/filerepo/backend/SwiftFileBackend.php', - 'SwiftFileBackendDirList' => 'includes/filerepo/backend/SwiftFileBackend.php', - 'SwiftFileBackendFileList' => 'includes/filerepo/backend/SwiftFileBackend.php', - 'SwiftFileOpHandle' => 'includes/filerepo/backend/SwiftFileBackend.php', - 'FileJournal' => 'includes/filerepo/backend/filejournal/FileJournal.php', - 'DBFileJournal' => 'includes/filerepo/backend/filejournal/DBFileJournal.php', - 'NullFileJournal' => 'includes/filerepo/backend/filejournal/FileJournal.php', - 'LockManagerGroup' => 'includes/filerepo/backend/lockmanager/LockManagerGroup.php', - 'LockManager' => 'includes/filerepo/backend/lockmanager/LockManager.php', - 'ScopedLock' => 'includes/filerepo/backend/lockmanager/LockManager.php', - 'FSLockManager' => 'includes/filerepo/backend/lockmanager/FSLockManager.php', - 'DBLockManager' => 'includes/filerepo/backend/lockmanager/DBLockManager.php', - 'LSLockManager' => 'includes/filerepo/backend/lockmanager/LSLockManager.php', - 'MemcLockManager' => 'includes/filerepo/backend/lockmanager/MemcLockManager.php', - 'QuorumLockManager' => 'includes/filerepo/backend/lockmanager/LockManager.php', - 'MySqlLockManager'=> 'includes/filerepo/backend/lockmanager/DBLockManager.php', - 'NullLockManager' => 'includes/filerepo/backend/lockmanager/LockManager.php', - 'FileOp' => 'includes/filerepo/backend/FileOp.php', - 'FileOpBatch' => 'includes/filerepo/backend/FileOpBatch.php', - 'StoreFileOp' => 'includes/filerepo/backend/FileOp.php', - 'CopyFileOp' => 'includes/filerepo/backend/FileOp.php', - 'MoveFileOp' => 'includes/filerepo/backend/FileOp.php', - 'DeleteFileOp' => 'includes/filerepo/backend/FileOp.php', - 'ConcatenateFileOp' => 'includes/filerepo/backend/FileOp.php', - 'CreateFileOp' => 'includes/filerepo/backend/FileOp.php', - 'NullFileOp' => 'includes/filerepo/backend/FileOp.php', + 'FileBackendGroup' => 'includes/filebackend/FileBackendGroup.php', + 'FileBackend' => 'includes/filebackend/FileBackend.php', + 'FileBackendStore' => 'includes/filebackend/FileBackendStore.php', + 'FileBackendStoreShardListIterator' => 'includes/filebackend/FileBackendStore.php', + 'FileBackendStoreShardDirIterator' => 'includes/filebackend/FileBackendStore.php', + 'FileBackendStoreShardFileIterator' => 'includes/filebackend/FileBackendStore.php', + 'FileBackendMultiWrite' => 'includes/filebackend/FileBackendMultiWrite.php', + 'FileBackendStoreOpHandle' => 'includes/filebackend/FileBackendStore.php', + 'FSFile' => 'includes/filebackend/FSFile.php', + 'FSFileBackend' => 'includes/filebackend/FSFileBackend.php', + 'FSFileBackendList' => 'includes/filebackend/FSFileBackend.php', + 'FSFileBackendDirList' => 'includes/filebackend/FSFileBackend.php', + 'FSFileBackendFileList' => 'includes/filebackend/FSFileBackend.php', + 'FSFileOpHandle' => 'includes/filebackend/FSFileBackend.php', + 'SwiftFileBackend' => 'includes/filebackend/SwiftFileBackend.php', + 'SwiftFileBackendList' => 'includes/filebackend/SwiftFileBackend.php', + 'SwiftFileBackendDirList' => 'includes/filebackend/SwiftFileBackend.php', + 'SwiftFileBackendFileList' => 'includes/filebackend/SwiftFileBackend.php', + 'SwiftFileOpHandle' => 'includes/filebackend/SwiftFileBackend.php', + 'TempFSFile' => 'includes/filebackend/TempFSFile.php', + 'FileJournal' => 'includes/filebackend/filejournal/FileJournal.php', + 'DBFileJournal' => 'includes/filebackend/filejournal/DBFileJournal.php', + 'NullFileJournal' => 'includes/filebackend/filejournal/FileJournal.php', + 'LockManagerGroup' => 'includes/filebackend/lockmanager/LockManagerGroup.php', + 'LockManager' => 'includes/filebackend/lockmanager/LockManager.php', + 'ScopedLock' => 'includes/filebackend/lockmanager/LockManager.php', + 'FSLockManager' => 'includes/filebackend/lockmanager/FSLockManager.php', + 'DBLockManager' => 'includes/filebackend/lockmanager/DBLockManager.php', + 'LSLockManager' => 'includes/filebackend/lockmanager/LSLockManager.php', + 'MemcLockManager' => 'includes/filebackend/lockmanager/MemcLockManager.php', + 'QuorumLockManager' => 'includes/filebackend/lockmanager/LockManager.php', + 'MySqlLockManager'=> 'includes/filebackend/lockmanager/DBLockManager.php', + 'NullLockManager' => 'includes/filebackend/lockmanager/LockManager.php', + 'FileOp' => 'includes/filebackend/FileOp.php', + 'FileOpBatch' => 'includes/filebackend/FileOpBatch.php', + 'StoreFileOp' => 'includes/filebackend/FileOp.php', + 'CopyFileOp' => 'includes/filebackend/FileOp.php', + 'MoveFileOp' => 'includes/filebackend/FileOp.php', + 'DeleteFileOp' => 'includes/filebackend/FileOp.php', + 'ConcatenateFileOp' => 'includes/filebackend/FileOp.php', + 'CreateFileOp' => 'includes/filebackend/FileOp.php', + 'NullFileOp' => 'includes/filebackend/FileOp.php', # includes/installer 'CliInstaller' => 'includes/installer/CliInstaller.php', diff --git a/includes/filerepo/backend/FSFile.php b/includes/filebackend/FSFile.php similarity index 100% rename from includes/filerepo/backend/FSFile.php rename to includes/filebackend/FSFile.php diff --git a/includes/filerepo/backend/FSFileBackend.php b/includes/filebackend/FSFileBackend.php similarity index 100% rename from includes/filerepo/backend/FSFileBackend.php rename to includes/filebackend/FSFileBackend.php diff --git a/includes/filerepo/backend/FileBackend.php b/includes/filebackend/FileBackend.php similarity index 100% rename from includes/filerepo/backend/FileBackend.php rename to includes/filebackend/FileBackend.php diff --git a/includes/filerepo/backend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php similarity index 100% rename from includes/filerepo/backend/FileBackendGroup.php rename to includes/filebackend/FileBackendGroup.php diff --git a/includes/filerepo/backend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php similarity index 100% rename from includes/filerepo/backend/FileBackendMultiWrite.php rename to includes/filebackend/FileBackendMultiWrite.php diff --git a/includes/filerepo/backend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php similarity index 100% rename from includes/filerepo/backend/FileBackendStore.php rename to includes/filebackend/FileBackendStore.php diff --git a/includes/filerepo/backend/FileOp.php b/includes/filebackend/FileOp.php similarity index 100% rename from includes/filerepo/backend/FileOp.php rename to includes/filebackend/FileOp.php diff --git a/includes/filerepo/backend/FileOpBatch.php b/includes/filebackend/FileOpBatch.php similarity index 100% rename from includes/filerepo/backend/FileOpBatch.php rename to includes/filebackend/FileOpBatch.php diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php similarity index 100% rename from includes/filerepo/backend/SwiftFileBackend.php rename to includes/filebackend/SwiftFileBackend.php diff --git a/includes/filerepo/backend/TempFSFile.php b/includes/filebackend/TempFSFile.php similarity index 100% rename from includes/filerepo/backend/TempFSFile.php rename to includes/filebackend/TempFSFile.php diff --git a/includes/filerepo/backend/filejournal/DBFileJournal.php b/includes/filebackend/filejournal/DBFileJournal.php similarity index 100% rename from includes/filerepo/backend/filejournal/DBFileJournal.php rename to includes/filebackend/filejournal/DBFileJournal.php diff --git a/includes/filerepo/backend/filejournal/FileJournal.php b/includes/filebackend/filejournal/FileJournal.php similarity index 100% rename from includes/filerepo/backend/filejournal/FileJournal.php rename to includes/filebackend/filejournal/FileJournal.php diff --git a/includes/filerepo/backend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php similarity index 100% rename from includes/filerepo/backend/lockmanager/DBLockManager.php rename to includes/filebackend/lockmanager/DBLockManager.php diff --git a/includes/filerepo/backend/lockmanager/FSLockManager.php b/includes/filebackend/lockmanager/FSLockManager.php similarity index 100% rename from includes/filerepo/backend/lockmanager/FSLockManager.php rename to includes/filebackend/lockmanager/FSLockManager.php diff --git a/includes/filerepo/backend/lockmanager/LSLockManager.php b/includes/filebackend/lockmanager/LSLockManager.php similarity index 100% rename from includes/filerepo/backend/lockmanager/LSLockManager.php rename to includes/filebackend/lockmanager/LSLockManager.php diff --git a/includes/filerepo/backend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php similarity index 100% rename from includes/filerepo/backend/lockmanager/LockManager.php rename to includes/filebackend/lockmanager/LockManager.php diff --git a/includes/filerepo/backend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php similarity index 100% rename from includes/filerepo/backend/lockmanager/LockManagerGroup.php rename to includes/filebackend/lockmanager/LockManagerGroup.php diff --git a/includes/filerepo/backend/lockmanager/MemcLockManager.php b/includes/filebackend/lockmanager/MemcLockManager.php similarity index 100% rename from includes/filerepo/backend/lockmanager/MemcLockManager.php rename to includes/filebackend/lockmanager/MemcLockManager.php -- 2.20.1