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

Some cleaning up of the AVMService and derived interfaces.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-16 18:17:18 +00:00
parent aaa4c27bbd
commit 87b5690fc2
24 changed files with 165 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
View File

@@ -281,7 +281,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
// Get a list of the available AVM stores
List<AVMStoreDescriptor> storeList = m_avmService.getAVMStores();
List<AVMStoreDescriptor> storeList = m_avmService.getStores();
if ( storeList != null && storeList.size() > 0)
{
@@ -384,7 +384,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
try
{
storeDesc = m_avmService.getAVMStore( storeName);
storeDesc = m_avmService.getStore( storeName);
}
catch (AVMNotFoundException ex)
{
@@ -393,7 +393,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
// Create a new store if it does not exist
if ( storeDesc == null)
m_avmService.createAVMStore( storeName);
m_avmService.createStore( storeName);
// Check if there is an optional path
@@ -527,7 +527,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
// Get the list of AVM stores
List<AVMStoreDescriptor> storeList = m_avmService.getAVMStores();
List<AVMStoreDescriptor> storeList = m_avmService.getStores();
if ( storeList != null)
{
@@ -1945,7 +1945,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
// Get the list of versions for the store
List<VersionDescriptor> verList = m_avmService.getAVMStoreVersions( avmPath.getStoreName());
List<VersionDescriptor> verList = m_avmService.getStoreVersions( avmPath.getStoreName());
// Add pseudo files for the versions to the store state

2
source/java/org/alfresco/filesys/avm/AVMNetworkFile.java
View File

@@ -418,7 +418,7 @@ public class AVMNetworkFile extends NetworkFile {
// Create a writer to access the file data
cWriter = m_avmService.createContentWriter( m_avmPath);
cWriter = m_avmService.getContentWriter( m_avmPath);
// Set the mime-type

4
source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
View File

@@ -38,12 +38,12 @@ public class AVMCrawlTestP extends AVMServiceTestBase
int n = 4; // Number of Threads.
int m = 12; // How many multiples of content to start with.
long runTime = 7200000; // 6 hours.
fService.purgeAVMStore("main");
fService.purgeStore("main");
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
for (int i = 0; i < m; i++)
{
fService.createAVMStore("d" + i);
fService.createStore("d" + i);
loader.recursiveLoad("source", "d" + i + ":/");
fService.createSnapshot("d" + i, null, null);
}

2
source/java/org/alfresco/repo/avm/AVMCrawler.java
View File

@@ -118,7 +118,7 @@ class AVMCrawler implements Runnable
{
try
{
List<AVMStoreDescriptor> reps = fService.getAVMStores();
List<AVMStoreDescriptor> reps = fService.getStores();
fOpCount++;
AVMStoreDescriptor repDesc = reps.get(fRandom.nextInt(reps.size()));
Map<String, AVMNodeDescriptor> rootListing = fService.getDirectoryListing(-1, repDesc.getName() + ":/");

10
source/java/org/alfresco/repo/avm/AVMInterpreter.java
View File

@@ -193,7 +193,7 @@ public class AVMInterpreter
}
else if (command[0].equals("lsrep"))
{
List<AVMStoreDescriptor> repos = fService.getAVMStores();
List<AVMStoreDescriptor> repos = fService.getStores();
for (AVMStoreDescriptor repo : repos)
{
out.println(repo);
@@ -205,7 +205,7 @@ public class AVMInterpreter
{
return "Syntax Error.";
}
List<VersionDescriptor> listing = fService.getAVMStoreVersions(command[1]);
List<VersionDescriptor> listing = fService.getStoreVersions(command[1]);
for (VersionDescriptor desc : listing)
{
out.println(desc);
@@ -217,7 +217,7 @@ public class AVMInterpreter
{
return "Syntax Error.";
}
fService.createAVMStore(command[1]);
fService.createStore(command[1]);
}
else if (command[0].equals("load"))
{
@@ -339,7 +339,7 @@ public class AVMInterpreter
{
return "Syntax Error.";
}
fService.purgeAVMStore(command[1]);
fService.purgeStore(command[1]);
}
else if (command[0].equals("rmver"))
{
@@ -449,7 +449,7 @@ public class AVMInterpreter
{
return "Syntax Error.";
}
AVMStoreDescriptor desc = fService.getAVMStore(command[1]);
AVMStoreDescriptor desc = fService.getStore(command[1]);
if (desc == null)
{
return "Not Found.";

8
source/java/org/alfresco/repo/avm/AVMNodeService.java
View File

@@ -100,7 +100,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
public List<StoreRef> getStores()
{
// For AVM stores we fake up StoreRefs.
List<AVMStoreDescriptor> stores = fAVMService.getAVMStores();
List<AVMStoreDescriptor> stores = fAVMService.getStores();
List<StoreRef> result = new ArrayList<StoreRef>();
for (AVMStoreDescriptor desc : stores)
{
@@ -123,7 +123,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
// invokeBeforeCreateStore(ContentModel.TYPE_STOREROOT, result);
try
{
fAVMService.createAVMStore(identifier);
fAVMService.createStore(identifier);
NodeRef rootRef = getRootNode(result);
addAspect(rootRef, ContentModel.ASPECT_ROOT,
Collections.<QName, Serializable>emptyMap());
@@ -143,7 +143,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
*/
public boolean exists(StoreRef storeRef)
{
return fAVMService.getAVMStore(storeRef.getIdentifier()) != null;
return fAVMService.getStore(storeRef.getIdentifier()) != null;
}
/**
@@ -181,7 +181,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
public NodeRef getRootNode(StoreRef storeRef) throws InvalidStoreRefException
{
String storeName = storeRef.getIdentifier();
if (fAVMService.getAVMStore(storeName) != null)
if (fAVMService.getStore(storeName) != null)
{
return AVMNodeConverter.ToNodeRef(-1, storeName + ":/");
}

30
source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
View File

@@ -48,9 +48,9 @@ public class AVMRemoteLocal implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createAVMStore(java.lang.String)
*/
public void createAVMStore(String name)
public void createStore(String name)
{
fService.createAVMStore(name);
fService.createStore(name);
}
/* (non-Javadoc)
@@ -130,42 +130,42 @@ public class AVMRemoteLocal implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStore(java.lang.String)
*/
public AVMStoreDescriptor getAVMStore(String name)
public AVMStoreDescriptor getStore(String name)
{
return fService.getAVMStore(name);
return fService.getStore(name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreRoot(int, java.lang.String)
*/
public AVMNodeDescriptor getAVMStoreRoot(int version, String name)
public AVMNodeDescriptor getStoreRoot(int version, String name)
{
return fService.getAVMStoreRoot(version, name);
return fService.getStoreRoot(version, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreVersions(java.lang.String)
*/
public List<VersionDescriptor> getAVMStoreVersions(String name)
public List<VersionDescriptor> getStoreVersions(String name)
{
return fService.getAVMStoreVersions(name);
return fService.getStoreVersions(name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreVersions(java.lang.String, java.util.Date, java.util.Date)
*/
public List<VersionDescriptor> getAVMStoreVersions(String name, Date from,
public List<VersionDescriptor> getStoreVersions(String name, Date from,
Date to)
{
return fService.getAVMStoreVersions(name, from, to);
return fService.getStoreVersions(name, from, to);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStores()
*/
public List<AVMStoreDescriptor> getAVMStores()
public List<AVMStoreDescriptor> getStores()
{
return fService.getAVMStores();
return fService.getStores();
}
/* (non-Javadoc)
@@ -263,7 +263,7 @@ public class AVMRemoteLocal implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getLatestVersionID(java.lang.String)
*/
public int getLatestVersionID(String storeName)
public int getNextVersionID(String storeName)
{
return fService.getNextVersionID(storeName);
}
@@ -335,9 +335,9 @@ public class AVMRemoteLocal implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#purgeAVMStore(java.lang.String)
*/
public void purgeAVMStore(String name)
public void purgeStore(String name)
{
fService.purgeAVMStore(name);
fService.purgeStore(name);
}
/* (non-Javadoc)

30
source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
View File

@@ -549,10 +549,10 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* Create a new AVMStore.
* @param name The name to give the new store.
*/
public void createAVMStore(String ticket, String name)
public void createStore(String ticket, String name)
{
fAuthService.validate(ticket);
fAVMService.createAVMStore(name);
fAVMService.createStore(name);
}
/**
@@ -608,7 +608,7 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* @param storeName The name of the AVMStore.
* @return The latest version id.
*/
public int getLatestVersionID(String ticket, String storeName)
public int getNextVersionID(String ticket, String storeName)
{
fAuthService.validate(ticket);
return fAVMService.getNextVersionID(storeName);
@@ -640,10 +640,10 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* @param name The name of the store.
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String ticket, String name)
public List<VersionDescriptor> getStoreVersions(String ticket, String name)
{
fAuthService.validate(ticket);
return fAVMService.getAVMStoreVersions(name);
return fAVMService.getStoreVersions(name);
}
/**
@@ -653,20 +653,20 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* @param to The date to which (inclusive).
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String ticket, String name, Date from, Date to)
public List<VersionDescriptor> getStoreVersions(String ticket, String name, Date from, Date to)
{
fAuthService.validate(ticket);
return fAVMService.getAVMStoreVersions(name, from, to);
return fAVMService.getStoreVersions(name, from, to);
}
/**
* Get a list of all AVM stores.
* @return A List of AVMStoreDescriptors.
*/
public List<AVMStoreDescriptor> getAVMStores(String ticket)
public List<AVMStoreDescriptor> getStores(String ticket)
{
fAuthService.validate(ticket);
return fAVMService.getAVMStores();
return fAVMService.getStores();
}
/**
@@ -674,10 +674,10 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* @param name The name of the store.
* @return An AVMStoreDescriptor.
*/
public AVMStoreDescriptor getAVMStore(String ticket, String name)
public AVMStoreDescriptor getStore(String ticket, String name)
{
fAuthService.validate(ticket);
return fAVMService.getAVMStore(name);
return fAVMService.getStore(name);
}
/**
@@ -686,10 +686,10 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* @param name The name of the store.
* @return The AVMNodeDescriptor for the root.
*/
public AVMNodeDescriptor getAVMStoreRoot(String ticket, int version, String name)
public AVMNodeDescriptor getStoreRoot(String ticket, int version, String name)
{
fAuthService.validate(ticket);
return fAVMService.getAVMStoreRoot(version, name);
return fAVMService.getStoreRoot(version, name);
}
/**
@@ -732,10 +732,10 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
* Purge an AVMStore.
* @param name The name of the store to purge.
*/
public void purgeAVMStore(String ticket, String name)
public void purgeStore(String ticket, String name)
{
fAuthService.validate(ticket);
fAVMService.purgeAVMStore(name);
fAVMService.purgeStore(name);
}
/**

26
source/java/org/alfresco/repo/avm/AVMServiceImpl.java
View File

@@ -156,7 +156,7 @@ public class AVMServiceImpl implements AVMService
* @param path The path to the file.
* @return A ContentWriter.
*/
public ContentWriter createContentWriter(String path)
public ContentWriter getContentWriter(String path)
{
if (path == null)
{
@@ -454,7 +454,7 @@ public class AVMServiceImpl implements AVMService
* Create an AVMStore with the given name. It must not exist.
* @param name The name to give the AVMStore.
*/
public void createAVMStore(String name)
public void createStore(String name)
{
if (name == null || !FileNameValidator.IsValid(name))
{
@@ -557,7 +557,7 @@ public class AVMServiceImpl implements AVMService
* @param dirPath The path to the layered directory.
* @param name The name of the item to flatten.
*/
public void flatten(String dirPath, String name)
public void makeTransparent(String dirPath, String name)
{
if (dirPath == null || name == null)
{
@@ -750,7 +750,7 @@ public class AVMServiceImpl implements AVMService
* is only referenced in that AVMStore.
* @param name The name of the AVMStore to purge.
*/
public void purgeAVMStore(String name)
public void purgeStore(String name)
{
if (name == null)
{
@@ -793,7 +793,7 @@ public class AVMServiceImpl implements AVMService
* @param name The name of the AVMStore.
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String name)
public List<VersionDescriptor> getStoreVersions(String name)
{
if (name == null)
{
@@ -810,7 +810,7 @@ public class AVMServiceImpl implements AVMService
* @param to The latest versions to return.
* @return The Set of matching version IDs.
*/
public List<VersionDescriptor> getAVMStoreVersions(String name, Date from, Date to)
public List<VersionDescriptor> getStoreVersions(String name, Date from, Date to)
{
if (name == null || (from == null && to == null))
{
@@ -851,7 +851,7 @@ public class AVMServiceImpl implements AVMService
* Get a list of all AVMStores.
* @return The AVMStores.
*/
public List<AVMStoreDescriptor> getAVMStores()
public List<AVMStoreDescriptor> getStores()
{
return fAVMRepository.getAVMStores();
}
@@ -861,7 +861,7 @@ public class AVMServiceImpl implements AVMService
* @param name The name of the AVMStore to get.
* @return The AVMStore.
*/
public AVMStoreDescriptor getAVMStore(String name)
public AVMStoreDescriptor getStore(String name)
{
if (name == null)
{
@@ -882,13 +882,13 @@ public class AVMServiceImpl implements AVMService
* like workflow packages.
* @return The descriptor.
*/
public AVMStoreDescriptor getAVMSystemStore()
public AVMStoreDescriptor getSystemStore()
{
AVMStoreDescriptor store = getAVMStore(SYSTEM);
AVMStoreDescriptor store = getStore(SYSTEM);
if (store == null)
{
createAVMStore(SYSTEM);
return getAVMStore(SYSTEM);
createStore(SYSTEM);
return getStore(SYSTEM);
}
return store;
}
@@ -899,7 +899,7 @@ public class AVMServiceImpl implements AVMService
* @param name The name of the AVMStore.
* @return The root descriptor.
*/
public AVMNodeDescriptor getAVMStoreRoot(int version, String name)
public AVMNodeDescriptor getStoreRoot(int version, String name)
{
if (name == null)
{

64
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -79,7 +79,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("branch");
fService.createStore("branch");
fService.createBranch(-1, "main:/a", "branch:/", "a");
fService.removeNode("branch:/a/b/c/foo");
List<AVMDifference> diffs = fSyncService.compare(-1, "branch:/a", -1, "main:/a", null);
@@ -112,7 +112,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
fService.renameStore("main", "foo");
assertNotNull(fService.getAVMStore("foo"));
assertNotNull(fService.getStore("foo"));
}
catch (Exception e)
{
@@ -236,7 +236,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("layer");
fService.createStore("layer");
fService.createLayeredDirectory("main:/a", "layer:/", "a");
fService.getFileOutputStream("layer:/a/b/c/foo").close();
fService.createFile("layer:/a/b", "bing").close();
@@ -268,7 +268,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("layer");
fService.createStore("layer");
fService.createLayeredDirectory("main:/a", "layer:/", "layer");
assertEquals("main:/a", fService.getIndirectionPath(-1, "layer:/layer"));
assertEquals("main:/a/b", fService.getIndirectionPath(-1, "layer:/layer/b"));
@@ -292,7 +292,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("area");
fService.createStore("area");
fService.createLayeredDirectory("main:/a", "area:/", "a");
fService.getFileOutputStream("area:/a/b/c/foo").close();
List<AVMDifference> diffs = fSyncService.compare(-1, "area:/a", -1, "main:/a", null);
@@ -344,7 +344,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("area");
fService.createStore("area");
fService.createLayeredDirectory("main:/a", "area:/", "a");
fService.getFileOutputStream("area:/a/b/c/foo").close();
List<AVMDifference> diffs = fSyncService.compare(-1, "area:/a", -1, "main:/a", null);
@@ -395,7 +395,7 @@ public class AVMServiceTest extends AVMServiceTestBase
fService.rename("main:/", "a", "main:/appBase", "a");
fService.rename("main:/", "d", "main:/appBase", "d");
fService.createSnapshot("main", null, null);
fService.createAVMStore("source");
fService.createStore("source");
fService.createLayeredDirectory("main:/appBase", "source:/", "appBase");
fService.getFileOutputStream("source:/appBase/a/b/c/foo").close();
final ActionImpl action = new ActionImpl(AVMNodeConverter.ToNodeRef(-1, "source:/appBase/a"),
@@ -430,7 +430,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("staging");
fService.createStore("staging");
List<AVMDifference> diffs = fSyncService.compare(-1, "main:/", -1, "staging:/", null);
assertEquals(2, diffs.size());
List<AVMDifference> noodle = new ArrayList<AVMDifference>();
@@ -457,14 +457,14 @@ public class AVMServiceTest extends AVMServiceTestBase
{
try
{
fService.createAVMStore("foo-staging");
fService.createStore("foo-staging");
fService.createDirectory("foo-staging:/", "appBase");
fService.createDirectory("foo-staging:/appBase", "a");
fService.createDirectory("foo-staging:/appBase/a","b");
fService.createDirectory("foo-staging:/appBase/a/b", "c");
fService.createFile("foo-staging:/appBase/a/b/c", "foo").close();
fService.createFile("foo-staging:/appBase/a/b/c", "bar").close();
fService.createAVMStore("area");
fService.createStore("area");
fService.setStoreProperty("area", QName.createQName(null, ".website.name"),
new PropertyValue(null, "foo"));
fService.createLayeredDirectory("foo-staging:/appBase", "area:/", "appBase");
@@ -532,8 +532,8 @@ public class AVMServiceTest extends AVMServiceTestBase
{
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
fService.createAVMStore("source");
fService.createAVMStore("dest");
fService.createStore("source");
fService.createStore("dest");
loader.recursiveLoad("config/alfresco/bootstrap", "source:/");
int version1 = fService.createSnapshot("source", null, null);
loader.recursiveLoad("config/alfresco/extension", "source:/");
@@ -567,7 +567,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("branch");
fService.createStore("branch");
fService.createBranch(-1, "main:/", "branch:/", "branch");
// Modify some things in the branch.
fService.createFile("branch:/branch/a/b", "fing").close();
@@ -623,7 +623,7 @@ public class AVMServiceTest extends AVMServiceTestBase
{
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
fService.createAVMStore("layer");
fService.createStore("layer");
fService.createLayeredDirectory("main:/", "layer:/", "layer");
loader.recursiveLoad("config/alfresco/bootstrap", "layer:/layer");
List<AVMDifference> diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
@@ -638,7 +638,7 @@ public class AVMServiceTest extends AVMServiceTestBase
System.out.println(recursiveList("layer", -1, true));
System.out.println("Main:");
System.out.println(recursiveList("main", -1, true));
fService.createAVMStore("layer2");
fService.createStore("layer2");
fService.createLayeredDirectory("layer:/layer", "layer2:/", "layer");
loader.recursiveLoad("config/alfresco/bootstrap", "layer2:/layer/bootstrap");
fService.createSnapshot("layer2", null, null);
@@ -821,8 +821,8 @@ public class AVMServiceTest extends AVMServiceTestBase
assertEquals(fService.lookup(-1, "main:/a/monkey", true).getId(),
fService.lookup(-1, "main:/abranch/monkey", true).getId());
// Cleanup for layered tests.
fService.purgeAVMStore("main");
fService.createAVMStore("main");
fService.purgeStore("main");
fService.createStore("main");
setupBasicTree();
fService.createLayeredDirectory("main:/a", "main:/", "layer");
fService.createFile("main:/layer", "monkey").close();
@@ -1084,7 +1084,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("layer");
fService.createStore("layer");
fService.createLayeredDirectory("main:/a", "layer:/", "alayer");
fService.createSnapshot("layer", null, null);
LayeringDescriptor info = fService.getLayeringInfo(-1, "layer:/alayer");
@@ -1774,7 +1774,7 @@ public class AVMServiceTest extends AVMServiceTestBase
out.println("This is testfile2");
out.close();
fService.createSnapshot("main", null, null);
List<VersionDescriptor> versions = fService.getAVMStoreVersions("main");
List<VersionDescriptor> versions = fService.getStoreVersions("main");
for (VersionDescriptor version : versions)
{
System.out.println("V:" + version.getVersionID());
@@ -1807,7 +1807,7 @@ public class AVMServiceTest extends AVMServiceTestBase
setupBasicTree();
fService.createBranch(-1, "main:/a", "main:/d/e", "abranch");
fService.createSnapshot("main", null, null);
List<VersionDescriptor> versions = fService.getAVMStoreVersions("main");
List<VersionDescriptor> versions = fService.getStoreVersions("main");
for (VersionDescriptor version : versions)
{
System.out.println("V:" + version.getVersionID());
@@ -1958,8 +1958,8 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("second");
List<AVMStoreDescriptor> repos = fService.getAVMStores();
fService.createStore("second");
List<AVMStoreDescriptor> repos = fService.getStores();
assertEquals(2, repos.size());
System.out.println(repos.get(0));
System.out.println(repos.get(1));
@@ -1997,7 +1997,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("second");
fService.createStore("second");
fService.createLayeredDirectory("main:/", "second:/", "main");
fService.createSnapshot("second", null, null);
System.out.println(recursiveList("second", -1, true));
@@ -2020,7 +2020,7 @@ public class AVMServiceTest extends AVMServiceTestBase
line = reader.readLine();
reader.close();
assertEquals("I am main:/a/b/c/foo", line);
fService.purgeAVMStore("second");
fService.purgeStore("second");
fService.purgeVersion(1, "main");
}
catch (Exception e)
@@ -2038,7 +2038,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
fService.createAVMStore("second");
fService.createStore("second");
fService.rename("main:/a/b", "c", "second:/", "cmoved");
ArrayList<String> toSnapshot = new ArrayList<String>();
toSnapshot.add("main");
@@ -2913,7 +2913,7 @@ public class AVMServiceTest extends AVMServiceTestBase
try
{
setupBasicTree();
AVMNodeDescriptor desc = fService.getAVMStoreRoot(-1, "main");
AVMNodeDescriptor desc = fService.getStoreRoot(-1, "main");
assertNotNull(desc);
System.out.println(desc.toString());
AVMNodeDescriptor child = fService.lookup(desc, "a");
@@ -2949,9 +2949,9 @@ public class AVMServiceTest extends AVMServiceTestBase
loader.recursiveLoad("source/java/org/alfresco/repo/audit", "main:/");
times.add(System.currentTimeMillis());
assertEquals(3, fService.createSnapshot("main", null, null));
assertEquals(1, fService.getAVMStoreVersions("main", null, new Date(times.get(0))).size());
assertEquals(3, fService.getAVMStoreVersions("main", new Date(times.get(0)), null).size());
assertEquals(2, fService.getAVMStoreVersions("main", new Date(times.get(1)),
assertEquals(1, fService.getStoreVersions("main", null, new Date(times.get(0))).size());
assertEquals(3, fService.getStoreVersions("main", new Date(times.get(0)), null).size());
assertEquals(2, fService.getStoreVersions("main", new Date(times.get(1)),
new Date(System.currentTimeMillis())).size());
}
catch (Exception e)
@@ -2972,7 +2972,7 @@ public class AVMServiceTest extends AVMServiceTestBase
// AVMStore that exists.
try
{
fService.createAVMStore("main");
fService.createStore("main");
fail();
}
catch (AVMExistsException ae)
@@ -2980,7 +2980,7 @@ public class AVMServiceTest extends AVMServiceTestBase
// Do nothing.
}
// Now make sure getRepository() works.
AVMStoreDescriptor desc = fService.getAVMStore("main");
AVMStoreDescriptor desc = fService.getStore("main");
assertNotNull(desc);
System.out.println(desc);
}
@@ -3453,7 +3453,7 @@ public class AVMServiceTest extends AVMServiceTestBase
Map<QName, PropertyValue> result =
fService.queryStorePropertyKey("main", QName.createQName("", ".dns.%"));
assertEquals(1, result.size());
fService.createAVMStore("second");
fService.createStore("second");
fService.setStoreProperty("second", QName.createQName("", ".dns.alice"),
new PropertyValue(null, "alice-space"));
Map<String, Map<QName, PropertyValue>> matches =

9
source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
View File

@@ -27,6 +27,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.springframework.context.support.FileSystemXmlApplicationContext;
import junit.framework.TestCase;
@@ -75,6 +76,8 @@ public class AVMServiceTestBase extends TestCase
fService = (AVMService)fContext.getBean("AVMService");
fReaper = (OrphanReaper)fContext.getBean("orphanReaper");
fSyncService = (AVMSyncService)fContext.getBean("AVMSyncService");
AuthenticationService authService = (AuthenticationService)fContext.getBean("authenticationService");
authService.authenticate("admin", "admin".toCharArray());
CreateStoreTxnListener cstl = (CreateStoreTxnListener)fContext.getBean("createStoreTxnListener");
cstl.addCallback(
new CreateStoreCallback()
@@ -116,7 +119,7 @@ public class AVMServiceTestBase extends TestCase
}
);
}
fService.createAVMStore("main");
fService.createStore("main");
fStartTime = System.currentTimeMillis();
}
@@ -129,10 +132,10 @@ public class AVMServiceTestBase extends TestCase
{
long now = System.currentTimeMillis();
System.out.println("Timing: " + (now - fStartTime) + "ms");
List<AVMStoreDescriptor> descriptors = fService.getAVMStores();
List<AVMStoreDescriptor> descriptors = fService.getStores();
for (AVMStoreDescriptor desc : descriptors)
{
fService.purgeAVMStore(desc.getName());
fService.purgeStore(desc.getName());
}
// fContext.close();
// File alfData = new File("alf_data");

14
source/java/org/alfresco/repo/avm/AVMTestRemote.java
View File

@@ -72,10 +72,10 @@ public class AVMTestRemote extends TestCase
@Override
protected void tearDown() throws Exception
{
List<AVMStoreDescriptor> stores = fAVMRemote.getAVMStores();
List<AVMStoreDescriptor> stores = fAVMRemote.getStores();
for (AVMStoreDescriptor desc : stores)
{
fAVMRemote.purgeAVMStore(desc.getName());
fAVMRemote.purgeStore(desc.getName());
}
fContext.close();
}
@@ -87,7 +87,7 @@ public class AVMTestRemote extends TestCase
{
try
{
List<AVMStoreDescriptor> stores = fAVMRemote.getAVMStores();
List<AVMStoreDescriptor> stores = fAVMRemote.getStores();
for (AVMStoreDescriptor store : stores)
{
System.out.println(store);
@@ -108,7 +108,7 @@ public class AVMTestRemote extends TestCase
try
{
// Create a test store.
fAVMRemote.createAVMStore("test2933");
fAVMRemote.createStore("test2933");
// Create a directory.
fAVMRemote.createDirectory("test2933:/", "a");
// Write out a file.
@@ -141,7 +141,7 @@ public class AVMTestRemote extends TestCase
{
try
{
fAVMRemote.createAVMStore("froo");
fAVMRemote.createStore("froo");
// Create a file.
byte [] buff = new byte[64];
for (int i = 0; i < 64; i++)
@@ -190,13 +190,13 @@ public class AVMTestRemote extends TestCase
try
{
// Create a store.
fAVMRemote.createAVMStore("froo");
fAVMRemote.createStore("froo");
// Create a directory.
fAVMRemote.createDirectory("froo:/", "a");
// Create a file.
fAVMRemote.createFile("froo:/a", "foo").close();
// Create another store.
fAVMRemote.createAVMStore("broo");
fAVMRemote.createStore("broo");
// Create a branch.
fAVMRemote.createBranch(-1, "froo:/a", "broo:/", "a");
List<AVMDifference> diffs = fAVMSync.compare(-1, "froo:/a", -1, "broo:/a", null);

2
source/java/org/alfresco/repo/avm/AVMTester.java
View File

@@ -425,7 +425,7 @@ class AVMTester implements Runnable
fAllPaths.add("main:/");
fAllDirectories.add("main:/");
Set<Long> visited = new HashSet<Long>();
AVMNodeDescriptor root = fService.getAVMStoreRoot(-1, "main");
AVMNodeDescriptor root = fService.getStoreRoot(-1, "main");
recursiveRefresh(root, visited);
}

2
source/java/org/alfresco/repo/avm/PurgeTestP.java
View File

@@ -118,7 +118,7 @@ public class PurgeTestP extends AVMServiceTestBase
fService.removeNode("main:/layer/java/org/alfresco", "repo");
fService.createFile("main:/layer/java/org/alfresco", "goofy").close();
fService.createSnapshot("main", null, null);
fService.purgeAVMStore("main");
fService.purgeStore("main");
fReaper.activate();
while (fReaper.isActive())
{

2
source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java
View File

@@ -64,7 +64,7 @@ public class AVMUndoSandboxListAction extends ActionExecuterAbstractBase
AVMNodeDescriptor parent = fAVMService.lookup(-1, parentChild[0], true);
if (parent.isLayeredDirectory())
{
fAVMService.flatten(parentChild[0], parentChild[1]);
fAVMService.makeTransparent(parentChild[0], parentChild[1]);
}
}
}

2
source/java/org/alfresco/repo/clt/AVMLsStores.java
View File

@@ -24,7 +24,7 @@ public class AVMLsStores extends CltBase
@Override
protected void run(Map<String, List<String>> flags, List<String> args)
{
List<AVMStoreDescriptor> stores = fAVMRemote.getAVMStores();
List<AVMStoreDescriptor> stores = fAVMRemote.getStores();
for (AVMStoreDescriptor store : stores)
{
System.out.println(store);

2
source/java/org/alfresco/repo/clt/AVMLsVersions.java
View File

@@ -24,7 +24,7 @@ public class AVMLsVersions extends CltBase
@Override
protected void run(Map<String, List<String>> flags, List<String> args)
{
List<VersionDescriptor> versions = fAVMRemote.getAVMStoreVersions(args.get(0));
List<VersionDescriptor> versions = fAVMRemote.getStoreVersions(args.get(0));
for (VersionDescriptor version : versions)
{
System.out.println(version);

2
source/java/org/alfresco/repo/clt/AVMMkStore.java
View File

@@ -22,7 +22,7 @@ public class AVMMkStore extends CltBase
@Override
protected void run(Map<String, List<String>> flags, List<String> args)
{
fAVMRemote.createAVMStore(args.get(0));
fAVMRemote.createStore(args.get(0));
}
/**

32
source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
View File

@@ -48,9 +48,9 @@ public class AVMRemoteImpl implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createAVMStore(java.lang.String)
*/
public void createAVMStore(String name)
public void createStore(String name)
{
fTransport.createAVMStore(ClientTicketHolder.GetTicket(), name);
fTransport.createStore(ClientTicketHolder.GetTicket(), name);
}
/* (non-Javadoc)
@@ -131,42 +131,42 @@ public class AVMRemoteImpl implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStore(java.lang.String)
*/
public AVMStoreDescriptor getAVMStore(String name)
public AVMStoreDescriptor getStore(String name)
{
return fTransport.getAVMStore(ClientTicketHolder.GetTicket(), name);
return fTransport.getStore(ClientTicketHolder.GetTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreRoot(int, java.lang.String)
*/
public AVMNodeDescriptor getAVMStoreRoot(int version, String name)
public AVMNodeDescriptor getStoreRoot(int version, String name)
{
return fTransport.getAVMStoreRoot(ClientTicketHolder.GetTicket(), version, name);
return fTransport.getStoreRoot(ClientTicketHolder.GetTicket(), version, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreVersions(java.lang.String)
*/
public List<VersionDescriptor> getAVMStoreVersions(String name)
public List<VersionDescriptor> getStoreVersions(String name)
{
return fTransport.getAVMStoreVersions(ClientTicketHolder.GetTicket(), name);
return fTransport.getStoreVersions(ClientTicketHolder.GetTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreVersions(java.lang.String, java.util.Date, java.util.Date)
*/
public List<VersionDescriptor> getAVMStoreVersions(String name, Date from,
public List<VersionDescriptor> getStoreVersions(String name, Date from,
Date to)
{
return fTransport.getAVMStoreVersions(ClientTicketHolder.GetTicket(), name);
return fTransport.getStoreVersions(ClientTicketHolder.GetTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStores()
*/
public List<AVMStoreDescriptor> getAVMStores()
public List<AVMStoreDescriptor> getStores()
{
return fTransport.getAVMStores(ClientTicketHolder.GetTicket());
return fTransport.getStores(ClientTicketHolder.GetTicket());
}
/* (non-Javadoc)
@@ -267,9 +267,9 @@ public class AVMRemoteImpl implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getLatestVersionID(java.lang.String)
*/
public int getLatestVersionID(String storeName)
public int getNextVersionID(String storeName)
{
return fTransport.getLatestVersionID(ClientTicketHolder.GetTicket(), storeName);
return fTransport.getNextVersionID(ClientTicketHolder.GetTicket(), storeName);
}
/* (non-Javadoc)
@@ -339,9 +339,9 @@ public class AVMRemoteImpl implements AVMRemote
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#purgeAVMStore(java.lang.String)
*/
public void purgeAVMStore(String name)
public void purgeStore(String name)
{
fTransport.purgeAVMStore(ClientTicketHolder.GetTicket(), name);
fTransport.purgeStore(ClientTicketHolder.GetTicket(), name);
}
/* (non-Javadoc)

2
source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
View File

@@ -782,7 +782,7 @@ public class WorkflowInterpreter
AVMNodeDescriptor packagesDesc = avmService.lookup(-1, packagesPath);
if (packagesDesc == null)
{
avmService.createAVMStore("workflow-system");
avmService.createStore("workflow-system");
avmService.createDirectory("workflow-system:/", "packages");
}

31
source/java/org/alfresco/service/cmr/avm/AVMService.java
View File

@@ -86,7 +86,7 @@ public interface AVMService
* @throws AVMNotFoundException
* @throws AVMWrongTypeException
*/
public ContentWriter createContentWriter(String path);
public ContentWriter getContentWriter(String path);
/**
* Get a listing of a Folder by name.
@@ -277,7 +277,7 @@ public interface AVMService
* @param name The name to give the AVMStore.
* @throws AVMExistsException
*/
public void createAVMStore(String name);
public void createStore(String name);
/**
* Create a branch from a given version and path. As a side effect
@@ -350,7 +350,7 @@ public interface AVMService
* @throws AVMNotFoundException
* @throws AVMWrongTypeException
*/
public void flatten(String dirPath, String name);
public void makeTransparent(String dirPath, String name);
/**
* Gets the id that the next snapshotted version of a store
@@ -369,17 +369,6 @@ public interface AVMService
*/
public int getLatestSnapshotID(String storeName);
/**
* Snapshot the given AVMStores. When this is called everything that has been added,
* deleted, or modified since the last time this function was called, is marked
* as needing to be copied, so that further modifications will trigger copy on write
* semantics.
* @param stores The names of the AVMStores to snapshot.
* @return A List of the version ids of the newly created snapshots.
* @throws AVMNotFoundException If any of the stores do not exist.
*/
// public List<Integer> createSnapshot(List<String> stores);
/**
* Snapshot the given AVMStore.
* @param store The name of the AVMStore to snapshot.
@@ -397,7 +386,7 @@ public interface AVMService
* @return A Set of version descriptors.
* @throws AVMNotFoundException
*/
public List<VersionDescriptor> getAVMStoreVersions(String name);
public List<VersionDescriptor> getStoreVersions(String name);
/**
* Get AVMStore version descriptors by creation date. Either from or
@@ -410,13 +399,13 @@ public interface AVMService
* @return The Set of version descriptors that match.
* @throws AVMNotFoundException
*/
public List<VersionDescriptor> getAVMStoreVersions(String name, Date from, Date to);
public List<VersionDescriptor> getStoreVersions(String name, Date from, Date to);
/**
* Get the descriptors of all AVMStores.
* @return A List of all AVMStores.
*/
public List<AVMStoreDescriptor> getAVMStores();
public List<AVMStoreDescriptor> getStores();
/**
* Get (and create if necessary) the system store. This store houses things
@@ -424,14 +413,14 @@ public interface AVMService
* It isn't used internally at this time but may be in the future.
* @return The descriptor.
*/
public AVMStoreDescriptor getAVMSystemStore();
public AVMStoreDescriptor getSystemStore();
/**
* Get a descriptor for an AVMStore.
* @param name The AVMStore's name.
* @return A Descriptor, or null if not foun.
*/
public AVMStoreDescriptor getAVMStore(String name);
public AVMStoreDescriptor getStore(String name);
/**
* Get the specified root of an AVMStore.
@@ -440,7 +429,7 @@ public interface AVMService
* @return A descriptor for the specified root.
* @throws AVMNotFoundException
*/
public AVMNodeDescriptor getAVMStoreRoot(int version, String name);
public AVMNodeDescriptor getStoreRoot(int version, String name);
/**
* Lookup a node by version ids and path.
@@ -524,7 +513,7 @@ public interface AVMService
* @param name The name of the AVMStore.
* @throws AVMNotFoundException
*/
public void purgeAVMStore(String name);
public void purgeStore(String name);
/**
* Purge a version from an AVMStore. Deletes everything that lives in

18
source/java/org/alfresco/service/cmr/remote/AVMRemote.java
View File

@@ -136,7 +136,7 @@ public interface AVMRemote
* Create a new AVMStore.
* @param name The name to give the new store.
*/
public void createAVMStore(String name);
public void createStore(String name);
/**
* Create a new branch.
@@ -171,11 +171,11 @@ public interface AVMRemote
public void uncover(String dirPath, String name);
/**
* Get the latest version id of the given AVMStore.
* Get the next version id of the given AVMStore.
* @param storeName The name of the AVMStore.
* @return The latest version id.
*/
public int getLatestVersionID(String storeName);
public int getNextVersionID(String storeName);
/**
* Get the id of the latest extant snpashot.
@@ -196,7 +196,7 @@ public interface AVMRemote
* @param name The name of the store.
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String name);
public List<VersionDescriptor> getStoreVersions(String name);
/**
* Get AVMStore versions between given dates.
@@ -205,20 +205,20 @@ public interface AVMRemote
* @param to The date to which (inclusive).
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String name, Date from, Date to);
public List<VersionDescriptor> getStoreVersions(String name, Date from, Date to);
/**
* Get a list of all AVM stores.
* @return A List of AVMStoreDescriptors.
*/
public List<AVMStoreDescriptor> getAVMStores();
public List<AVMStoreDescriptor> getStores();
/**
* Get the descriptor for a given AVMStore.
* @param name The name of the store.
* @return An AVMStoreDescriptor.
*/
public AVMStoreDescriptor getAVMStore(String name);
public AVMStoreDescriptor getStore(String name);
/**
* Get the specified root of the specified store.
@@ -226,7 +226,7 @@ public interface AVMRemote
* @param name The name of the store.
* @return The AVMNodeDescriptor for the root.
*/
public AVMNodeDescriptor getAVMStoreRoot(int version, String name);
public AVMNodeDescriptor getStoreRoot(int version, String name);
/**
* Get a descriptor for the specified node.
@@ -256,7 +256,7 @@ public interface AVMRemote
* Purge an AVMStore.
* @param name The name of the store to purge.
*/
public void purgeAVMStore(String name);
public void purgeStore(String name);
/**
* Purge a given version from a given store.

16
source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
View File

@@ -154,7 +154,7 @@ public interface AVMRemoteTransport
* Create a new AVMStore.
* @param name The name to give the new store.
*/
public void createAVMStore(String ticket, String name);
public void createStore(String ticket, String name);
/**
* Create a new branch.
@@ -193,7 +193,7 @@ public interface AVMRemoteTransport
* @param storeName The name of the AVMStore.
* @return The latest version id.
*/
public int getLatestVersionID(String ticket, String storeName);
public int getNextVersionID(String ticket, String storeName);
/**
* Get the id of the latest extant snpashot.
@@ -214,7 +214,7 @@ public interface AVMRemoteTransport
* @param name The name of the store.
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String ticket, String name);
public List<VersionDescriptor> getStoreVersions(String ticket, String name);
/**
* Get AVMStore versions between given dates.
@@ -223,20 +223,20 @@ public interface AVMRemoteTransport
* @param to The date to which (inclusive).
* @return A List of VersionDescriptors.
*/
public List<VersionDescriptor> getAVMStoreVersions(String ticket, String name, Date from, Date to);
public List<VersionDescriptor> getStoreVersions(String ticket, String name, Date from, Date to);
/**
* Get a list of all AVM stores.
* @return A List of AVMStoreDescriptors.
*/
public List<AVMStoreDescriptor> getAVMStores(String ticket);
public List<AVMStoreDescriptor> getStores(String ticket);
/**
* Get the descriptor for a given AVMStore.
* @param name The name of the store.
* @return An AVMStoreDescriptor.
*/
public AVMStoreDescriptor getAVMStore(String ticket, String name);
public AVMStoreDescriptor getStore(String ticket, String name);
/**
* Get the specified root of the specified store.
@@ -244,7 +244,7 @@ public interface AVMRemoteTransport
* @param name The name of the store.
* @return The AVMNodeDescriptor for the root.
*/
public AVMNodeDescriptor getAVMStoreRoot(String ticket, int version, String name);
public AVMNodeDescriptor getStoreRoot(String ticket, int version, String name);
/**
* Get a descriptor for the specified node.
@@ -274,7 +274,7 @@ public interface AVMRemoteTransport
* Purge an AVMStore.
* @param name The name of the store to purge.
*/
public void purgeAVMStore(String ticket, String name);
public void purgeStore(String ticket, String name);
/**
* Purge a given version from a given store.