mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.2 to HEAD
7575: Permission changes for AVM. 7577: Incorporated most of the feedback provided by Kevin C earlier today 7578: Removed directory not removed by patch 7579: EmailServer bug fixes AR-1902: Double posts when emailing to a document AR-1904: Attachments via email should be allowed on forum posts AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments 7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,216 +1,225 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing" */
|
||||
|
||||
package org.alfresco.repo.avm;
|
||||
|
||||
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
|
||||
|
||||
/**
|
||||
* Place holder for a deleted node.
|
||||
* @author britt
|
||||
*/
|
||||
public class DeletedNodeImpl extends AVMNodeImpl implements DeletedNode
|
||||
{
|
||||
private static final long serialVersionUID = 7283526790174482993L;
|
||||
|
||||
/**
|
||||
* The type of node that this is a deleted node for.
|
||||
*/
|
||||
private int fDeletedType;
|
||||
|
||||
/**
|
||||
* For Hibernate's use.
|
||||
*/
|
||||
protected DeletedNodeImpl()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new one from scratch.
|
||||
* @param id The node id.
|
||||
* @param store The store it's being created in.
|
||||
*/
|
||||
public DeletedNodeImpl(long id,
|
||||
AVMStore store)
|
||||
{
|
||||
super(id, store);
|
||||
}
|
||||
|
||||
public DeletedNodeImpl(DeletedNode other,
|
||||
AVMStore store)
|
||||
{
|
||||
super(store.getAVMRepository().issueID(), store);
|
||||
AVMDAOs.Instance().fAVMNodeDAO.save(this);
|
||||
AVMDAOs.Instance().fAVMNodeDAO.flush();
|
||||
copyProperties(other);
|
||||
copyAspects(other);
|
||||
copyACLs(other);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter.
|
||||
*/
|
||||
public void setDeletedType(int type)
|
||||
{
|
||||
fDeletedType = type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter.
|
||||
*/
|
||||
public int getDeletedType()
|
||||
{
|
||||
return fDeletedType;
|
||||
}
|
||||
|
||||
// TODO What happens when this is called? Does it muck anything up.
|
||||
/**
|
||||
* This is only called rarely.
|
||||
*/
|
||||
public AVMNode copy(Lookup lPath)
|
||||
{
|
||||
AVMNode newMe = new DeletedNodeImpl(this, lPath.getAVMStore());
|
||||
newMe.setAncestor(this);
|
||||
return newMe;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptor.
|
||||
* @param lPath The Lookup to this node's parent.
|
||||
* @param name The name of this node.
|
||||
* @return An AVMNodeDescriptor
|
||||
*/
|
||||
public AVMNodeDescriptor getDescriptor(Lookup lPath, String name)
|
||||
{
|
||||
BasicAttributes attrs = getBasicAttributes();
|
||||
String path = lPath.getRepresentedPath();
|
||||
if (path.endsWith("/"))
|
||||
{
|
||||
path = path + name;
|
||||
}
|
||||
else
|
||||
{
|
||||
path = path + "/" + name;
|
||||
}
|
||||
return new AVMNodeDescriptor(path,
|
||||
name,
|
||||
AVMNodeType.DELETED_NODE,
|
||||
attrs.getCreator(),
|
||||
attrs.getOwner(),
|
||||
attrs.getLastModifier(),
|
||||
attrs.getCreateDate(),
|
||||
attrs.getModDate(),
|
||||
attrs.getAccessDate(),
|
||||
getId(),
|
||||
getGuid(),
|
||||
getVersionID(),
|
||||
null,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
fDeletedType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptor.
|
||||
* @param lPath The full Lookup to this.
|
||||
* @return An AVMNodeDescriptor.
|
||||
*/
|
||||
public AVMNodeDescriptor getDescriptor(Lookup lPath)
|
||||
{
|
||||
BasicAttributes attrs = getBasicAttributes();
|
||||
String path = lPath.getRepresentedPath();
|
||||
return new AVMNodeDescriptor(path,
|
||||
path.substring(path.lastIndexOf("/") + 1),
|
||||
AVMNodeType.DELETED_NODE,
|
||||
attrs.getCreator(),
|
||||
attrs.getOwner(),
|
||||
attrs.getLastModifier(),
|
||||
attrs.getCreateDate(),
|
||||
attrs.getModDate(),
|
||||
attrs.getAccessDate(),
|
||||
getId(),
|
||||
getGuid(),
|
||||
getVersionID(),
|
||||
null,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
fDeletedType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptor.
|
||||
* @param parentPath
|
||||
* @param name
|
||||
* @param parentIndirection Ignored.
|
||||
* @return An AVMNodeDescriptor.
|
||||
*/
|
||||
public AVMNodeDescriptor getDescriptor(String parentPath, String name, String parentIndirection, int parentIndirectionVersion)
|
||||
{
|
||||
BasicAttributes attrs = getBasicAttributes();
|
||||
String path = parentPath.endsWith("/") ? parentPath + name : parentPath + "/" + name;
|
||||
return new AVMNodeDescriptor(path,
|
||||
name,
|
||||
AVMNodeType.DELETED_NODE,
|
||||
attrs.getCreator(),
|
||||
attrs.getOwner(),
|
||||
attrs.getLastModifier(),
|
||||
attrs.getCreateDate(),
|
||||
attrs.getModDate(),
|
||||
attrs.getAccessDate(),
|
||||
getId(),
|
||||
getGuid(),
|
||||
getVersionID(),
|
||||
null,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
fDeletedType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the type of this node.
|
||||
* @return The AVMNodeType of this.
|
||||
*/
|
||||
public int getType()
|
||||
{
|
||||
return AVMNodeType.DELETED_NODE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptive string representation.
|
||||
* @param lPath The lookup we've been found through.
|
||||
* @return A String representation.
|
||||
*/
|
||||
public String toString(Lookup lPath)
|
||||
{
|
||||
return "[DN:" + getId() + "]";
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing" */
|
||||
|
||||
package org.alfresco.repo.avm;
|
||||
|
||||
import org.alfresco.repo.domain.DbAccessControlList;
|
||||
import org.alfresco.repo.security.permissions.ACLCopyMode;
|
||||
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
|
||||
|
||||
/**
|
||||
* Place holder for a deleted node.
|
||||
* @author britt
|
||||
*/
|
||||
public class DeletedNodeImpl extends AVMNodeImpl implements DeletedNode
|
||||
{
|
||||
private static final long serialVersionUID = 7283526790174482993L;
|
||||
|
||||
/**
|
||||
* The type of node that this is a deleted node for.
|
||||
*/
|
||||
private int fDeletedType;
|
||||
|
||||
/**
|
||||
* For Hibernate's use.
|
||||
*/
|
||||
protected DeletedNodeImpl()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new one from scratch.
|
||||
* @param id The node id.
|
||||
* @param store The store it's being created in.
|
||||
*/
|
||||
public DeletedNodeImpl(long id,
|
||||
AVMStore store, DbAccessControlList acl)
|
||||
{
|
||||
super(id, store);
|
||||
this.setAcl(acl);
|
||||
}
|
||||
|
||||
public DeletedNodeImpl(DeletedNode other,
|
||||
AVMStore store, Long parentAcl, ACLCopyMode mode)
|
||||
{
|
||||
super(store.getAVMRepository().issueID(), store);
|
||||
AVMDAOs.Instance().fAVMNodeDAO.save(this);
|
||||
AVMDAOs.Instance().fAVMNodeDAO.flush();
|
||||
copyProperties(other);
|
||||
copyAspects(other);
|
||||
copyACLs(other, parentAcl, mode);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter.
|
||||
*/
|
||||
public void setDeletedType(int type)
|
||||
{
|
||||
fDeletedType = type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter.
|
||||
*/
|
||||
public int getDeletedType()
|
||||
{
|
||||
return fDeletedType;
|
||||
}
|
||||
|
||||
// TODO What happens when this is called? Does it muck anything up.
|
||||
/**
|
||||
* This is only called rarely.
|
||||
*/
|
||||
public AVMNode copy(Lookup lPath)
|
||||
{
|
||||
DirectoryNode dir = lPath.getCurrentNodeDirectory();
|
||||
Long parentAclId = null;
|
||||
if((dir != null) && (dir.getAcl() != null))
|
||||
{
|
||||
parentAclId = dir.getAcl().getId();
|
||||
}
|
||||
AVMNode newMe = new DeletedNodeImpl(this, lPath.getAVMStore(), parentAclId, ACLCopyMode.COPY);
|
||||
newMe.setAncestor(this);
|
||||
return newMe;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptor.
|
||||
* @param lPath The Lookup to this node's parent.
|
||||
* @param name The name of this node.
|
||||
* @return An AVMNodeDescriptor
|
||||
*/
|
||||
public AVMNodeDescriptor getDescriptor(Lookup lPath, String name)
|
||||
{
|
||||
BasicAttributes attrs = getBasicAttributes();
|
||||
String path = lPath.getRepresentedPath();
|
||||
if (path.endsWith("/"))
|
||||
{
|
||||
path = path + name;
|
||||
}
|
||||
else
|
||||
{
|
||||
path = path + "/" + name;
|
||||
}
|
||||
return new AVMNodeDescriptor(path,
|
||||
name,
|
||||
AVMNodeType.DELETED_NODE,
|
||||
attrs.getCreator(),
|
||||
attrs.getOwner(),
|
||||
attrs.getLastModifier(),
|
||||
attrs.getCreateDate(),
|
||||
attrs.getModDate(),
|
||||
attrs.getAccessDate(),
|
||||
getId(),
|
||||
getGuid(),
|
||||
getVersionID(),
|
||||
null,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
fDeletedType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptor.
|
||||
* @param lPath The full Lookup to this.
|
||||
* @return An AVMNodeDescriptor.
|
||||
*/
|
||||
public AVMNodeDescriptor getDescriptor(Lookup lPath)
|
||||
{
|
||||
BasicAttributes attrs = getBasicAttributes();
|
||||
String path = lPath.getRepresentedPath();
|
||||
return new AVMNodeDescriptor(path,
|
||||
path.substring(path.lastIndexOf("/") + 1),
|
||||
AVMNodeType.DELETED_NODE,
|
||||
attrs.getCreator(),
|
||||
attrs.getOwner(),
|
||||
attrs.getLastModifier(),
|
||||
attrs.getCreateDate(),
|
||||
attrs.getModDate(),
|
||||
attrs.getAccessDate(),
|
||||
getId(),
|
||||
getGuid(),
|
||||
getVersionID(),
|
||||
null,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
fDeletedType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptor.
|
||||
* @param parentPath
|
||||
* @param name
|
||||
* @param parentIndirection Ignored.
|
||||
* @return An AVMNodeDescriptor.
|
||||
*/
|
||||
public AVMNodeDescriptor getDescriptor(String parentPath, String name, String parentIndirection, int parentIndirectionVersion)
|
||||
{
|
||||
BasicAttributes attrs = getBasicAttributes();
|
||||
String path = parentPath.endsWith("/") ? parentPath + name : parentPath + "/" + name;
|
||||
return new AVMNodeDescriptor(path,
|
||||
name,
|
||||
AVMNodeType.DELETED_NODE,
|
||||
attrs.getCreator(),
|
||||
attrs.getOwner(),
|
||||
attrs.getLastModifier(),
|
||||
attrs.getCreateDate(),
|
||||
attrs.getModDate(),
|
||||
attrs.getAccessDate(),
|
||||
getId(),
|
||||
getGuid(),
|
||||
getVersionID(),
|
||||
null,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
false,
|
||||
-1,
|
||||
fDeletedType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the type of this node.
|
||||
* @return The AVMNodeType of this.
|
||||
*/
|
||||
public int getType()
|
||||
{
|
||||
return AVMNodeType.DELETED_NODE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a descriptive string representation.
|
||||
* @param lPath The lookup we've been found through.
|
||||
* @return A String representation.
|
||||
*/
|
||||
public String toString(Lookup lPath)
|
||||
{
|
||||
return "[DN:" + getId() + "]";
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user