Merged V3.2 to HEAD

18023: RM: groundwork for custom metadata delete
    18071: MT - fix ETHREEOH-3730 (reject invitation shows "Invitation not found" instead of Yes / No options)
    18078: MT - fix ETHREEOH-3892 (it is not possible to create or manage any Tenants once the DOD5015 RM AMP is installed)
    18903: RM Caveats - fix ALF-1894 (improvement for ESC - remove hardcoded "rmc" model/namespace)
    19046: Improve dictionary debug logging (ALF-587)
    19096: Merging PATCHES/V3.2.r to V3.2
        19075: Merging DEV/BELARUS/V3.2-2010_02_24 to PATCHES/V3.2.r
            18881: ALF-587: MT Upgrades to 3.2r fail unable to find Alfresco content types
        19085: ALF-587 - test/build fix (follow on for r18881->r19075)
    19145: Dynamic Models - follow-on for ALF-587 (& ALFCOM-2977) + additional unit tests
    19176: Remove Java 6'ism
    19198: Build/test fix (follow-on to r19145 - do not validate model delete of version nodes)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-12 17:06:36 +00:00
parent e96af8d097
commit 8f0ad2d96f
17 changed files with 1703 additions and 323 deletions

View File

@@ -94,9 +94,9 @@ public class NamespaceDAOImpl implements NamespaceDAO
removeNamespaceRegistry(tenantDomain);
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Namespaces destroyed");
logger.trace("Namespaces destroyed");
}
}
@@ -111,18 +111,18 @@ public class NamespaceDAOImpl implements NamespaceDAO
throw new AlfrescoRuntimeException("Dictionary should be registered in order to perform reset");
}
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Resetting namespaces ...");
logger.trace("Resetting namespaces ...");
}
dictionaryDAO.init();
NamespaceRegistry namespaceRegistry = getNamespaceRegistry(tenantDomain);
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("... resetting namespaces completed");
logger.trace("... resetting namespaces completed");
}
return namespaceRegistry;
@@ -176,9 +176,9 @@ public class NamespaceDAOImpl implements NamespaceDAO
getNamespaceRegistry(tenantDomain).setUrisCache(new ArrayList<String>());
getNamespaceRegistry(tenantDomain).setPrefixesCache(new HashMap<String, String>());
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Empty namespaces initialised");
logger.trace("Empty namespaces initialised");
}
return getNamespaceRegistryLocal(tenantDomain);