From 556716a4e6b481fcc02579b80a2a34c7f713b0cc Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Mon, 12 May 2014 15:29:03 -0700
Subject: [PATCH] Moving workflow activities to their own feature

---
 .../Modules/Orchard.Email/Activities/EmailActivity.cs     | 2 ++
 src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs  | 3 +++
 src/Orchard.Web/Modules/Orchard.Email/Module.txt          | 8 ++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs b/src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs
index 634be6803..299f27762 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Email.Services;
+using Orchard.Environment.Extensions;
 using Orchard.Events;
 using Orchard.Localization;
 using Orchard.Messaging.Services;
@@ -11,6 +12,7 @@ namespace Orchard.Email.Activities {
         void Enqueue(string message, object parameters, int priority);
     }
 
+    [OrchardSuppressDependency("Orchard.Email.Workflows")]
     public class EmailActivity : Task {
         private readonly IMessageService _messageService;
         private readonly IJobsQueueService _jobsQueueService;
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs b/src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs
index 39d44589d..b511ce1b0 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs
@@ -2,11 +2,14 @@
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.DisplayManagement;
+using Orchard.Environment.Extensions;
 using Orchard.Environment.Features;
 using Orchard.Forms.Services;
 using Orchard.Localization;
 
 namespace Orchard.Email.Forms {
+
+    [OrchardSuppressDependency("Orchard.Email.Workflows")]
     public class EmailForm : Component, IFormProvider {
         private readonly IFeatureManager _featureManager;
         protected dynamic New { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Module.txt b/src/Orchard.Web/Modules/Orchard.Email/Module.txt
index a287cb351..97a01a88b 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Email/Module.txt
@@ -8,6 +8,10 @@ Description: The Email Messaging module adds Email sending functionalities.
 Features:
     Orchard.Email:
         Name: Email Messaging
-        FeatureDescription: Email Messaging services.
+        Description: Email Messaging services.
         Category: Messaging
-        Dependencies: Orchard.Workflows
+    Orchard.Email.Workflows:
+        Name: Email Workflows Activities
+        Description: Provides email sending activities.
+        Category: Workflows
+        Dependencies: Orchard.Email, Orchard.Workflows
\ No newline at end of file