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

10
source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
View File

@@ -450,15 +450,15 @@ public class AVMNodeDescriptor implements Serializable
switch (fType)
{
case AVMNodeType.PLAIN_FILE :
return "[PF:" + fID + ":" + fName + ": FILE]";
return "[PF:" + fID + ":" + fName + ", " + fVersionID + "]";
case AVMNodeType.PLAIN_DIRECTORY :
return "[PF:" + fID + ":" + fName + ": DIR]";
return "[PD:" + fID + ":" + fName + ", " + fVersionID + "]";
case AVMNodeType.LAYERED_FILE :
return "[LF:" + fID + ":" + fIndirection + "]";
return "[LF:" + fID + ":" + fIndirection + ", " + fVersionID + "]";
case AVMNodeType.LAYERED_DIRECTORY :
return "[LD:" + fID + ":" + fIndirection + "]";
return "[LD:" + fID + ":" + fIndirection + ", " + fVersionID + "]";
case AVMNodeType.DELETED_NODE :
return "[DN:" + fID + "]";
return "[DN:" + fID + ", " + fVersionID + "]";
default :
throw new AVMException("Internal Error.");
}

6
source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.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
@@ -26,6 +26,8 @@ package org.alfresco.service.cmr.avm;
import java.io.Serializable;
import java.util.Date;
import org.alfresco.util.ISO8601DateFormat;
/**
* A value class for Data about an AVMStore.
* @author britt
@@ -84,6 +86,6 @@ public class AVMStoreDescriptor implements Serializable
public String toString()
{
return "[" + fName + ":" + fCreator + ":" + new Date(fCreateDate) + "]";
return "[" + fName + ":" + fCreator + ":" + ISO8601DateFormat.format(new Date(fCreateDate)) + "]";
}
}

6
source/java/org/alfresco/service/cmr/avm/VersionDescriptor.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
@@ -26,6 +26,8 @@ package org.alfresco.service.cmr.avm;
import java.io.Serializable;
import java.util.Date;
import org.alfresco.util.ISO8601DateFormat;
/**
* All the information about a particular version.
* @author britt
@@ -150,7 +152,7 @@ public class VersionDescriptor implements Serializable
builder.append(":");
builder.append(fCreator);
builder.append(":");
builder.append(new Date(fCreateDate).toString());
builder.append(ISO8601DateFormat.format(new Date(fCreateDate)));
builder.append(":");
builder.append(fTag);
builder.append("]");