From 1658cfe76bd506c26080910e88285f954408412c Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Fri, 22 Nov 2013 09:30:29 +0000
Subject: [PATCH] CLOUD-2182: Daily email notifications are not sent/received.

Added enabled properties for all the activity related jobs so they can easily be disabled by devops.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../ActivitiesFeed/default/activities-jobs-context.xml      | 4 ++++
 .../ActivitiesFeed/default/activities-jobs.properties       | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
index 26a87959da..efd3647ef9 100644
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
@@ -22,6 +22,7 @@
         <property name="jobDetail" ref="feedCleanerJobDetail" />
         <property name="scheduler" ref="schedulerFactory" />
         <property name="cronExpression" value="${activities.feed.cleaner.cronExpression}" />
+        <property name="enabled" value="${activities.feed.cleaner.enabled}" />
     </bean>
     
     <!-- Activities Feed Generator -->
@@ -43,6 +44,7 @@
         <property name="jobDetail" ref="feedGeneratorJobDetail" />
         <property name="scheduler" ref="schedulerFactory" />
         <property name="cronExpression" value="${activities.feed.generator.cronExpression}" />
+        <property name="enabled" value="${activities.feed.generator.enabled}" />
     </bean>
     
     <!-- Activities Post Lookup (for secondary lookup) -->
@@ -63,6 +65,7 @@
         <property name="jobDetail" ref="postLookupJobDetail" />
         <property name="scheduler" ref="schedulerFactory" />
         <property name="cronExpression" value="${activities.post.lookup.cronExpression}" />
+        <property name="enabled" value="${activities.post.lookup.enabled}" />
     </bean>
     
     <!-- Activities Post Cleaner -->
@@ -84,6 +87,7 @@
         <property name="jobDetail" ref="postCleanerJobDetail" />
         <property name="scheduler" ref="schedulerFactory" />
         <property name="cronExpression" value="${activities.post.cleaner.cronExpression}" />
+        <property name="enabled" value="${activities.post.cleaner.enabled}" />
     </bean>
     
      <!-- Activities Email Notifier -->
diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
index 3fda4d6684..b24c6cccc1 100644
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
@@ -19,14 +19,18 @@ activities.feed.notifier.emailTemplateLocationType=xpath
 # activities feed generator
 activities.feed.generator.cronExpression=0/30 * * * * ?
 activities.feed.generator.maxItemsPerCycle=100
+activities.feed.generator.enabled=true
 
 # activities feed cleaner
 # repeat every 10 mins
 activities.feed.cleaner.cronExpression=0 0/10 * * * ?
+activities.feed.cleaner.enabled=true
 
 # activities post cleaner
 activities.post.cleaner.cronExpression=0 0/10 * * * ?
+activities.post.cleaner.enabled=true
 
 # activities post lookup
 activities.post.lookup.cronExpression=0/15 * * * * ?
-activities.post.lookup.maxItemsPerCycle=500
\ No newline at end of file
+activities.post.lookup.maxItemsPerCycle=500
+activities.post.lookup.enabled=true
\ No newline at end of file