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

Fixed two tests that now need to authenticate. Added 'statstore, storename'

Browse Source 
command to avm.jsp doohickey.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-12 19:56:52 +00:00
parent 39a18df7f2
commit d5294a4879
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,11 +29,13 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.avm.util.BulkLoader;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor; import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avm.VersionDescriptor; import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.context.support.FileSystemXmlApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext;
@@ -50,11 +52,6 @@ public class AVMInterpreter
*/ */
private AVMService fService; private AVMService fService;
/**
* The Node service.
*/
private NodeService fNodeService;
/** /**
* The reader for interaction. * The reader for interaction.
*/ */
@@ -104,11 +101,6 @@ public class AVMInterpreter
fLoader = loader; fLoader = loader;
} }
public void setNodeService(NodeService service)
{
fNodeService = service;
}
/** /**
* A Read-Eval-Print loop. * A Read-Eval-Print loop.
*/ */
@@ -429,6 +421,21 @@ public class AVMInterpreter
AVMNodeDescriptor ca = fService.getCommonAncestor(left, right); AVMNodeDescriptor ca = fService.getCommonAncestor(left, right);
out.println(ca); out.println(ca);
} }
else if (command[0].equals("statstore"))
{
if (command.length != 2)
{
return "Syntax Error.";
}
AVMStoreDescriptor desc = fService.getAVMStore(command[1]);
out.println(desc);
Map<QName, PropertyValue> props =
fService.getStoreProperties(command[1]);
for (QName name : props.keySet())
{
out.println(name + ": " + props.get(name));
}
}
else else
{ {
return "Syntax Error."; return "Syntax Error.";

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

@@ -33,6 +33,7 @@ import java.util.TreeMap;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.avm.util.BulkLoader;
import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.service.cmr.avm.AVMException; import org.alfresco.service.cmr.avm.AVMException;
import org.alfresco.service.cmr.avm.AVMExistsException; import org.alfresco.service.cmr.avm.AVMExistsException;
@@ -2276,6 +2277,8 @@ public class AVMServiceTest extends AVMServiceTestBase
{ {
setupBasicTree(); setupBasicTree();
PermissionService perm = (PermissionService)fContext.getBean("PermissionService"); PermissionService perm = (PermissionService)fContext.getBean("PermissionService");
AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent");
ac.authenticate("admin", "admin".toCharArray());
perm.setPermission(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/foo"), perm.setPermission(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/foo"),
PermissionService.ADMINISTRATOR_AUTHORITY, PermissionService.ADMINISTRATOR_AUTHORITY,
PermissionService.ALL_PERMISSIONS, PermissionService.ALL_PERMISSIONS,
@@ -2306,6 +2309,8 @@ public class AVMServiceTest extends AVMServiceTestBase
{ {
setupBasicTree(); setupBasicTree();
FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService"); FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService");
AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent");
ac.authenticate("admin", "admin".toCharArray());
assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c"), assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c"),
"banana", ContentModel.TYPE_AVM_PLAIN_CONTENT) != null); "banana", ContentModel.TYPE_AVM_PLAIN_CONTENT) != null);
assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c"), assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c"),