Merged all the AVM mapping files into one medium file. I find it easier to follow.

Purged the pointless FileContentFactory class.  If everything else were working file reading
and writing would now work.  Various other cleanups and some richer internal documentation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-16 22:55:37 +00:00
parent f9ac70712b
commit 8818e8daba
20 changed files with 408 additions and 251 deletions

View File

@@ -54,6 +54,11 @@ public class AVMServiceImpl implements AVMService
*/
private ThreadLocal<SuperRepository> fSuperRepository;
/**
* The storage directory.
*/
private String fStorage;
/**
* Basic constructor for the service.
*/
@@ -63,6 +68,15 @@ public class AVMServiceImpl implements AVMService
fTransaction = new HibernateTxn(fSessionFactory);
}
/**
* Set the location of file storage.
* @param storage
*/
public void setStorage(String storage)
{
fStorage = storage;
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMService#getFileInputStream(int, java.lang.String)
*/
@@ -74,7 +88,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
in = fSuperRepository.get().getInputStream(version, path);
}
};
@@ -94,7 +108,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
out = fSuperRepository.get().getOutputStream(path);
}
};
@@ -114,7 +128,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
listing = fSuperRepository.get().getListing(version, path);
}
}
@@ -132,7 +146,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createFile(path, name);
}
}
@@ -149,7 +163,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createDirectory(path, name);
}
}
@@ -166,7 +180,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createLayeredFile(srcPath, parent, name);
}
}
@@ -183,7 +197,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createLayeredDirectory(srcPath, parent, name);
}
}
@@ -200,7 +214,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createRepository(name);
}
}
@@ -218,7 +232,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createBranch(version, srcPath, dstPath, name);
}
}
@@ -235,7 +249,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().remove(parent, name);
}
}
@@ -253,7 +267,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().rename(srcParent, srcName, dstParent, dstName);
}
}
@@ -271,7 +285,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().slide(srcParent, srcName, dstParent, dstName);
}
}
@@ -290,7 +304,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
latestVersionID = fSuperRepository.get().getLatestVersionID(repName);
}
}
@@ -308,7 +322,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().createSnapshot(repositories);
}
}
@@ -327,7 +341,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
lookup = fSuperRepository.get().lookup(version, path);
}
}
@@ -345,7 +359,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().destroyRepository(name);
}
}
@@ -362,7 +376,7 @@ public class AVMServiceImpl implements AVMService
{
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
fSuperRepository.get().purgeVersion(name, version);
}
}
@@ -381,7 +395,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
indirectionPath = fSuperRepository.get().getIndirectionPath(version, path);
}
}
@@ -401,7 +415,7 @@ public class AVMServiceImpl implements AVMService
public void perform(Session session)
{
fSuperRepository.set(new SuperRepositoryImpl(session));
fSuperRepository.set(new SuperRepositoryImpl(session, fStorage));
versions = fSuperRepository.get().getRepositoryVersions(name);
}
}

View File

@@ -70,14 +70,21 @@ public class SuperRepositoryImpl implements SuperRepository
* The layer id issuer.
*/
private Issuer fLayerIssuer;
/**
* The file storage directory.
*/
private String fStorage;
/**
* Make a new one, initialized with the session.
* @param session The session for this operation.
* @param storage Where file data gets stored.
*/
public SuperRepositoryImpl(Session session)
public SuperRepositoryImpl(Session session, String storage)
{
fSession = session;
fStorage = storage;
fNodeIssuer = (Issuer)fSession.get(Issuer.class, "node");
fContentIssuer = (Issuer)fSession.get(Issuer.class, "content");
fBranchIssuer = (Issuer)fSession.get(Issuer.class, "branch");
@@ -506,4 +513,12 @@ public class SuperRepositoryImpl implements SuperRepository
}
return pathParts;
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.SuperRepository#getStorageRoot()
*/
public String getStorageRoot()
{
return fStorage;
}
}