Merged V3.3-BUG-FIX to HEAD

23175: Merged V3.3 to V3.3-BUG-FIX
      23174: Fix ALF-5183: Audit configuration problems should not prevent server startup
   23180: Added flag for strict audit config loading: audit.config.strict=false


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-10-17 21:54:10 +00:00
parent f0fe5e76fe
commit 7442465407
4 changed files with 20 additions and 9 deletions

View File

@@ -58,6 +58,7 @@ public class AuditBootstrapTest extends TestCase
public void setUp() throws Exception
{
auditModelRegistry = (AuditModelRegistryImpl) ctx.getBean("auditModel.modelRegistry");
auditModelRegistry.setProperty(AuditModelRegistryImpl.PROPERTY_AUDIT_CONFIG_STRICT, Boolean.TRUE.toString());
// Register a new model
URL testModelUrl = ResourceUtils.getURL("classpath:alfresco/testaudit/alfresco-audit-test.xml");
@@ -69,6 +70,7 @@ public class AuditBootstrapTest extends TestCase
protected void tearDown() throws Exception
{
// Throw away the reconfigured registry state
auditModelRegistry.setProperty(AuditModelRegistryImpl.PROPERTY_AUDIT_CONFIG_STRICT, Boolean.FALSE.toString());
auditModelRegistry.destroy();
}