Merge branch 'master' of https://github.com/SpringSource/spring-net

src/Spring/Spring.Core/Spring.Core.2008.csproj

@@ -1108,6 +1108,7 @@
     <Compile Include="Reflection\Dynamic\DynamicReflectionManager.cs" />
     <Compile Include="Stereotype\ComponentAttribute.cs" />
     <Compile Include="Stereotype\RepositoryAttribute.cs" />
+    <Compile Include="Stereotype\ControllerAttribute.cs" />
     <Compile Include="Stereotype\ServiceAttribute.cs" />
     <Compile Include="Threading\CallContextStorage.cs" />
     <Compile Include="Threading\ISync.cs" />

src/Spring/Spring.Core/Spring.Core.2010.csproj

@@ -713,6 +713,7 @@
     <Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
     <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
     <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
+    <Compile Include="Stereotype\ControllerAttribute.cs" />
     <Compile Include="Util\ConstructorInstantiationInfo.cs" />
     <Compile Include="Objects\Factory\Support\GenericObjectDefinition.cs" />
     <Compile Include="Objects\Factory\Support\IAutowireCandidateResolver.cs" />

src/Spring/Spring.Core/Stereotype/ControllerAttribute.cs

@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
+
+namespace Spring.Stereotype
+{
+    /// <summary>
+    /// Indicates that an annotated class is a "Controller" (e.g. a MVC Controller).
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This attribute also serves as a specialization of the ComponentAttribute, allowing implementation
+    /// classes to be autodetected in future releases through assembly scanning.
+    /// </para>
+    /// </remarks>
+    /// <author>Thomas Trageser</author>
+    public class ControllerAttribute : ComponentAttribute
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControllerAttribute"/> class.
+        /// </summary>
+        public ControllerAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControllerAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        public ControllerAttribute(string name)
+            : base(name)
+        {
+        }
+
+
+    }
+}