inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge DEV to HEAD

Browse Source 
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:
Mark Rogers
2011-07-29 09:08:54 +00:00
parent 65cb62ceb8
commit b4bd3a21c2
83 changed files with 11518 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/java/org/alfresco/filesys/repo/ContentQuotaManager.java
View File

@@ -33,7 +33,9 @@ import org.alfresco.jlan.server.filesys.quota.QuotaManagerException;
import org.alfresco.jlan.util.MemorySize;
import org.alfresco.jlan.util.StringList;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.usage.ContentUsageService;
import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -60,12 +62,14 @@ public class ContentQuotaManager implements QuotaManager, Runnable {
// Associated filesystem driver
private ContentDiskDriver m_filesys;
private DiskInterface m_filesys;
// Content usage service
private ContentUsageService m_usageService;
private ContentService contentService;
// Track live usage of users that are writing files
private HashMap<String, UserQuotaDetails> m_liveUsage;
@@ -75,6 +79,12 @@ public class ContentQuotaManager implements QuotaManager, Runnable {
private Thread m_thread;
private boolean m_shutdown;
public void init()
{
PropertyCheck.mandatory(this, "contentService", getContentService());
PropertyCheck.mandatory(this, "contentUsageService", m_usageService);
}
/**
* Get the usage service
@@ -103,7 +113,7 @@ public class ContentQuotaManager implements QuotaManager, Runnable {
// Get the live free space value from the content store, if supported
long freeSpace = m_filesys.getContentService().getStoreFreeSpace();
long freeSpace = contentService.getStoreFreeSpace();
if ( freeSpace == -1L) {
// Content store does not support sizing, return a large dummy value
@@ -261,11 +271,12 @@ public class ContentQuotaManager implements QuotaManager, Runnable {
throws QuotaManagerException {
// Save the filesystem driver details
m_filesys = disk;
if ( disk instanceof ContentDiskDriver)
m_filesys = (ContentDiskDriver) disk;
else
throw new QuotaManagerException("Invalid filesystem type, " + disk.getClass().getName());
// if ( disk instanceof ContentDiskDriver)
// m_filesys = (ContentDiskDriver) disk;
// else
// throw new QuotaManagerException("Invalid filesystem type, " + disk.getClass().getName());
// Allocate the live usage table
@@ -361,7 +372,7 @@ public class ContentQuotaManager implements QuotaManager, Runnable {
// Start a transaction
m_filesys.beginReadTransaction(sess);
// m_filesys.beginReadTransaction(sess);
// Get the usage quota and current usage values for the user
@@ -505,4 +516,14 @@ public class ContentQuotaManager implements QuotaManager, Runnable {
}
}
}
public void setContentService(ContentService contentService)
{
this.contentService = contentService;
}
public ContentService getContentService()
{
return contentService;
}
}