inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rejiggering of wiring to allow CIFS not to go through the lockin layer.

Browse Source 
AVMNodeService doesn't point at AVMLockingAwareService.
Web Client now points at AVMLockingAwareService.
Forced a couple of places in the Web Client that were going through NodeService
to use AVMLockingAwareService to get proper locking behavior.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-07-12 16:26:02 +00:00
parent 7a02ff8a4d
commit c86d38b820
5 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java
View File

@@ -26,6 +26,7 @@ package org.alfresco.web.bean.wcm;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -33,6 +34,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -156,8 +158,14 @@ public class EditFilePropertiesDialog extends EditContentPropertiesDialog
repoProps.put(qname, propValue);
}
// Translate to what AVMService wants to take.
Map<QName, PropertyValue> avmProps = new HashMap<QName, PropertyValue>();
for (Map.Entry<QName, Serializable> entry : repoProps.entrySet())
{
avmProps.put(entry.getKey(), new PropertyValue(entry.getKey(), entry.getValue()));
}
// send the properties back to the repository
this.nodeService.setProperties(nodeRef, repoProps);
this.avmService.setNodeProperties(AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond(), avmProps);
// perform the rename last as for an AVM it changes the NodeRef
if (name != null)

13
source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java
View File

@@ -28,6 +28,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -37,6 +38,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -141,9 +143,16 @@ public class EditFolderPropertiesDialog extends EditSpaceDialog
repoProps.put(qname, propValue);
}
// Translate to what AVMService wants to take.
Map<QName, PropertyValue> avmProps = new HashMap<QName, PropertyValue>();
for (Map.Entry<QName, Serializable> entry : repoProps.entrySet())
{
avmProps.put(entry.getKey(), new PropertyValue(entry.getKey(), entry.getValue()));
}
// send the properties back to the repository
this.nodeService.setProperties(nodeRef, repoProps);
this.avmService.setNodeProperties(AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond(), avmProps);
// perform the rename last as for an AVM it changes the NodeRef
if (name != null)

2
source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
View File

@@ -564,7 +564,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent
private AVMService getAVMService(FacesContext fc)
{
return (AVMService)FacesContextUtils.getRequiredWebApplicationContext(fc).getBean("AVMService");
return (AVMService)FacesContextUtils.getRequiredWebApplicationContext(fc).getBean("AVMLockingAwareService");
}

2
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -1132,7 +1132,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
private AVMService getAVMService(FacesContext fc)
{
return (AVMService)FacesContextUtils.getRequiredWebApplicationContext(fc).getBean("AVMService");
return (AVMService)FacesContextUtils.getRequiredWebApplicationContext(fc).getBean("AVMLockingAwareService");
}
private NodeService getNodeService(FacesContext fc)

62
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -1968,7 +1968,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -2017,7 +2017,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -2074,7 +2074,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -2538,7 +2538,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -2632,7 +2632,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>workflowService</property-name>
@@ -2677,7 +2677,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>workflowService</property-name>
@@ -2710,7 +2710,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2776,7 +2776,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -2838,7 +2838,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -2863,7 +2863,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2880,7 +2880,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2897,7 +2897,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2914,7 +2914,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2931,7 +2931,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2948,7 +2948,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmLockingService</property-name>
@@ -2973,7 +2973,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -2994,7 +2994,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -3027,7 +3027,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -3048,7 +3048,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -3073,7 +3073,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -3094,7 +3094,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>fileFolderService</property-name>
@@ -3123,7 +3123,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>fileFolderService</property-name>
@@ -3148,7 +3148,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>navigator</property-name>
@@ -3177,7 +3177,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>createWebsiteWizard</property-name>
@@ -3198,7 +3198,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>createWebsiteWizard</property-name>
@@ -3232,7 +3232,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>createWebsiteWizard</property-name>
@@ -3253,7 +3253,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>createWebsiteWizard</property-name>
@@ -3287,7 +3287,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmSyncService</property-name>
@@ -3459,7 +3459,7 @@
</managed-property>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
</managed-bean>
@@ -3834,7 +3834,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>
@@ -3855,7 +3855,7 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>avmService</property-name>
<value>#{AVMService}</value>
<value>#{AVMLockingAwareService}</value>
</managed-property>
<managed-property>
<property-name>avmBrowseBean</property-name>