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

Merged V2.2 to HEAD

Browse Source 
7452: Fixes submit breakage.
   7456: Patch to redeploy new submission workflow definition
   7457: Added 'View Deployment' action to workflow sandbox so reviewers can examine the last attempted deployment
         Added 'Allocated' field to server config, tooltip shows which store the test server is allocated to


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-02-22 15:04:42 +00:00
parent d175db706e
commit 3fd94a9f7f
8 changed files with 460 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/avm/AVMRepository.java
View File

@@ -50,6 +50,8 @@ import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avm.AVMWrongTypeException;
import org.alfresco.service.cmr.avm.LayeringDescriptor;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -59,9 +61,6 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/**
* This or AVMStore are
@@ -117,7 +116,7 @@ public class AVMRepository
private PermissionService fPermissionService;
private ApplicationContext fContext;
private DictionaryService fDictionaryService;
// A bunch of TransactionListeners that do work for this.
@@ -240,6 +239,11 @@ public class AVMRepository
fPermissionService = service;
}
public void setDictionaryService(DictionaryService service)
{
fDictionaryService = service;
}
/**
* Create a file.
* @param path The path to the containing directory.
@@ -2881,7 +2885,12 @@ public class AVMRepository
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(5);
for (Map.Entry<QName, PropertyValue> entry : props.entrySet())
{
properties.put(entry.getKey(), entry.getValue().getValue(entry.getKey()));
PropertyDefinition def = fDictionaryService.getProperty(entry.getKey());
if (def == null)
{
continue;
}
properties.put(entry.getKey(), entry.getValue().getValue(def.getDataType().getName()));
}
context.put(PermissionService.PROPERTIES, properties);
// TODO put node type in there to.