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.1 to HEAD

Browse Source 
12943: Port of support for ADB-47 from V2.1-A to 3.1
   12948: Port of tests from CHK-2235 for ADB-20 from V2.1-A to 3.1
   12965: Activated index tracker Quartz job by default
   12974: Port for lazy creation of home folders with configuration from V2.1-A to V3.1: original CHK-2619, CHK-2716
   12976: Merged V2.1A to V3.1
      8562: (record-only) Fix to lazily create home folders - DO NOT MERGE
      8694: (record-only) Added configuration for lazy or eager creation of home folders
   12978: Merged V3.0 to V3.1
      12920: Merged V2.2 to V3.0
         12456: Wire up AVM locking service by interface to allow for potential over-ride
         12457: Make AVM ChildKey case insensitive
         12470: Merged V2.2.1-NBC-FIXES to V2.2
            12156: Optimizations to WCMWorkflowEvaluator and WCMWorkflowDeletedEvaluator    
            12605: Hide annoying "Virtualisation Server not started" warnings (by making them debug)
         12707: AVM console - "snap" also allows tag and description to be specified
   12979: Build/test fix
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/DEV/V2.2.1-NBC-FIXES:r12156
      Merged /alfresco/BRANCHES/V2.1-A:r8562,8694
      Merged /alfresco/BRANCHES/V3.0:r12920
      Merged /alfresco/BRANCHES/V2.2:r12456-12457,12470,12605,12707
      Merged /alfresco/BRANCHES/V3.1:r12943,12948,12965,12974,12976,12978-12979


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 01:06:49 +00:00
parent b30c8f915b
commit f77e816467
16 changed files with 423 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/avm/AVMInterpreter.java
View File

@@ -357,11 +357,15 @@ public class AVMInterpreter
}
else if (command[0].equals("snap"))
{
if (command.length != 2)
if ((command.length < 2) || (command.length > 4))
{
return "Syntax Error.";
}
fService.createSnapshot(command[1], null, null);
String tag = (command.length > 2) ? command[2] : null;
String description = (command.length > 3) ? command[3] : null;
fService.createSnapshot(command[1], tag, description);
}
else if (command[0].equals("cat"))
{

4
source/java/org/alfresco/repo/avm/ChildKey.java
View File

@@ -109,7 +109,7 @@ public class ChildKey implements Serializable
}
ChildKey o = (ChildKey)other;
return fParent.equals(o.getParent()) &&
fName.equals(o.getName());
fName.equalsIgnoreCase(o.getName());
}
/**
@@ -117,6 +117,6 @@ public class ChildKey implements Serializable
*/
public int hashCode()
{
return fParent.hashCode() + fName.hashCode();
return fParent.hashCode() + fName.toLowerCase().hashCode();
}
}

23
source/java/org/alfresco/repo/avm/locking/AVMLockingBootstrap.java
View File

@@ -25,32 +25,41 @@
package org.alfresco.repo.avm.locking;
import org.alfresco.service.cmr.avm.locking.AVMLockingService;
import org.alfresco.util.AbstractLifecycleBean;
import org.springframework.context.ApplicationEvent;
/**
* Bootstrap for AVM Locking Service.
*
* @author britt
*/
public class AVMLockingBootstrap extends AbstractLifecycleBean
{
private AVMLockingServiceImpl fLockingService;
public void setAvmLockingService(AVMLockingServiceImpl service)
private AVMLockingService fLockingService;
public void setAvmLockingService(AVMLockingService service)
{
fLockingService = service;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
*/
@Override
protected void onBootstrap(ApplicationEvent event)
{
fLockingService.init();
if (fLockingService instanceof AVMLockingServiceImpl)
{
((AVMLockingServiceImpl) fLockingService).init();
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
*/
@Override