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

78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:01:49 +00:00
parent b2d7a39178
commit 0546224e23
78 changed files with 2 additions and 2627 deletions

View File

@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -97,7 +96,6 @@ public class NodeBrowserScript extends DeclarativeWebScript
transient private NamespaceService namespaceService;
transient private PermissionService permissionService;
transient private OwnableService ownableService;
transient private AVMService avmService;
/**
* @param transactionService transaction service
@@ -187,19 +185,6 @@ public class NodeBrowserScript extends DeclarativeWebScript
return ownableService;
}
/**
* @param avmService AVM service
*/
public void setAVMService(AVMService avmService)
{
this.avmService = avmService;
}
private AVMService getAVMService()
{
return avmService;
}
/**
* Gets the list of repository stores
*
@@ -354,22 +339,8 @@ public class NodeBrowserScript extends DeclarativeWebScript
*/
public List<Permission> getStorePermissionMasks(NodeRef nodeRef)
{
List<Permission> permissionMasks = null;
if (nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
{
permissionMasks = new ArrayList<Permission>();
for (Iterator<AccessPermission> iterator = getPermissionService().getAllSetPermissions(nodeRef.getStoreRef()).iterator(); iterator
.hasNext();)
{
AccessPermission ap = iterator.next();
permissionMasks.add(new Permission(ap.getPermission(), ap.getAuthority(), ap.getAccessStatus().toString()));
}
}
else
{
permissionMasks = new ArrayList<Permission>(1);
permissionMasks.add(new NoStoreMask());
}
List<Permission> permissionMasks = new ArrayList<Permission>(1);
permissionMasks.add(new NoStoreMask());
return permissionMasks;
}
@@ -437,39 +408,6 @@ public class NodeBrowserScript extends DeclarativeWebScript
return assocs;
}
public boolean getInAVMStore(NodeRef nodeRef)
{
return nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM);
}
public List<Map<String, String>> getAVMStoreProperties(NodeRef nodeRef)
{
List<Map<String, String>> 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 = storeProperties;
return avmStoreProps;
}
/**
* Action to submit search
*