mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merging BRANCHES/DEV/CMIS_10 to HEAD:
17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43 and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in 17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API 17732: Merge HEAD to DEV/CMIS10 17756: MOB-563: SQL Tests - Lexer 17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support 17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl. 17830: Fixes for CMIS lexer and parser tests 17838: Access fix ups for access by the WS/Rest layers 17869: 1) remote-api: 17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id 17883: Adjust version properties for dev/cmis10 branch. 17885: Update OASIS CMIS TC status. 17889: Fix issue where objectid is not rendered correctly for CMIS private working copies. 17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names. 17902: Fix issue where CMIS queries via GET used incorrect defaults for paging. 17909: Fix CMIS link relations for folder tree. 17912: Fix CMIS type descendants atompub link 17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs. 17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names) 17927: Fix content stream create/update status to comply with CMIS 1.0 CD05. 17934: Resolve encoding issues in CMIS AtomPub binding. 17973: SAIL-171: CMIS Renditions REST binding 17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree. 17990: Update CMIS AtomPub to CD06 17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2. 18007: WS-Bindings were updated with CMIS 1.0 cd06 changes. 18016: CMIS web services: Add missing generated files from WSDL 18018: CMIS index page updates for cmis.alfresco.com 18041: Merged HEAD to DEV/CMIS_10 18059: SAIL-227: 18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS() 18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors 18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'. 18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like 18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS() 18173: SAIL-245: Exclude thumbnails from normal query results 18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE 18210: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18211: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery 18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate 18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings. 18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added. 18263: Build Fix 18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties 18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests 18291: Fix Eclipse classpath problems 18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented. 18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings 18329: Updated Chemistry TCK jar including Dave W's rendition tests. 18333: Fix compile error - spurious imports. 18334: Fix issue where absurl web script method failed when deployed to root context. 18339: Update CMIS index page for start of public review 2. 18387: SAIL-147: CMIS ACL REST bindings + framework fixes 18392: Fix typo 18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric> 18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean 18408: CMIS Query language - remove (pointless) multi-valued column from language definition 18409: Formatting change for CMIS.g 18410: Formatting change for FTS.g 18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas. 18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference) 18417: Update Chemistry TCK which now incorporates Dave W's ACL tests. 18419: Update CMIS index page to include public review end date. 18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long. 18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path. 18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery). 18477: SAIL-164: CMIS change log REST bindings 18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions. 18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties. 18538: SAIL-164: CMIS change log fixes for TCK compliance 18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values. 18582: Incorporate latest Chemistry TCK 18583: Update list of supported CMIS capabilities in index page. 18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support. 18608: SAIL-159: Java / Javascript API access to CMIS Query Language 18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable. 18636: SAIL-184: ACL tests (WS) 18663: ACL tests were updated in accordance with last requirements by David Caruana. 18680: Update to CMIS CD07 18681: Fix CMIS ContentStreamId property when document has no content. 18700: CMIS: Head merge problem resolution. Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch. Note: includes CMIS rendition support ready for integration and testing with DM renditions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2010 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
|
||||
@@ -18,9 +18,9 @@
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.audit;
|
||||
|
||||
@@ -40,6 +40,7 @@ public class AuditBootstrap extends AbstractLifecycleBean
|
||||
{
|
||||
private TransactionService transactionService;
|
||||
private AuditModelRegistry auditModelRegistry;
|
||||
private boolean isActive = true;
|
||||
|
||||
public void setTransactionService(TransactionService transactionService)
|
||||
{
|
||||
@@ -50,6 +51,11 @@ public class AuditBootstrap extends AbstractLifecycleBean
|
||||
{
|
||||
this.auditModelRegistry = registry;
|
||||
}
|
||||
|
||||
public void setActive(boolean isActive)
|
||||
{
|
||||
this.isActive = isActive;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see AuditModelRegistry#loadAuditModels()
|
||||
@@ -63,6 +69,12 @@ public class AuditBootstrap extends AbstractLifecycleBean
|
||||
return;
|
||||
}
|
||||
|
||||
// Don't start if we've been configured out
|
||||
if (!this.isActive)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
RetryingTransactionCallback<Void> callback = new RetryingTransactionCallback<Void>()
|
||||
{
|
||||
public Void execute() throws Throwable
|
||||
|
@@ -33,7 +33,8 @@ import org.alfresco.repo.audit.extractor.DataExtractor;
|
||||
import org.alfresco.repo.audit.generator.DataGenerator;
|
||||
import org.alfresco.repo.audit.model.AuditApplication;
|
||||
import org.alfresco.repo.audit.model.AuditModelException;
|
||||
import org.alfresco.repo.audit.model.AuditModelRegistry;
|
||||
import org.alfresco.repo.audit.model.AuditModelRegistryImpl;
|
||||
import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
|
||||
import org.alfresco.util.ApplicationContextHelper;
|
||||
import org.alfresco.util.PathMapper;
|
||||
import org.apache.commons.logging.Log;
|
||||
@@ -57,12 +58,15 @@ public class AuditBootstrapTest extends TestCase
|
||||
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
|
||||
private static final Log logger = LogFactory.getLog(AuditBootstrapTest.class);
|
||||
|
||||
private AuditModelRegistry auditModelRegistry;
|
||||
private AuditModelRegistryImpl auditModelRegistry;
|
||||
|
||||
@Override
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
auditModelRegistry = (AuditModelRegistry) ctx.getBean("auditModel.modelRegistry");
|
||||
// We have to look inside the subsystem for this test
|
||||
ApplicationContextFactory subsystem = (ApplicationContextFactory) ctx.getBean("Audit");
|
||||
ApplicationContext subCtx = subsystem.getApplicationContext();
|
||||
auditModelRegistry = (AuditModelRegistryImpl) subCtx.getBean("auditModel.modelRegistry");
|
||||
|
||||
// Register a new model
|
||||
URL testModelUrl = ResourceUtils.getURL("classpath:alfresco/audit/alfresco-audit-test.xml");
|
||||
|
@@ -93,6 +93,15 @@ public interface AuditComponent
|
||||
/*
|
||||
* V3.2 from here on. Put all fixes to the older audit code before this point, please.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Determines whether the given source path is mapped to any audit applications. Allows optimizations to be made in
|
||||
* calling components.
|
||||
*
|
||||
* @return <code>true</code> if the given source path is mapped to one or more audit applications
|
||||
* @since 3.3
|
||||
*/
|
||||
public boolean isSourcePathMapped(String sourcePath);
|
||||
|
||||
/**
|
||||
* Delete audit entries for the given application and time range
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2010 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
|
||||
@@ -18,9 +18,9 @@
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.audit;
|
||||
|
||||
@@ -954,6 +954,15 @@ public class AuditComponentImpl implements AuditComponent
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
* @since 3.2
|
||||
*/
|
||||
public boolean isSourcePathMapped(String sourcePath)
|
||||
{
|
||||
return !auditModelRegistry.getAuditPathMapper().isEmpty();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
* @since 3.2
|
||||
@@ -971,7 +980,7 @@ public class AuditComponentImpl implements AuditComponent
|
||||
{
|
||||
logger.debug("No audit application named '" + applicationName + "' has been registered.");
|
||||
}
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
// Check the path against the application
|
||||
application.checkPath(path);
|
||||
@@ -1162,10 +1171,11 @@ public class AuditComponentImpl implements AuditComponent
|
||||
ParameterCheck.mandatory("rootPath", rootPath);
|
||||
AuditApplication.checkPathFormat(rootPath);
|
||||
|
||||
if (values == null || values.isEmpty())
|
||||
if (values == null || values.isEmpty() || !isSourcePathMapped(rootPath))
|
||||
{
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
|
||||
// Build the key paths using the session root path
|
||||
Map<String, Serializable> pathedValues = new HashMap<String, Serializable>(values.size() * 2);
|
||||
for (Map.Entry<String, Serializable> entry : values.entrySet())
|
||||
|
@@ -38,7 +38,8 @@ import junit.framework.TestCase;
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.repo.audit.model.AuditApplication;
|
||||
import org.alfresco.repo.audit.model.AuditModelException;
|
||||
import org.alfresco.repo.audit.model.AuditModelRegistry;
|
||||
import org.alfresco.repo.audit.model.AuditModelRegistryImpl;
|
||||
import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationException;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||
@@ -79,9 +80,9 @@ public class AuditComponentTest extends TestCase
|
||||
|
||||
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
|
||||
|
||||
private AuditModelRegistry auditModelRegistry;
|
||||
private ApplicationContextFactory subsystem;
|
||||
private AuditModelRegistryImpl auditModelRegistry;
|
||||
private AuditComponent auditComponent;
|
||||
private AuditMethodInterceptor auditMethodInterceptor;
|
||||
private AuditService auditService;
|
||||
private ServiceRegistry serviceRegistry;
|
||||
private TransactionService transactionService;
|
||||
@@ -93,9 +94,11 @@ public class AuditComponentTest extends TestCase
|
||||
@Override
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
auditModelRegistry = (AuditModelRegistry) ctx.getBean("auditModel.modelRegistry");
|
||||
// We have to look inside the subsystem for this test
|
||||
subsystem = (ApplicationContextFactory) ctx.getBean("Audit");
|
||||
ApplicationContext subCtx = subsystem.getApplicationContext();
|
||||
auditModelRegistry = (AuditModelRegistryImpl) subCtx.getBean("auditModel.modelRegistry");
|
||||
auditComponent = (AuditComponent) ctx.getBean("auditComponent");
|
||||
auditMethodInterceptor = (AuditMethodInterceptor) ctx.getBean("AuditMethodInterceptor");
|
||||
serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
|
||||
auditService = serviceRegistry.getAuditService();
|
||||
transactionService = serviceRegistry.getTransactionService();
|
||||
@@ -129,17 +132,14 @@ public class AuditComponentTest extends TestCase
|
||||
}
|
||||
};
|
||||
transactionService.getRetryingTransactionHelper().doInTransaction(resetDisabledPathsCallback);
|
||||
|
||||
auditMethodInterceptor.setEnabled(true);
|
||||
auditMethodInterceptor.setUseNewConfig(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tearDown() throws Exception
|
||||
{
|
||||
AuthenticationUtil.clearCurrentSecurityContext();
|
||||
auditMethodInterceptor.setEnabled(false);
|
||||
auditMethodInterceptor.setUseNewConfig(false);
|
||||
// Throw away the reconfigured registry in the subsystem
|
||||
subsystem.stop();
|
||||
}
|
||||
|
||||
public void testSetUp()
|
||||
@@ -314,7 +314,12 @@ public class AuditComponentTest extends TestCase
|
||||
final MutableInt rowCount = new MutableInt();
|
||||
|
||||
AuditQueryCallback callback = new AuditQueryCallback()
|
||||
{
|
||||
{
|
||||
public boolean valuesRequired()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean handleAuditEntry(
|
||||
Long entryId, String applicationName, String user, long time, Map<String, Serializable> values)
|
||||
{
|
||||
@@ -482,6 +487,11 @@ public class AuditComponentTest extends TestCase
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
AuditQueryCallback auditQueryCallback = new AuditQueryCallback()
|
||||
{
|
||||
public boolean valuesRequired()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean handleAuditEntry(
|
||||
Long entryId,
|
||||
String applicationName,
|
||||
@@ -576,6 +586,11 @@ public class AuditComponentTest extends TestCase
|
||||
{
|
||||
AuditQueryCallback auditQueryCallback = new AuditQueryCallback()
|
||||
{
|
||||
public boolean valuesRequired()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean handleAuditEntry(
|
||||
Long entryId,
|
||||
String applicationName,
|
||||
@@ -604,4 +619,5 @@ public class AuditComponentTest extends TestCase
|
||||
params.setToId(Long.MAX_VALUE);
|
||||
auditService.auditQuery(auditQueryCallback, params, 1);
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2010 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
|
||||
@@ -18,7 +18,7 @@
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
@@ -84,8 +84,9 @@ import org.apache.commons.logging.LogFactory;
|
||||
*/
|
||||
public class AuditMethodInterceptor implements MethodInterceptor
|
||||
{
|
||||
public static final String AUDIT_PATH_API_PRE = "/alfresco-api/pre";
|
||||
public static final String AUDIT_PATH_API_POST = "/alfresco-api/post";
|
||||
public static final String AUDIT_PATH_API_ROOT = "/alfresco-api";
|
||||
public static final String AUDIT_PATH_API_PRE = AUDIT_PATH_API_ROOT + "/pre";
|
||||
public static final String AUDIT_PATH_API_POST = AUDIT_PATH_API_ROOT + "/post";
|
||||
public static final String AUDIT_SNIPPET_ARGS = "/args";
|
||||
public static final String AUDIT_SNIPPET_RESULT = "/result";
|
||||
public static final String AUDIT_SNIPPET_ERROR = "/error";
|
||||
@@ -97,24 +98,17 @@ public class AuditMethodInterceptor implements MethodInterceptor
|
||||
private AuditComponent auditComponent;
|
||||
private TransactionService transactionService;
|
||||
|
||||
private boolean enabled = false;
|
||||
// SysAdmin cache - used to cluster certain configuration parameters
|
||||
private boolean useNewConfig = false;
|
||||
|
||||
private final ThreadLocal<Boolean> inAudit = new ThreadLocal<Boolean>();
|
||||
private final ThreadLocal<Boolean> auditEnabled = new ThreadLocal<Boolean>();
|
||||
|
||||
public AuditMethodInterceptor()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable or disable auditing at a high level (default: <b>false</b>)
|
||||
*/
|
||||
public void setEnabled(boolean enabled)
|
||||
{
|
||||
this.enabled = enabled;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Use the new audit configuration (default: <b>false</b>)
|
||||
*
|
||||
@@ -142,22 +136,44 @@ public class AuditMethodInterceptor implements MethodInterceptor
|
||||
|
||||
public Object invoke(MethodInvocation mi) throws Throwable
|
||||
{
|
||||
if(!enabled)
|
||||
// Cache the enabled flag at the top of the stack
|
||||
Boolean wasEnabled = auditEnabled.get();
|
||||
try
|
||||
{
|
||||
// No auditing
|
||||
return mi.proceed();
|
||||
boolean enabled;
|
||||
if (wasEnabled == null)
|
||||
{
|
||||
// There hasn't been an invocation in this thread yet, so check whether we are currently enabled in the
|
||||
// audit subsystem
|
||||
enabled = this.auditComponent.isSourcePathMapped(AUDIT_PATH_API_ROOT);
|
||||
auditEnabled.set(enabled);
|
||||
}
|
||||
else
|
||||
{
|
||||
enabled = wasEnabled;
|
||||
}
|
||||
|
||||
if(!enabled)
|
||||
{
|
||||
// No auditing
|
||||
return mi.proceed();
|
||||
}
|
||||
else if (useNewConfig)
|
||||
{
|
||||
// New configuration to be used
|
||||
return proceed(mi);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use previous configuration
|
||||
return auditComponent.audit(mi);
|
||||
}
|
||||
}
|
||||
else if (useNewConfig)
|
||||
finally
|
||||
{
|
||||
// New configuration to be used
|
||||
return proceed(mi);
|
||||
auditEnabled.set(wasEnabled);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use previous configuration
|
||||
return auditComponent.audit(mi);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -39,7 +39,8 @@ import org.springframework.util.ResourceUtils;
|
||||
public class AuditModelReader implements InitializingBean
|
||||
{
|
||||
private URL auditModelUrl;
|
||||
private AuditModelRegistry auditModelRegistry;
|
||||
private AuditModelRegistryImpl auditModelRegistry;
|
||||
private boolean isActive = true;
|
||||
|
||||
/**
|
||||
* Set the XML location using <b>file:</b>, <b>classpath:</b> or any of the
|
||||
@@ -56,16 +57,32 @@ public class AuditModelReader implements InitializingBean
|
||||
*
|
||||
* @param auditModelRegistry the registry that combines all loaded models
|
||||
*/
|
||||
public void setAuditModelRegistry(AuditModelRegistry auditModelRegistry)
|
||||
public void setAuditModelRegistry(AuditModelRegistryImpl auditModelRegistry)
|
||||
{
|
||||
this.auditModelRegistry = auditModelRegistry;
|
||||
}
|
||||
|
||||
/**
|
||||
* Controls whether or not this bean registers its model with the registry on initialization.
|
||||
*
|
||||
* @param isActive
|
||||
* <code>true</code> if this bean should register its model with the registry on initialization.
|
||||
*/
|
||||
public void setActive(boolean isActive)
|
||||
{
|
||||
this.isActive = isActive;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pulls in the configuration and registers it
|
||||
*/
|
||||
public void afterPropertiesSet() throws Exception
|
||||
{
|
||||
if (!this.isActive)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
PropertyCheck.mandatory(this, "configUrl", auditModelUrl);
|
||||
PropertyCheck.mandatory(this, "auditModelRegistry", auditModelRegistry);
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2010 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
|
||||
@@ -18,209 +18,27 @@
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.audit.model;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.JAXBElement;
|
||||
import javax.xml.bind.Unmarshaller;
|
||||
import javax.xml.bind.ValidationEvent;
|
||||
import javax.xml.bind.ValidationEventHandler;
|
||||
import javax.xml.bind.ValidationEventLocator;
|
||||
import javax.xml.validation.Schema;
|
||||
import javax.xml.validation.SchemaFactory;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.error.ExceptionStackUtil;
|
||||
import org.alfresco.repo.audit.extractor.DataExtractor;
|
||||
import org.alfresco.repo.audit.generator.DataGenerator;
|
||||
import org.alfresco.repo.audit.model._3.Application;
|
||||
import org.alfresco.repo.audit.model._3.Audit;
|
||||
import org.alfresco.repo.audit.model._3.DataExtractors;
|
||||
import org.alfresco.repo.audit.model._3.DataGenerators;
|
||||
import org.alfresco.repo.audit.model._3.ObjectFactory;
|
||||
import org.alfresco.repo.audit.model._3.PathMap;
|
||||
import org.alfresco.repo.audit.model._3.PathMappings;
|
||||
import org.alfresco.repo.domain.audit.AuditDAO;
|
||||
import org.alfresco.repo.domain.audit.AuditDAO.AuditApplicationInfo;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.PathMapper;
|
||||
import org.springframework.extensions.surf.util.PropertyCheck;
|
||||
import org.alfresco.util.registry.NamedObjectRegistry;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.util.ResourceUtils;
|
||||
import org.xml.sax.SAXParseException;
|
||||
|
||||
/**
|
||||
* Component used to store audit model definitions. It ensures that duplicate application and converter
|
||||
* definitions are detected and provides a single lookup for code using the Audit model.
|
||||
* Interface for component used to store audit model definitions.
|
||||
*
|
||||
* @author Derek Hulley
|
||||
* @since 3.2
|
||||
* @since 3.3
|
||||
*/
|
||||
public class AuditModelRegistry
|
||||
public interface AuditModelRegistry
|
||||
{
|
||||
public static final String AUDIT_SCHEMA_LOCATION = "classpath:alfresco/audit/alfresco-audit-3.2.xsd";
|
||||
public static final String AUDIT_RESERVED_KEY_USERNAME = "username";
|
||||
public static final String AUDIT_RESERVED_KEY_SYSTEMTIME = "systemTime";
|
||||
|
||||
private static final Log logger = LogFactory.getLog(AuditModelRegistry.class);
|
||||
|
||||
private TransactionService transactionService;
|
||||
private AuditDAO auditDAO;
|
||||
private NamedObjectRegistry<DataExtractor> dataExtractors;
|
||||
private NamedObjectRegistry<DataGenerator> dataGenerators;
|
||||
|
||||
private final ReentrantReadWriteLock.ReadLock readLock;
|
||||
private final ReentrantReadWriteLock.WriteLock writeLock;
|
||||
private final ObjectFactory objectFactory;
|
||||
|
||||
private final Set<URL> auditModelUrls;
|
||||
private final List<Audit> auditModels;
|
||||
/**
|
||||
* Used to lookup path translations
|
||||
*/
|
||||
private PathMapper auditPathMapper;
|
||||
/**
|
||||
* Used to lookup the audit application java hierarchy
|
||||
*/
|
||||
private final Map<String, AuditApplication> auditApplicationsByKey;
|
||||
/**
|
||||
* Used to lookup the audit application java hierarchy
|
||||
*/
|
||||
private final Map<String, AuditApplication> auditApplicationsByName;
|
||||
|
||||
/**
|
||||
* Default constructor
|
||||
*/
|
||||
public AuditModelRegistry()
|
||||
{
|
||||
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
||||
readLock = lock.readLock();
|
||||
writeLock = lock.writeLock();
|
||||
|
||||
objectFactory = new ObjectFactory();
|
||||
|
||||
auditModelUrls = new HashSet<URL>(7);
|
||||
auditModels = new ArrayList<Audit>(7);
|
||||
auditPathMapper = new PathMapper();
|
||||
auditApplicationsByKey = new HashMap<String, AuditApplication>(7);
|
||||
auditApplicationsByName = new HashMap<String, AuditApplication>(7);
|
||||
}
|
||||
|
||||
/**
|
||||
* Service to ensure DAO calls are transactionally wrapped
|
||||
*/
|
||||
public void setTransactionService(TransactionService transactionService)
|
||||
{
|
||||
this.transactionService = transactionService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the DAO used to persisted the registered audit models
|
||||
*/
|
||||
public void setAuditDAO(AuditDAO auditDAO)
|
||||
{
|
||||
this.auditDAO = auditDAO;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the registry of {@link DataExtractor data extractors}
|
||||
*/
|
||||
public void setDataExtractors(NamedObjectRegistry<DataExtractor> dataExtractors)
|
||||
{
|
||||
this.dataExtractors = dataExtractors;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the registry of {@link DataGenerator data generators}
|
||||
*/
|
||||
public void setDataGenerators(NamedObjectRegistry<DataGenerator> dataGenerators)
|
||||
{
|
||||
this.dataGenerators = dataGenerators;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures that all properties have been set for use.
|
||||
*/
|
||||
private void checkProperties()
|
||||
{
|
||||
PropertyCheck.mandatory(this, "transactionService", transactionService);
|
||||
PropertyCheck.mandatory(this, "auditDAO", auditDAO);
|
||||
PropertyCheck.mandatory(this, "dataExtractors", dataExtractors);
|
||||
PropertyCheck.mandatory(this, "dataGenerators", dataGenerators);
|
||||
}
|
||||
|
||||
/**
|
||||
* Register an audit model at a given URL.
|
||||
*
|
||||
* @param auditModelUrl the source of the model
|
||||
*/
|
||||
public void registerModel(URL auditModelUrl)
|
||||
{
|
||||
checkProperties();
|
||||
writeLock.lock();
|
||||
try
|
||||
{
|
||||
if (auditModelUrls.contains(auditModelUrl))
|
||||
{
|
||||
logger.warn("An audit model has already been registered at URL " + auditModelUrl);
|
||||
}
|
||||
auditModelUrls.add(auditModelUrl);
|
||||
}
|
||||
finally
|
||||
{
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Register an audit model at a given node reference.
|
||||
*
|
||||
* @param auditModelNodeRef the source of the audit model
|
||||
*/
|
||||
public void registerModel(NodeRef auditModelNodeRef)
|
||||
{
|
||||
checkProperties();
|
||||
writeLock.lock();
|
||||
try
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
finally
|
||||
{
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleans out all derived data
|
||||
*/
|
||||
private void clearCaches()
|
||||
{
|
||||
auditModels.clear();
|
||||
auditApplicationsByKey.clear();
|
||||
auditApplicationsByName.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to load audit models into memory. This method is also responsible for persisting
|
||||
* the audit models for later retrieval. Models are loaded from the locations given by the
|
||||
@@ -229,364 +47,27 @@ public class AuditModelRegistry
|
||||
* Note, the models are loaded in a new transaction, so this method can be called by any code
|
||||
* at any time.
|
||||
*/
|
||||
public void loadAuditModels()
|
||||
{
|
||||
checkProperties();
|
||||
|
||||
RetryingTransactionCallback<Void> loadModelsCallback = new RetryingTransactionCallback<Void>()
|
||||
{
|
||||
public Void execute() throws Throwable
|
||||
{
|
||||
// Load models from the URLs
|
||||
Set<URL> auditModelUrlsInner = new HashSet<URL>(auditModelUrls);
|
||||
for (URL auditModelUrl : auditModelUrlsInner)
|
||||
{
|
||||
try
|
||||
{
|
||||
Audit audit = AuditModelRegistry.unmarshallModel(auditModelUrl);
|
||||
// That worked, so now get an input stream and write the model
|
||||
Long auditModelId = auditDAO.getOrCreateAuditModel(auditModelUrl).getFirst();
|
||||
// Now cache it (eagerly)
|
||||
cacheAuditElements(auditModelId, audit);
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
// Mainly for test purposes, we clear out the failed URL
|
||||
auditModelUrls.remove(auditModelUrl);
|
||||
clearCaches();
|
||||
|
||||
throw new AuditModelException(
|
||||
"Failed to load audit model: " + auditModelUrl,
|
||||
e);
|
||||
}
|
||||
}
|
||||
// NOTE: If we support other types of loading, then that will have to go here, too
|
||||
|
||||
// Done
|
||||
return null;
|
||||
}
|
||||
};
|
||||
public void loadAuditModels();
|
||||
|
||||
writeLock.lock();
|
||||
// Drop all cached data
|
||||
clearCaches();
|
||||
try
|
||||
{
|
||||
auditPathMapper = new PathMapper();
|
||||
transactionService.getRetryingTransactionHelper().doInTransaction(loadModelsCallback,
|
||||
transactionService.isReadOnly(), true);
|
||||
auditPathMapper.lock();
|
||||
}
|
||||
finally
|
||||
{
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the application model for the given root key (as defined on the application)
|
||||
*
|
||||
* @param key the key defined on the application
|
||||
* @return the java model (<tt>null</tt> if not found)
|
||||
*/
|
||||
public AuditApplication getAuditApplicationByKey(String key)
|
||||
{
|
||||
readLock.lock();
|
||||
try
|
||||
{
|
||||
return auditApplicationsByKey.get(key);
|
||||
}
|
||||
finally
|
||||
{
|
||||
readLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
public AuditApplication getAuditApplicationByKey(String key);
|
||||
|
||||
/**
|
||||
* Get the application model for the given application name
|
||||
*
|
||||
* @param applicationName the name of the audited application
|
||||
* @return the java model (<tt>null</tt> if not found)
|
||||
*/
|
||||
public AuditApplication getAuditApplicationByName(String applicationName)
|
||||
{
|
||||
readLock.lock();
|
||||
try
|
||||
{
|
||||
return auditApplicationsByName.get(applicationName);
|
||||
}
|
||||
finally
|
||||
{
|
||||
readLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the
|
||||
* @return
|
||||
*/
|
||||
public PathMapper getAuditPathMapper()
|
||||
{
|
||||
return auditPathMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unmarshalls the Audit model from the URL.
|
||||
*
|
||||
* @throws AlfrescoRuntimeException if an IOException occurs
|
||||
*/
|
||||
public static Audit unmarshallModel(URL configUrl)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Load it
|
||||
InputStream is = new BufferedInputStream(configUrl.openStream());
|
||||
return unmarshallModel(is, configUrl.toString());
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
throw new AlfrescoRuntimeException("The Audit model XML failed to load: " + configUrl, e);
|
||||
}
|
||||
}
|
||||
public AuditApplication getAuditApplicationByName(String applicationName);
|
||||
|
||||
/**
|
||||
* Unmarshalls the Audit model from a stream
|
||||
* Get the path mapper.
|
||||
* @return the path mapper
|
||||
*/
|
||||
private static Audit unmarshallModel(InputStream is, final String source)
|
||||
{
|
||||
final Schema schema;
|
||||
final JAXBContext jaxbCtx;
|
||||
final Unmarshaller jaxbUnmarshaller;
|
||||
try
|
||||
{
|
||||
SchemaFactory sf = SchemaFactory.newInstance(javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI);
|
||||
schema = sf.newSchema(ResourceUtils.getURL(AUDIT_SCHEMA_LOCATION));
|
||||
jaxbCtx = JAXBContext.newInstance("org.alfresco.repo.audit.model._3");
|
||||
jaxbUnmarshaller = jaxbCtx.createUnmarshaller();
|
||||
jaxbUnmarshaller.setSchema(schema);
|
||||
jaxbUnmarshaller.setEventHandler(new ValidationEventHandler()
|
||||
{
|
||||
public boolean handleEvent(ValidationEvent ve)
|
||||
{
|
||||
if (ve.getSeverity() == ValidationEvent.FATAL_ERROR || ve.getSeverity() == ValidationEvent.ERROR)
|
||||
{
|
||||
ValidationEventLocator locator = ve.getLocator();
|
||||
logger.error("Invalid Audit XML: \n" +
|
||||
" Source: " + source + "\n" +
|
||||
" Location: Line " + locator.getLineNumber() + " column " + locator.getColumnNumber() + "\n" +
|
||||
" Error: " + ve.getMessage());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
throw new AlfrescoRuntimeException(
|
||||
"Failed to load Alfresco Audit Schema from " + AUDIT_SCHEMA_LOCATION, e);
|
||||
}
|
||||
try
|
||||
{
|
||||
// Unmarshall with validation
|
||||
@SuppressWarnings("unchecked")
|
||||
JAXBElement<Audit> auditElement = (JAXBElement<Audit>) jaxbUnmarshaller.unmarshal(is);
|
||||
|
||||
Audit audit = auditElement.getValue();
|
||||
// Done
|
||||
return audit;
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
// Dig out a SAXParseException, if there is one
|
||||
Throwable saxError = ExceptionStackUtil.getCause(e, SAXParseException.class);
|
||||
if (saxError != null)
|
||||
{
|
||||
e = saxError;
|
||||
}
|
||||
throw new AuditModelException(
|
||||
"Failed to read Audit model XML: \n" +
|
||||
" Source: " + source + "\n" +
|
||||
" Error: " + e.getMessage());
|
||||
}
|
||||
finally
|
||||
{
|
||||
try { is.close(); } catch (IOException e) {}
|
||||
}
|
||||
}
|
||||
|
||||
private void cacheAuditElements(Long auditModelId, Audit audit)
|
||||
{
|
||||
Map<String, DataExtractor> dataExtractorsByName = new HashMap<String, DataExtractor>(13);
|
||||
Map<String, DataGenerator> dataGeneratorsByName = new HashMap<String, DataGenerator>(13);
|
||||
|
||||
// Get the data extractors and check for duplicates
|
||||
DataExtractors extractorsElement = audit.getDataExtractors();
|
||||
if (extractorsElement == null)
|
||||
{
|
||||
extractorsElement = objectFactory.createDataExtractors();
|
||||
}
|
||||
List<org.alfresco.repo.audit.model._3.DataExtractor> extractorElements = extractorsElement.getDataExtractor();
|
||||
for (org.alfresco.repo.audit.model._3.DataExtractor extractorElement : extractorElements)
|
||||
{
|
||||
String name = extractorElement.getName();
|
||||
// If the name is taken, make sure that they are equal
|
||||
if (dataExtractorsByName.containsKey(name))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor '" + name + "' has already been defined.");
|
||||
}
|
||||
// Construct the converter
|
||||
final DataExtractor dataExtractor;
|
||||
if (extractorElement.getClazz() != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Class<?> dataExtractorClazz = Class.forName(extractorElement.getClazz());
|
||||
dataExtractor = (DataExtractor) dataExtractorClazz.newInstance();
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor '" + name + "' class not found: " + extractorElement.getClazz());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor '" + name + "' could not be constructed: " + extractorElement.getClazz());
|
||||
}
|
||||
}
|
||||
else if (extractorElement.getRegisteredName() != null)
|
||||
{
|
||||
String registeredName = extractorElement.getRegisteredName();
|
||||
dataExtractor = dataExtractors.getNamedObject(registeredName);
|
||||
if (dataExtractor == null)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"No registered audit data extractor exists for '" + registeredName + "'.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor has no class or registered name: " + name);
|
||||
}
|
||||
// Store
|
||||
dataExtractorsByName.put(name, dataExtractor);
|
||||
}
|
||||
// Get the data generators and check for duplicates
|
||||
DataGenerators generatorsElement = audit.getDataGenerators();
|
||||
if (generatorsElement == null)
|
||||
{
|
||||
generatorsElement = objectFactory.createDataGenerators();
|
||||
}
|
||||
List<org.alfresco.repo.audit.model._3.DataGenerator> generatorElements = generatorsElement.getDataGenerator();
|
||||
for (org.alfresco.repo.audit.model._3.DataGenerator generatorElement : generatorElements)
|
||||
{
|
||||
String name = generatorElement.getName();
|
||||
// If the name is taken, make sure that they are equal
|
||||
if (dataGeneratorsByName.containsKey(name))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator '" + name + "' has already been defined.");
|
||||
}
|
||||
// Construct the generator
|
||||
final DataGenerator dataGenerator;
|
||||
if (generatorElement.getClazz() != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Class<?> dataGeneratorClazz = Class.forName(generatorElement.getClazz());
|
||||
dataGenerator = (DataGenerator) dataGeneratorClazz.newInstance();
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator '" + name + "' class not found: " + generatorElement.getClazz());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator '" + name + "' could not be constructed: " + generatorElement.getClazz());
|
||||
}
|
||||
}
|
||||
else if (generatorElement.getRegisteredName() != null)
|
||||
{
|
||||
String registeredName = generatorElement.getRegisteredName();
|
||||
dataGenerator = dataGenerators.getNamedObject(registeredName);
|
||||
if (dataGenerator == null)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"No registered audit data generator exists for '" + registeredName + "'.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator has no class or registered name: " + name);
|
||||
}
|
||||
// Store
|
||||
dataGeneratorsByName.put(name, dataGenerator);
|
||||
}
|
||||
// Get the application and check for duplicates
|
||||
List<Application> applications = audit.getApplication();
|
||||
for (Application application : applications)
|
||||
{
|
||||
String key = application.getKey();
|
||||
if (auditApplicationsByKey.containsKey(key))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit application key '" + key + "' is used by: " + auditApplicationsByKey.get(key));
|
||||
}
|
||||
|
||||
String name = application.getName();
|
||||
if (auditApplicationsByName.containsKey(name))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit application '" + name + "' is used by: " + auditApplicationsByName.get(name));
|
||||
}
|
||||
|
||||
// Get the ID of the application
|
||||
AuditApplicationInfo appInfo = auditDAO.getAuditApplication(name);
|
||||
if (appInfo == null)
|
||||
{
|
||||
appInfo = auditDAO.createAuditApplication(name, auditModelId);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Update it with the new model ID
|
||||
auditDAO.updateAuditApplicationModel(appInfo.getId(), auditModelId);
|
||||
}
|
||||
|
||||
AuditApplication wrapperApp = new AuditApplication(
|
||||
dataExtractorsByName,
|
||||
dataGeneratorsByName,
|
||||
application,
|
||||
appInfo.getId(),
|
||||
appInfo.getDisabledPathsId());
|
||||
auditApplicationsByName.put(name, wrapperApp);
|
||||
auditApplicationsByKey.put(key, wrapperApp);
|
||||
}
|
||||
// Pull out all the audit path maps
|
||||
buildAuditPathMap(audit);
|
||||
// Store the model itself
|
||||
auditModels.add(audit);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct the reverse lookup maps for quick conversion of data to target maps
|
||||
*/
|
||||
private void buildAuditPathMap(Audit audit)
|
||||
{
|
||||
PathMappings pathMappings = audit.getPathMappings();
|
||||
if (pathMappings == null)
|
||||
{
|
||||
pathMappings = objectFactory.createPathMappings();
|
||||
}
|
||||
for (PathMap pathMap : pathMappings.getPathMap())
|
||||
{
|
||||
String sourcePath = pathMap.getSource();
|
||||
String targetPath = pathMap.getTarget();
|
||||
auditPathMapper.addPathMap(sourcePath, targetPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
public PathMapper getAuditPathMapper();
|
||||
}
|
@@ -0,0 +1,578 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2010 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.audit.model;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.JAXBElement;
|
||||
import javax.xml.bind.Unmarshaller;
|
||||
import javax.xml.bind.ValidationEvent;
|
||||
import javax.xml.bind.ValidationEventHandler;
|
||||
import javax.xml.bind.ValidationEventLocator;
|
||||
import javax.xml.validation.Schema;
|
||||
import javax.xml.validation.SchemaFactory;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.error.ExceptionStackUtil;
|
||||
import org.alfresco.repo.audit.extractor.DataExtractor;
|
||||
import org.alfresco.repo.audit.generator.DataGenerator;
|
||||
import org.alfresco.repo.audit.model._3.Application;
|
||||
import org.alfresco.repo.audit.model._3.Audit;
|
||||
import org.alfresco.repo.audit.model._3.DataExtractors;
|
||||
import org.alfresco.repo.audit.model._3.DataGenerators;
|
||||
import org.alfresco.repo.audit.model._3.ObjectFactory;
|
||||
import org.alfresco.repo.audit.model._3.PathMap;
|
||||
import org.alfresco.repo.audit.model._3.PathMappings;
|
||||
import org.alfresco.repo.domain.audit.AuditDAO;
|
||||
import org.alfresco.repo.domain.audit.AuditDAO.AuditApplicationInfo;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.PathMapper;
|
||||
import org.alfresco.util.registry.NamedObjectRegistry;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.extensions.surf.util.PropertyCheck;
|
||||
import org.springframework.util.ResourceUtils;
|
||||
import org.xml.sax.SAXParseException;
|
||||
|
||||
/**
|
||||
* Component used to store audit model definitions. It ensures that duplicate application and converter
|
||||
* definitions are detected and provides a single lookup for code using the Audit model.
|
||||
*
|
||||
* @author Derek Hulley
|
||||
* @since 3.2
|
||||
*/
|
||||
public class AuditModelRegistryImpl implements AuditModelRegistry
|
||||
{
|
||||
private static final String AUDIT_SCHEMA_LOCATION = "classpath:alfresco/audit/alfresco-audit-3.2.xsd";
|
||||
|
||||
private static final Log logger = LogFactory.getLog(AuditModelRegistryImpl.class);
|
||||
|
||||
private TransactionService transactionService;
|
||||
private AuditDAO auditDAO;
|
||||
private NamedObjectRegistry<DataExtractor> dataExtractors;
|
||||
private NamedObjectRegistry<DataGenerator> dataGenerators;
|
||||
|
||||
private final ReentrantReadWriteLock.ReadLock readLock;
|
||||
private final ReentrantReadWriteLock.WriteLock writeLock;
|
||||
private final ObjectFactory objectFactory;
|
||||
|
||||
private final Set<URL> auditModelUrls;
|
||||
private final List<Audit> auditModels;
|
||||
/**
|
||||
* Used to lookup path translations
|
||||
*/
|
||||
private PathMapper auditPathMapper;
|
||||
/**
|
||||
* Used to lookup the audit application java hierarchy
|
||||
*/
|
||||
private final Map<String, AuditApplication> auditApplicationsByKey;
|
||||
/**
|
||||
* Used to lookup the audit application java hierarchy
|
||||
*/
|
||||
private final Map<String, AuditApplication> auditApplicationsByName;
|
||||
|
||||
/**
|
||||
* Default constructor
|
||||
*/
|
||||
public AuditModelRegistryImpl()
|
||||
{
|
||||
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
||||
readLock = lock.readLock();
|
||||
writeLock = lock.writeLock();
|
||||
|
||||
objectFactory = new ObjectFactory();
|
||||
|
||||
auditModelUrls = new HashSet<URL>(7);
|
||||
auditModels = new ArrayList<Audit>(7);
|
||||
auditPathMapper = new PathMapper();
|
||||
auditApplicationsByKey = new HashMap<String, AuditApplication>(7);
|
||||
auditApplicationsByName = new HashMap<String, AuditApplication>(7);
|
||||
}
|
||||
|
||||
/**
|
||||
* Service to ensure DAO calls are transactionally wrapped
|
||||
*/
|
||||
public void setTransactionService(TransactionService transactionService)
|
||||
{
|
||||
this.transactionService = transactionService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the DAO used to persisted the registered audit models
|
||||
*/
|
||||
public void setAuditDAO(AuditDAO auditDAO)
|
||||
{
|
||||
this.auditDAO = auditDAO;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the registry of {@link DataExtractor data extractors}
|
||||
*/
|
||||
public void setDataExtractors(NamedObjectRegistry<DataExtractor> dataExtractors)
|
||||
{
|
||||
this.dataExtractors = dataExtractors;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the registry of {@link DataGenerator data generators}
|
||||
*/
|
||||
public void setDataGenerators(NamedObjectRegistry<DataGenerator> dataGenerators)
|
||||
{
|
||||
this.dataGenerators = dataGenerators;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures that all properties have been set for use.
|
||||
*/
|
||||
private void checkProperties()
|
||||
{
|
||||
PropertyCheck.mandatory(this, "transactionService", transactionService);
|
||||
PropertyCheck.mandatory(this, "auditDAO", auditDAO);
|
||||
PropertyCheck.mandatory(this, "dataExtractors", dataExtractors);
|
||||
PropertyCheck.mandatory(this, "dataGenerators", dataGenerators);
|
||||
}
|
||||
|
||||
/**
|
||||
* Register an audit model at a given URL.
|
||||
*
|
||||
* @param auditModelUrl the source of the model
|
||||
*/
|
||||
public void registerModel(URL auditModelUrl)
|
||||
{
|
||||
checkProperties();
|
||||
writeLock.lock();
|
||||
try
|
||||
{
|
||||
if (auditModelUrls.contains(auditModelUrl))
|
||||
{
|
||||
logger.warn("An audit model has already been registered at URL " + auditModelUrl);
|
||||
}
|
||||
auditModelUrls.add(auditModelUrl);
|
||||
}
|
||||
finally
|
||||
{
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Register an audit model at a given node reference.
|
||||
*
|
||||
* @param auditModelNodeRef the source of the audit model
|
||||
*/
|
||||
public void registerModel(NodeRef auditModelNodeRef)
|
||||
{
|
||||
checkProperties();
|
||||
writeLock.lock();
|
||||
try
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
finally
|
||||
{
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleans out all derived data
|
||||
*/
|
||||
private void clearCaches()
|
||||
{
|
||||
auditModels.clear();
|
||||
auditApplicationsByKey.clear();
|
||||
auditApplicationsByName.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.repo.audit.model.AuditModelRegistry#loadAuditModels()
|
||||
*/
|
||||
public void loadAuditModels()
|
||||
{
|
||||
checkProperties();
|
||||
|
||||
RetryingTransactionCallback<Void> loadModelsCallback = new RetryingTransactionCallback<Void>()
|
||||
{
|
||||
public Void execute() throws Throwable
|
||||
{
|
||||
// Load models from the URLs
|
||||
Set<URL> auditModelUrlsInner = new HashSet<URL>(auditModelUrls);
|
||||
for (URL auditModelUrl : auditModelUrlsInner)
|
||||
{
|
||||
try
|
||||
{
|
||||
Audit audit = AuditModelRegistryImpl.unmarshallModel(auditModelUrl);
|
||||
// That worked, so now get an input stream and write the model
|
||||
Long auditModelId = auditDAO.getOrCreateAuditModel(auditModelUrl).getFirst();
|
||||
// Now cache it (eagerly)
|
||||
cacheAuditElements(auditModelId, audit);
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
// Mainly for test purposes, we clear out the failed URL
|
||||
auditModelUrls.remove(auditModelUrl);
|
||||
clearCaches();
|
||||
|
||||
throw new AuditModelException(
|
||||
"Failed to load audit model: " + auditModelUrl,
|
||||
e);
|
||||
}
|
||||
}
|
||||
// NOTE: If we support other types of loading, then that will have to go here, too
|
||||
|
||||
// Done
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
writeLock.lock();
|
||||
// Drop all cached data
|
||||
clearCaches();
|
||||
try
|
||||
{
|
||||
auditPathMapper = new PathMapper();
|
||||
transactionService.getRetryingTransactionHelper().doInTransaction(loadModelsCallback,
|
||||
transactionService.isReadOnly(), true);
|
||||
auditPathMapper.lock();
|
||||
}
|
||||
finally
|
||||
{
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.repo.audit.model.AuditModelRegistry#getAuditApplicationByKey(java.lang.String)
|
||||
*/
|
||||
public AuditApplication getAuditApplicationByKey(String key)
|
||||
{
|
||||
readLock.lock();
|
||||
try
|
||||
{
|
||||
return auditApplicationsByKey.get(key);
|
||||
}
|
||||
finally
|
||||
{
|
||||
readLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.repo.audit.model.AuditModelRegistry#getAuditApplicationByName(java.lang.String)
|
||||
*/
|
||||
public AuditApplication getAuditApplicationByName(String applicationName)
|
||||
{
|
||||
readLock.lock();
|
||||
try
|
||||
{
|
||||
return auditApplicationsByName.get(applicationName);
|
||||
}
|
||||
finally
|
||||
{
|
||||
readLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.repo.audit.model.AuditModelRegistry#getAuditPathMapper()
|
||||
*/
|
||||
public PathMapper getAuditPathMapper()
|
||||
{
|
||||
return auditPathMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unmarshalls the Audit model from the URL.
|
||||
*
|
||||
* @throws AlfrescoRuntimeException if an IOException occurs
|
||||
*/
|
||||
public static Audit unmarshallModel(URL configUrl)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Load it
|
||||
InputStream is = new BufferedInputStream(configUrl.openStream());
|
||||
return unmarshallModel(is, configUrl.toString());
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
throw new AlfrescoRuntimeException("The Audit model XML failed to load: " + configUrl, e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unmarshalls the Audit model from a stream
|
||||
*/
|
||||
private static Audit unmarshallModel(InputStream is, final String source)
|
||||
{
|
||||
final Schema schema;
|
||||
final JAXBContext jaxbCtx;
|
||||
final Unmarshaller jaxbUnmarshaller;
|
||||
try
|
||||
{
|
||||
SchemaFactory sf = SchemaFactory.newInstance(javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI);
|
||||
schema = sf.newSchema(ResourceUtils.getURL(AUDIT_SCHEMA_LOCATION));
|
||||
jaxbCtx = JAXBContext.newInstance("org.alfresco.repo.audit.model._3");
|
||||
jaxbUnmarshaller = jaxbCtx.createUnmarshaller();
|
||||
jaxbUnmarshaller.setSchema(schema);
|
||||
jaxbUnmarshaller.setEventHandler(new ValidationEventHandler()
|
||||
{
|
||||
public boolean handleEvent(ValidationEvent ve)
|
||||
{
|
||||
if (ve.getSeverity() == ValidationEvent.FATAL_ERROR || ve.getSeverity() == ValidationEvent.ERROR)
|
||||
{
|
||||
ValidationEventLocator locator = ve.getLocator();
|
||||
logger.error("Invalid Audit XML: \n" +
|
||||
" Source: " + source + "\n" +
|
||||
" Location: Line " + locator.getLineNumber() + " column " + locator.getColumnNumber() + "\n" +
|
||||
" Error: " + ve.getMessage());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
throw new AlfrescoRuntimeException(
|
||||
"Failed to load Alfresco Audit Schema from " + AUDIT_SCHEMA_LOCATION, e);
|
||||
}
|
||||
try
|
||||
{
|
||||
// Unmarshall with validation
|
||||
@SuppressWarnings("unchecked")
|
||||
JAXBElement<Audit> auditElement = (JAXBElement<Audit>) jaxbUnmarshaller.unmarshal(is);
|
||||
|
||||
Audit audit = auditElement.getValue();
|
||||
// Done
|
||||
return audit;
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
// Dig out a SAXParseException, if there is one
|
||||
Throwable saxError = ExceptionStackUtil.getCause(e, SAXParseException.class);
|
||||
if (saxError != null)
|
||||
{
|
||||
e = saxError;
|
||||
}
|
||||
throw new AuditModelException(
|
||||
"Failed to read Audit model XML: \n" +
|
||||
" Source: " + source + "\n" +
|
||||
" Error: " + e.getMessage());
|
||||
}
|
||||
finally
|
||||
{
|
||||
try { is.close(); } catch (IOException e) {}
|
||||
}
|
||||
}
|
||||
|
||||
private void cacheAuditElements(Long auditModelId, Audit audit)
|
||||
{
|
||||
Map<String, DataExtractor> dataExtractorsByName = new HashMap<String, DataExtractor>(13);
|
||||
Map<String, DataGenerator> dataGeneratorsByName = new HashMap<String, DataGenerator>(13);
|
||||
|
||||
// Get the data extractors and check for duplicates
|
||||
DataExtractors extractorsElement = audit.getDataExtractors();
|
||||
if (extractorsElement == null)
|
||||
{
|
||||
extractorsElement = objectFactory.createDataExtractors();
|
||||
}
|
||||
List<org.alfresco.repo.audit.model._3.DataExtractor> extractorElements = extractorsElement.getDataExtractor();
|
||||
for (org.alfresco.repo.audit.model._3.DataExtractor extractorElement : extractorElements)
|
||||
{
|
||||
String name = extractorElement.getName();
|
||||
// If the name is taken, make sure that they are equal
|
||||
if (dataExtractorsByName.containsKey(name))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor '" + name + "' has already been defined.");
|
||||
}
|
||||
// Construct the converter
|
||||
final DataExtractor dataExtractor;
|
||||
if (extractorElement.getClazz() != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Class<?> dataExtractorClazz = Class.forName(extractorElement.getClazz());
|
||||
dataExtractor = (DataExtractor) dataExtractorClazz.newInstance();
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor '" + name + "' class not found: " + extractorElement.getClazz());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor '" + name + "' could not be constructed: " + extractorElement.getClazz());
|
||||
}
|
||||
}
|
||||
else if (extractorElement.getRegisteredName() != null)
|
||||
{
|
||||
String registeredName = extractorElement.getRegisteredName();
|
||||
dataExtractor = dataExtractors.getNamedObject(registeredName);
|
||||
if (dataExtractor == null)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"No registered audit data extractor exists for '" + registeredName + "'.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data extractor has no class or registered name: " + name);
|
||||
}
|
||||
// Store
|
||||
dataExtractorsByName.put(name, dataExtractor);
|
||||
}
|
||||
// Get the data generators and check for duplicates
|
||||
DataGenerators generatorsElement = audit.getDataGenerators();
|
||||
if (generatorsElement == null)
|
||||
{
|
||||
generatorsElement = objectFactory.createDataGenerators();
|
||||
}
|
||||
List<org.alfresco.repo.audit.model._3.DataGenerator> generatorElements = generatorsElement.getDataGenerator();
|
||||
for (org.alfresco.repo.audit.model._3.DataGenerator generatorElement : generatorElements)
|
||||
{
|
||||
String name = generatorElement.getName();
|
||||
// If the name is taken, make sure that they are equal
|
||||
if (dataGeneratorsByName.containsKey(name))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator '" + name + "' has already been defined.");
|
||||
}
|
||||
// Construct the generator
|
||||
final DataGenerator dataGenerator;
|
||||
if (generatorElement.getClazz() != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Class<?> dataGeneratorClazz = Class.forName(generatorElement.getClazz());
|
||||
dataGenerator = (DataGenerator) dataGeneratorClazz.newInstance();
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator '" + name + "' class not found: " + generatorElement.getClazz());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator '" + name + "' could not be constructed: " + generatorElement.getClazz());
|
||||
}
|
||||
}
|
||||
else if (generatorElement.getRegisteredName() != null)
|
||||
{
|
||||
String registeredName = generatorElement.getRegisteredName();
|
||||
dataGenerator = dataGenerators.getNamedObject(registeredName);
|
||||
if (dataGenerator == null)
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"No registered audit data generator exists for '" + registeredName + "'.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit data generator has no class or registered name: " + name);
|
||||
}
|
||||
// Store
|
||||
dataGeneratorsByName.put(name, dataGenerator);
|
||||
}
|
||||
// Get the application and check for duplicates
|
||||
List<Application> applications = audit.getApplication();
|
||||
for (Application application : applications)
|
||||
{
|
||||
String key = application.getKey();
|
||||
if (auditApplicationsByKey.containsKey(key))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit application key '" + key + "' is used by: " + auditApplicationsByKey.get(key));
|
||||
}
|
||||
|
||||
String name = application.getName();
|
||||
if (auditApplicationsByName.containsKey(name))
|
||||
{
|
||||
throw new AuditModelException(
|
||||
"Audit application '" + name + "' is used by: " + auditApplicationsByName.get(name));
|
||||
}
|
||||
|
||||
// Get the ID of the application
|
||||
AuditApplicationInfo appInfo = auditDAO.getAuditApplication(name);
|
||||
if (appInfo == null)
|
||||
{
|
||||
appInfo = auditDAO.createAuditApplication(name, auditModelId);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Update it with the new model ID
|
||||
auditDAO.updateAuditApplicationModel(appInfo.getId(), auditModelId);
|
||||
}
|
||||
|
||||
AuditApplication wrapperApp = new AuditApplication(
|
||||
dataExtractorsByName,
|
||||
dataGeneratorsByName,
|
||||
application,
|
||||
appInfo.getId(),
|
||||
appInfo.getDisabledPathsId());
|
||||
auditApplicationsByName.put(name, wrapperApp);
|
||||
auditApplicationsByKey.put(key, wrapperApp);
|
||||
}
|
||||
// Pull out all the audit path maps
|
||||
buildAuditPathMap(audit);
|
||||
// Store the model itself
|
||||
auditModels.add(audit);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct the reverse lookup maps for quick conversion of data to target maps
|
||||
*/
|
||||
private void buildAuditPathMap(Audit audit)
|
||||
{
|
||||
PathMappings pathMappings = audit.getPathMappings();
|
||||
if (pathMappings == null)
|
||||
{
|
||||
pathMappings = objectFactory.createPathMappings();
|
||||
}
|
||||
for (PathMap pathMap : pathMappings.getPathMap())
|
||||
{
|
||||
String sourcePath = pathMap.getSource();
|
||||
String targetPath = pathMap.getTarget();
|
||||
auditPathMapper.addPathMap(sourcePath, targetPath);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user