From 2b5001be0f2d15718eae39659f0d6847abc155de Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Mon, 21 Mar 2011 13:00:38 -0700
Subject: [PATCH] Renaming OrchardDependencyReplaceAttribute to
 OrchardSuppressDependencyAttribute.

--HG--
branch : dev
---
 .../Environment/DefaultCompositionStrategyTests.cs        | 4 ++--
 .../Extensions/OrchardDependencyReplaceAttribute.cs       | 8 ++++----
 .../Environment/ShellBuilders/CompositionStrategy.cs      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs b/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs
index d207155eb..468aa3932 100644
--- a/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs
+++ b/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs
@@ -313,13 +313,13 @@ namespace Orchard.Tests.Environment {
             Assert.That(blueprint.Dependencies.FirstOrDefault(dependency => dependency.Type.Equals(typeof(StubNestedType))), Is.Not.Null);
         }
 
-        [OrchardDependencyReplace("Orchard.Tests.Environment.DefaultCompositionStrategyTests+ReplacedStubNestedType")]
+        [OrchardSuppressDependency("Orchard.Tests.Environment.DefaultCompositionStrategyTests+ReplacedStubNestedType")]
         internal class StubNestedType : IDependency {}
 
         internal class ReplacedStubNestedType : IDependency {}
     }
 
-    [OrchardDependencyReplace("Orchard.Tests.Environment.ReplacedStubType")]
+    [OrchardSuppressDependency("Orchard.Tests.Environment.ReplacedStubType")]
     internal class StubType : IDependency { }
 
     internal class ReplacedStubType : IDependency { }
diff --git a/src/Orchard/Environment/Extensions/OrchardDependencyReplaceAttribute.cs b/src/Orchard/Environment/Extensions/OrchardDependencyReplaceAttribute.cs
index 7b0a19b74..248a54985 100644
--- a/src/Orchard/Environment/Extensions/OrchardDependencyReplaceAttribute.cs
+++ b/src/Orchard/Environment/Extensions/OrchardDependencyReplaceAttribute.cs
@@ -2,11 +2,11 @@
 
 namespace Orchard.Environment.Extensions {
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-    public class OrchardDependencyReplaceAttribute : Attribute {
-        public OrchardDependencyReplaceAttribute(string dependency) {
-            Dependency = dependency;
+    public class OrchardSuppressDependencyAttribute : Attribute {
+        public OrchardSuppressDependencyAttribute(string fullName) {
+            FullName = fullName;
         }
 
-        public string Dependency { get; set; }
+        public string FullName { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs b/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
index 4e64d0727..d9e63ac80 100644
--- a/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
+++ b/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
@@ -77,8 +77,8 @@ namespace Orchard.Environment.ShellBuilders {
             // Identify replaced types
             foreach(Feature feature in features) {
                 foreach (Type type in feature.ExportedTypes) {
-                    foreach (OrchardDependencyReplaceAttribute replacedType in type.GetCustomAttributes(typeof(OrchardDependencyReplaceAttribute), false)) {
-                        excludedTypes.Add(replacedType.Dependency);
+                    foreach (OrchardSuppressDependencyAttribute replacedType in type.GetCustomAttributes(typeof(OrchardSuppressDependencyAttribute), false)) {
+                        excludedTypes.Add(replacedType.FullName);
                     }
                 }
             }