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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
View File

@@ -102,7 +102,6 @@ public class AdminNodeBrowseBean implements Serializable
transient private DataModel assocs = null;
transient private DataModel permissions = null;
transient private DataModel permissionMasks = null;
transient private DataModel avmStoreProps = null;
// supporting repository services
transient private TransactionService transactionService;
@@ -111,8 +110,6 @@ public class AdminNodeBrowseBean implements Serializable
transient private SearchService searchService;
transient private NamespaceService namespaceService;
transient private PermissionService permissionService;
// // WCM
// transient private AVMService avmService;
/**
* @param transactionService transaction service
@@ -216,24 +213,6 @@ public class AdminNodeBrowseBean implements Serializable
return permissionService;
}
// // WCM
// /**
// * @param avmService AVM service
// */
// public void setAVMService(AVMService avmService)
// {
// this.avmService = avmService;
// }
//
// private AVMService getAVMService()
// {
// if (avmService == null)
// {
// avmService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMService();
// }
// return avmService;
// }
//
/**
* Gets the list of repository stores
*
@@ -424,18 +403,9 @@ public class AdminNodeBrowseBean implements Serializable
{
if (permissionMasks == null)
{
// // WCM
// if (nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
// {
// List<AccessPermission> nodePermissions = new ArrayList<AccessPermission>(getPermissionService().getAllSetPermissions(nodeRef.getStoreRef()));
// permissionMasks = new ListDataModel(nodePermissions);
// }
// else
// {
List<NoStoreMask> noReadPermissions = new ArrayList<NoStoreMask>(1);
noReadPermissions.add(new NoStoreMask());
permissionMasks = new ListDataModel(noReadPermissions);
// }
List<NoStoreMask> noReadPermissions = new ArrayList<NoStoreMask>(1);
noReadPermissions.add(new NoStoreMask());
permissionMasks = new ListDataModel(noReadPermissions);
}
return permissionMasks;
}
@@ -476,43 +446,6 @@ public class AdminNodeBrowseBean implements Serializable
}
return assocs;
}
//
// // WCM
// public boolean getInAVMStore()
// {
// return nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM);
// }
//
// // WCM
// public DataModel getAVMStoreProperties()
// {
// if (avmStoreProps == null)
// {
// // work out the store name from current nodeRef
// String store = nodeRef.getStoreRef().getIdentifier();
// Map<QName, PropertyValue> props = getAVMService().getStoreProperties(store);
// List<Map<String, String>> storeProperties = new ArrayList<Map<String, String>>();
//
// for (Map.Entry<QName, PropertyValue> property : props.entrySet())
// {
// Map<String, String> map = new HashMap<String, String>(2);
// map.put("name", property.getKey().toString());
// map.put("type", property.getValue().getActualTypeString());
// String val = property.getValue().getStringValue();
// if (val == null)
// {
// val = "null";
// }
// map.put("value", val);
//
// storeProperties.add(map);
// }
//
// avmStoreProps = new ListDataModel(storeProperties);
// }
//
// return avmStoreProps;
// }
/**
* Gets the current query language
@@ -585,8 +518,6 @@ public class AdminNodeBrowseBean implements Serializable
NodeRef rootNode = getNodeService().getRootNode(storeRef);
setNodeRef(rootNode);
this.avmStoreProps = null;
return "success";
}