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 V3.2 to HEAD

Browse Source 
16030: Merged V3.1 to V3.2
        16001: Merged V2.2 to V3.1
            15999: Temp build/test (AVM permissions - testSimpleInternalLayer)
    16223: WCM UI - simple perf improvement when displaying modified list (lock icon)
    16472: Merged V3.1 to V3.2
        16180: ETHREEOH-2821 - fix deployment of WCM layered (ie. across web project) file
        16188: WCM - minor: display (localisable) "File" text (follow-on fix for r15970)
        16255: WCM - ETHREEOH-2836
        16257: AVM - minor updates to unit tests
        16275: WCM - ETHREEOH-2844
        16277: WCM - ETHREEOH-2829 - added simple unit test
        16341: AVM - minor update to reuse core (path) utils
        16344: Merged V2.2 to V3.1
            16323: Fix ETWOTWO-1266 (unexpected AVM conflict)
        16457: Fix ETHREEOH-2836 (WCM layered files) - follow-on fix, with additional unit test
    16649: Fix ETHREEOH-1878 - configure WCM locking for CIFS/FTP
    16654: Merged V3.1 to V3.2
        16507: Fix ETHREEOH-2604 - update unsecured-public-services-security-context.xml.sample (to allow server to start)
        16527: Fix ETHREEOH-2868 - can't submit removal of WCM layered file (Older version prevents update)
        16607: AVM - additional tests when deleting LD + fix to avoid cycle
        16612: AVM - console improvement (lsver, rmvers) to enable admin/support to list & purge snapshots between dates
        16638: Fix ETHREEOH-2893 - stale WCM/AVM layered dir
        16643: AVM - console improvement (setopacity) -> eg. to set stale/modifed WCM layered folder as opaque


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-14 09:20:15 +00:00
parent 51e37ecf1a
commit e096d59076
30 changed files with 2414 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
source/java/org/alfresco/repo/avm/AVMNodeConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 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
@@ -23,6 +23,7 @@
package org.alfresco.repo.avm;
import org.alfresco.repo.avm.util.AVMUtil;
import org.alfresco.service.cmr.avm.AVMException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -37,7 +38,7 @@ import org.apache.commons.logging.LogFactory;
*/
public class AVMNodeConverter
{
private static Log fgLogger = LogFactory.getLog(AVMNodeConverter.class);
private static Log fgLogger = LogFactory.getLog(AVMNodeConverter.class);
/**
* Get a NodeRef corresponding to the given path and version.
@@ -47,12 +48,8 @@ public class AVMNodeConverter
*/
public static NodeRef ToNodeRef(int version, String avmPath)
{
String [] pathParts = avmPath.split(":");
if (pathParts.length != 2)
{
throw new AVMException("Malformed AVM Path: " + avmPath);
}
while (pathParts[1].endsWith("/") && pathParts[1].length() > 1)
String [] pathParts = AVMUtil.splitPath(avmPath);
while (pathParts[1].endsWith(AVMUtil.AVM_PATH_SEPARATOR) && pathParts[1].length() > 1)
{
pathParts[1] = pathParts[1].substring(0, pathParts[1].length() - 1);
}
@@ -81,8 +78,8 @@ public class AVMNodeConverter
{
StoreRef store = nodeRef.getStoreRef();
String translated = nodeRef.getId();
translated = translated.replace(';', '/');
int off = translated.indexOf("/");
translated = translated.replace(';', AVMUtil.AVM_PATH_SEPARATOR_CHAR);
int off = translated.indexOf(AVMUtil.AVM_PATH_SEPARATOR_CHAR);
if (off == -1)
{
fgLogger.error(translated);
@@ -90,9 +87,9 @@ public class AVMNodeConverter
}
int version = Integer.parseInt(translated.substring(0, off));
String path = translated.substring(off);
return new Pair<Integer, String>(version, store.getIdentifier() + ":" + path);
return new Pair<Integer, String>(version, AVMUtil.buildAVMPath(store.getIdentifier(), path));
}
/**
* Extend an already valid AVM path by one more component.
* @param path The starting AVM path.
@@ -101,57 +98,29 @@ public class AVMNodeConverter
*/
public static String ExtendAVMPath(String path, String name)
{
if (path.endsWith("/"))
{
return path + name;
}
else
{
return path + "/" + name;
}
return AVMUtil.extendAVMPath(path, name);
}
/**
* Split a path into its parent path and its base name.
* @param path The initial AVM path.
* @return An array of 2 Strings containing the parent path and the base
* name.
*/
public static String [] SplitBase(String path)
public static String[] SplitBase(String path)
{
path = path.replaceAll("/+", "/");
while (path.endsWith("/") && !path.endsWith(":/"))
{
path = path.substring(0, path.length() - 1);
}
if (path.endsWith(":/"))
{
return new String[] { null, "" };
}
int off = path.lastIndexOf("/");
if (off == -1)
{
throw new AVMException("Invalid Path: " + path);
}
String [] decomposed = new String[2];
decomposed[0] = path.substring(0, off);
if (decomposed[0].endsWith(":"))
{
decomposed[0] = decomposed[0] + "/";
}
decomposed[1] = path.substring(off + 1);
return decomposed;
return AVMUtil.splitBase(path);
}
/**
* Normalize an AVM path.
* @param path The incoming path.
* @return The normalized path.
*
* @deprecated see org.alfresco.repo.avm.util.AVMUtil.normalizePath
*/
public static String NormalizePath(String path)
{
path = path.replaceAll("/+", "/");
path = path.replaceAll("/$", "");
return path;
return AVMUtil.normalizePath(path);
}
}