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

RM-745 (Event and property filtering not available for audit)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-08-14 12:38:59 +00:00
parent 93e566ea7e
commit b446ae8e07
2 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
View File

@@ -184,6 +184,7 @@
<property name="permissionService" ref="PermissionService" /> <property name="permissionService" ref="PermissionService" />
<property name="mimetypeService" ref="mimetypeService" /> <property name="mimetypeService" ref="mimetypeService" />
<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" /> <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
<property name="namespaceService" ref="namespaceService" />
</bean> </bean>
<!-- REST impl for PUT Audit Log (starting and stopping auditing) --> <!-- REST impl for PUT Audit Log (starting and stopping auditing) -->
@@ -507,20 +508,20 @@
<property name="customEmailMappingService" ref="CustomEmailMappingService" /> <property name="customEmailMappingService" ref="CustomEmailMappingService" />
</bean> </bean>
<!-- REST impl for GET Action Defitions for RM --> <!-- REST impl for GET Action Defitions for RM -->
<bean id="webscript.org.alfresco.repository.rule.rm-actiondefinitions.get" <bean id="webscript.org.alfresco.repository.rule.rm-actiondefinitions.get"
class="org.alfresco.repo.web.scripts.rule.RmActionDefinitionsGet" class="org.alfresco.repo.web.scripts.rule.RmActionDefinitionsGet"
parent="webscript"> parent="webscript">
<property name="recordsManagementActionService" ref="RecordsManagementActionService"/> <property name="recordsManagementActionService" ref="RecordsManagementActionService"/>
</bean> </bean>
<!-- REST impl for GET Action Condition Defitions for RM --> <!-- REST impl for GET Action Condition Defitions for RM -->
<bean id="webscript.org.alfresco.repository.rule.rm-actionconditiondefinitions.get" <bean id="webscript.org.alfresco.repository.rule.rm-actionconditiondefinitions.get"
class="org.alfresco.repo.web.scripts.rule.RmActionConditionDefinitionsGet" class="org.alfresco.repo.web.scripts.rule.RmActionConditionDefinitionsGet"
parent="webscript"> parent="webscript">
<property name="actionService" ref="ActionService"/> <property name="actionService" ref="ActionService"/>
<property name="recordsManagementActionService" ref="RecordsManagementActionService"/> <property name="recordsManagementActionService" ref="RecordsManagementActionService"/>
</bean> </bean>
@@ -531,6 +532,7 @@
<property name="mimetypeService" ref="mimetypeService"/> <property name="mimetypeService" ref="mimetypeService"/>
<property name="recordsManagementAuditService" ref="RecordsManagementAuditService"/> <property name="recordsManagementAuditService" ref="RecordsManagementAuditService"/>
<property name="contentStreamer" ref="webscript.content.streamer" /> <property name="contentStreamer" ref="webscript.content.streamer" />
<property name="namespaceService" ref="namespaceService" />
</bean> </bean>
<!-- REST impl for GET Class Definitions for RM/DM --> <!-- REST impl for GET Class Definitions for RM/DM -->

14
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditRetrievalWebScript.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.repo.web.scripts.content.StreamContent;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.InvalidQNameException; import org.alfresco.service.namespace.InvalidQNameException;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -58,6 +59,7 @@ public class BaseAuditRetrievalWebScript extends StreamContent
protected final static String DATE_PATTERN = "yyyy-MM-dd"; protected final static String DATE_PATTERN = "yyyy-MM-dd";
protected RecordsManagementAuditService rmAuditService; protected RecordsManagementAuditService rmAuditService;
protected NamespaceService namespaceService;
/** /**
* Sets the RecordsManagementAuditService instance * Sets the RecordsManagementAuditService instance
@@ -69,6 +71,16 @@ public class BaseAuditRetrievalWebScript extends StreamContent
this.rmAuditService = rmAuditService; this.rmAuditService = rmAuditService;
} }
/**
* Sets the NamespaceService instance
*
* @param namespaceService The NamespaceService instance
*/
public void setNamespaceService(NamespaceService namespaceService)
{
this.namespaceService = namespaceService;
}
/** /**
* Parses the given request and builds an instance of * Parses the given request and builds an instance of
* RecordsManagementAuditQueryParameters to retrieve the relevant audit entries * RecordsManagementAuditQueryParameters to retrieve the relevant audit entries
@@ -209,7 +221,7 @@ public class BaseAuditRetrievalWebScript extends StreamContent
{ {
try try
{ {
params.setProperty(QName.createQName(property)); params.setProperty(QName.createQName(property, namespaceService));
} }
catch (InvalidQNameException iqe) catch (InvalidQNameException iqe)
{ {