ALF-2031 - DR and VT can't start

- undeleted and reinstated use of org.alfresco.util.Pair
   - undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
   - undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-03-16 15:05:47 +00:00
parent f4db988d1b
commit 03d130e99c
155 changed files with 154 additions and 160 deletions

View File

@@ -523,7 +523,7 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
private AccessStatus doAvmCan(NodeRef nodeRef, PermissionReference permission)
{
org.springframework.extensions.surf.util.Pair<Integer, String> avmVersionPath = AVMNodeConverter.ToAVMVersionPath(nodeRef);
org.alfresco.util.Pair<Integer, String> avmVersionPath = AVMNodeConverter.ToAVMVersionPath(nodeRef);
int version = avmVersionPath.getFirst();
String path = avmVersionPath.getSecond();
boolean result = AVMRepository.GetInstance().can(nodeRef.getStoreRef().getIdentifier(), version, path, permission.getName());