From 686ff742633c3d18bf86a5997b352fb8a54a868d Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Wed, 18 Aug 2010 11:40:14 +0000
Subject: [PATCH] Fix RepositoryStartStopTest; issues with... -
 minimal-context.xml not pulling in appropriate dependencies for persistent
 scheduled actions - audit failing to register CMIS change log extractor
 (failed locally, but not on build machine for some reason)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/action-services-context.xml   | 10 +++
 config/alfresco/audit/alfresco-audit-cmis.xml | 66 -------------------
 config/alfresco/scheduled-jobs-context.xml    | 11 ----
 3 files changed, 10 insertions(+), 77 deletions(-)
 delete mode 100644 config/alfresco/audit/alfresco-audit-cmis.xml

diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index 5c88fec8d8..8d7f46ddc4 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -138,6 +138,16 @@
         <property name="actionTrackingService" ref="actionTrackingService"/>
     </bean>
 
+    <!-- Supports scheduled, persisted actions -->
+    <bean id="scheduledPersistedActionService" class="org.alfresco.repo.action.scheduled.ScheduledPersistedActionServiceImpl">
+        <property name="nodeService" ref="NodeService" />
+        <property name="startupNodeService" ref="nodeService" />
+        <property name="runtimeActionService" ref="actionService"/>
+        <property name="repositoryHelper" ref="repositoryHelper"/>
+        <property name="scheduler">
+            <ref bean="schedulerFactory" />
+        </property>
+    </bean>
 
    <!-- Actions Aspect -->
    
diff --git a/config/alfresco/audit/alfresco-audit-cmis.xml b/config/alfresco/audit/alfresco-audit-cmis.xml
deleted file mode 100644
index 56b487e013..0000000000
--- a/config/alfresco/audit/alfresco-audit-cmis.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Audit xmlns="http://www.alfresco.org/repo/audit/model/3.2"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.alfresco.org/repo/audit/model/3.2 alfresco-audit-3.2.xsd">
-
-    <DataExtractors>
-       <DataExtractor name="simpleValue" registeredName="auditModel.extractor.simpleValue"/>
-       <DataExtractor name="nullValue" registeredName="auditModel.extractor.nullValue"/>
-       <DataExtractor name="changeLog" registeredName="CMISChangeLogDataExtractor"/>
-    </DataExtractors>
-
-    <PathMappings>
-        <PathMap source="/CMISChangeLog" target="/CMISChangeLog" />
-        <PathMap source="/alfresco-api/post/FileFolderService/create" target="/CMISChangeLog/CREATED" />
-        <PathMap source="/alfresco-api/post/NodeService/setProperties" target="/CMISChangeLog/UPDATED" />
-        <PathMap source="/alfresco-api/post/NodeService/addProperties" target="/CMISChangeLog/UPDATED" />
-        <PathMap source="/alfresco-api/post/NodeService/setProperty" target="/CMISChangeLog/UPDATED" />
-        <PathMap source="/alfresco-api/post/NodeService/removeProperty" target="/CMISChangeLog/UPDATED" />
-        <PathMap source="/alfresco-node/beforeDeleteNode" target="/CMISChangeLog/DELETED" />
-        <PathMap source="/alfresco-api/post/PermissionService/setPermission" target="/CMISChangeLog/SECURITY" />
-        <PathMap source="/alfresco-api/post/PermissionService/setInheritParentPermissions" target="/CMISChangeLog/SECURITY" />
-        <PathMap source="/alfresco-api/post/PermissionService/clearPermission" target="/CMISChangeLog/SECURITY" />
-        <PathMap source="/alfresco-api/post/PermissionService/deletePermission" target="/CMISChangeLog/SECURITY" />
-    </PathMappings>
-
-    <Application name="CMISChangeLog" key="CMISChangeLog">
-        <AuditPath key="CREATED">
-            <AuditPath key="result">
-                <RecordValue key="value" dataExtractor="changeLog" />
-            </AuditPath>
-            <AuditPath key="error">
-                <RecordValue key="value" dataExtractor="nullValue" />
-            </AuditPath>
-        </AuditPath>
-
-        <AuditPath key="UPDATED">
-            <AuditPath key="args">
-                 <AuditPath key="nodeRef">
-                    <RecordValue key="value" dataExtractor="changeLog" />
-                 </AuditPath>
-            </AuditPath>
-            <AuditPath key="error">
-                <RecordValue key="value" dataExtractor="nullValue" />
-            </AuditPath>
-        </AuditPath>
-
-        <AuditPath key="DELETED">
-            <AuditPath key="node">
-                <RecordValue key="value" dataExtractor="changeLog" />
-            </AuditPath>
-        </AuditPath>
-        
-        <AuditPath key="SECURITY">
-            <AuditPath key="args">
-                 <AuditPath key="nodeRef">
-                    <RecordValue key="value" dataExtractor="changeLog" />
-                 </AuditPath>
-            </AuditPath>
-            <AuditPath key="error">
-                <RecordValue key="value" dataExtractor="nullValue" />
-            </AuditPath>
-        </AuditPath>        
-    </Application>
-
-</Audit>
diff --git a/config/alfresco/scheduled-jobs-context.xml b/config/alfresco/scheduled-jobs-context.xml
index 8fa4faef8d..a99fbf944a 100644
--- a/config/alfresco/scheduled-jobs-context.xml
+++ b/config/alfresco/scheduled-jobs-context.xml
@@ -483,15 +483,4 @@
           
     </bean>
     
-    <!-- Supports scheduled, persisted actions -->
-    <bean id="scheduledPersistedActionService" class="org.alfresco.repo.action.scheduled.ScheduledPersistedActionServiceImpl">
-        <property name="nodeService" ref="NodeService" />
-        <property name="startupNodeService" ref="nodeService" />
-        <property name="runtimeActionService" ref="actionService"/>
-        <property name="repositoryHelper" ref="repositoryHelper"/>
-        <property name="scheduler">
-            <ref bean="schedulerFactory" />
-        </property>
-    </bean>
-
 </beans>