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 
- incl. taking Hibernate libs from 3.1 and adding missing file from earlier merge
   13321: Fix ETHREEOH-1407: System error occur during "Undo Selected" action if no items are selected
   13322: ETHREEOH-1206: Throwing Alfresco Exception on OnUpdateProperties behaviour resets Encoding field to Big (first entry)
   13326: (RECORD ONLY) Removed 'dev' from version label.
   13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
   13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
   13338: Removed svn:mergeinfo
   13346: Make startup bat script check JAVA can be found.
   13351: ETHREEOH-1386 validate ASR and FSR hostname.
   13359: ETHREEOH-1435: Share doesn't extract document metadata correctly
   13360: Fix ETHREEOH-821: SDK dependencies
   13369: Fixed distribute-sdk target for when it's run locally
   13382: ETHREEOH-1437: Container creation induces an unexpected permission allocation in Share
   13391: Shutdown backstop continues if logging throws errors.
   13394: Fix ETHREEOH-1457 - MT coci issue with bootstrap (eg. data dictionary) content
   13400: Activate JAWS-223: Adobe LC Hibernate Dialect Loading
   13401: Support for JAWS-215, mysql and oracle
   13413: Fix ETHREEOH-1458 - MT delete->archive
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r
                           13321-13322,13326-13327,13330,13337-13339,13341-13347,13351,13354-13355,13358-13363,
                           13365,13367,13369,13382,13385-13392,13394,13400-13403,13405-13406,13413


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-13 00:51:43 +00:00
parent 9d65d8feec
commit fec1149d8c
18 changed files with 297 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/repo/node/StoreArchiveMap.java
View File

@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.StoreRef;
/**
@@ -39,14 +40,16 @@ public class StoreArchiveMap
{
private Map<StoreRef, StoreRef> storeArchiveMap;
private TenantService tenantService;
public StoreArchiveMap()
{
storeArchiveMap = new HashMap<StoreRef, StoreRef>(0);
}
public Map<StoreRef, StoreRef> getArchiveMap()
public void setTenantService(TenantService tenantService)
{
return storeArchiveMap;
this.tenantService = tenantService;
}
public void setArchiveMap(Map<String, String> archiveMap)
@@ -70,4 +73,26 @@ public class StoreArchiveMap
storeArchiveMap.put(storeRefKey, storeRefValue);
}
}
public StoreRef get(StoreRef storeRef)
{
if (tenantService.isEnabled())
{
return tenantService.getName(storeArchiveMap.get(tenantService.getBaseName(storeRef)));
}
else
{
return storeArchiveMap.get(storeRef);
}
}
public void put(StoreRef workStoreRef, StoreRef archiveStoreRef)
{
storeArchiveMap.put(workStoreRef, archiveStoreRef);
}
public void clear()
{
storeArchiveMap.clear();
}
}