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

Slightly less broken RepoLs. Checkpoint. Also gave Pair a reasonable toString method.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-04 13:43:44 +00:00
parent dcc831b2a3
commit 07b18358ae
6 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/remote/RepoRemoteImpl.java
View File

@@ -10,6 +10,8 @@ import java.util.Map;
import org.alfresco.service.cmr.remote.RepoRemote;
import org.alfresco.service.cmr.remote.RepoRemoteTransport;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
/**
* Client side implementation of RepoRemote interface.
@@ -57,7 +59,7 @@ public class RepoRemoteImpl implements RepoRemote
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.RepoRemote#getListing(org.alfresco.service.cmr.repository.NodeRef)
*/
public Map<String, NodeRef> getListing(NodeRef dir)
public Map<String, Pair<NodeRef, QName>> getListing(NodeRef dir)
{
return fTransport.getListing(ClientTicketHolder.GetTicket(), dir);
}

47
source/java/org/alfresco/repo/remote/RepoRemoteService.java
View File

@@ -12,6 +12,7 @@ import java.util.TreeMap;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
@@ -22,6 +23,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.apache.log4j.Logger;
@@ -124,13 +126,22 @@ public class RepoRemoteService implements RepoRemote
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.RepoRemote#getListing(org.alfresco.service.cmr.repository.NodeRef)
*/
public Map<String, NodeRef> getListing(NodeRef dir)
public Map<String, Pair<NodeRef, QName>> getListing(NodeRef dir)
{
List<FileInfo> list = fFileFolderService.listFiles(dir);
Map<String, NodeRef> result = new TreeMap<String, NodeRef>();
for (FileInfo info : list)
List<ChildAssociationRef> listing = fNodeService.getChildAssocs(dir);
Map<String, Pair<NodeRef, QName>> result = new TreeMap<String, Pair<NodeRef, QName>>();
for (ChildAssociationRef child : listing)
{
result.put(info.getName(), info.getNodeRef());
fgLogger.error(child.getQName());
NodeRef childRef = child.getChildRef();
QName type = fNodeService.getType(childRef);
if (type.equals(ContentModel.TYPE_CONTENT) ||
type.equals(ContentModel.TYPE_FOLDER))
{
result.put(child.getQName().getLocalName(),
new Pair<NodeRef, QName>(child.getChildRef(),
type));
}
}
return result;
}
@@ -159,19 +170,23 @@ public class RepoRemoteService implements RepoRemote
public NodeRef lookup(NodeRef base, String path)
{
List<String> pathList = splitPath(path);
if (pathList.size() == 1)
NodeRef curr = base;
for (String name : pathList)
{
return fNodeService.getChildByName(base, ContentModel.ASSOC_CONTAINS, pathList.get(0));
}
try
{
FileInfo info = fFileFolderService.resolveNamePath(base, pathList);
return info.getNodeRef();
}
catch (FileNotFoundException e)
{
return null;
fgLogger.error(name);
NodeRef next = fNodeService.getChildByName(curr, ContentModel.ASSOC_CONTAINS, name);
if (next == null)
{
fgLogger.error("Wasn't a contains.");
next = fNodeService.getChildByName(curr, ContentModel.ASSOC_CHILDREN, name);
if (next == null)
{
return null;
}
}
curr = next;
}
return curr;
}
/* (non-Javadoc)

4
source/java/org/alfresco/repo/remote/RepoRemoteTransportService.java
View File

@@ -16,7 +16,9 @@ import org.alfresco.service.cmr.remote.RepoRemote;
import org.alfresco.service.cmr.remote.RepoRemoteTransport;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
/**
* The server side implementation of RepoRemoteTransport. It
@@ -291,7 +293,7 @@ public class RepoRemoteTransportService implements RepoRemoteTransport,
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#getListing(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
*/
public Map<String, NodeRef> getListing(String ticket, NodeRef dir)
public Map<String, Pair<NodeRef, QName>> getListing(String ticket, NodeRef dir)
{
fAuthService.validate(ticket);
return fRepoRemote.getListing(dir);