Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4159 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4160 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4164 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4166 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4176 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4178 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4179 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4181 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 11:21:44 +00:00
parent 0a9d29f168
commit bcddf8ba23
3 changed files with 189 additions and 13 deletions

View File

@@ -578,18 +578,14 @@ public class RepositoryWebService extends AbstractWebService implements
// create the web service ClassDefinition type from the data dictionary TypeDefinition
ClassDefinition typeDef = Utils.setupClassDefObject(ddTypeDef);
// create the web service ClassDefinition types to represent the aspects
ClassDefinition[] aspectDefs = null;
List<AspectDefinition> aspects = ddTypeDef.getDefaultAspects();
if (aspects != null)
Set<QName> aspectsQNames = this.nodeService.getAspects(nodeRef);
ClassDefinition[] aspectDefs = new ClassDefinition[aspectsQNames.size()];
int pos = 0;
for (QName aspectQName : aspectsQNames)
{
aspectDefs = new ClassDefinition[aspects.size()];
int pos = 0;
for (AspectDefinition ddAspectDef : aspects)
{
aspectDefs[pos] = Utils.setupClassDefObject(ddAspectDef);
pos++;
}
AspectDefinition aspectDef = this.dictionaryService.getAspect(aspectQName);
aspectDefs[pos] = Utils.setupClassDefObject(aspectDef);
pos++;
}
return new NodeDefinition(typeDef, aspectDefs);