Revert "Removed unused @controller annotations from controllers."

When I removed @controller annotations I, probably, violate some conventions in Spring and he didn't
register my controllers in context after this.

This reverts commit a975d89.

Author: php-coder

src/main/config/pmd.xml

@@ -144,26 +144,27 @@ public class UserService {
 
 	<rule
 		name="FieldInjectionInControllers"
-		message="Use constructor injection instead of field injection in controllers"
+		message="Use constructor injection instead of field injection in @Controller-s"
 		class="net.sourceforge.pmd.lang.rule.XPathRule"
 		language="java">
 
 		<description>
-			Prefer constructor injection over field injection in controller classes.
+			Prefer constructor injection over field injection in @Controller classes.
 		</description>
 
 		<properties>
 			<property name="xpath">
 				<value>
 <![CDATA[
-//ClassOrInterfaceDeclaration[ends-with(@Image, "Controller")]//FieldDeclaration[../Annotation/*/Name[@Image="Autowired" or @Image="Inject"]]
+//TypeDeclaration[Annotation/*/Name[@Image="Controller"]]//FieldDeclaration[../Annotation/*/Name[@Image="Autowired" or @Image="Inject"]]
 ]]>
 				</value>
 			</property>
 		</properties>
 		<priority>4</priority>
 		<example>
 <![CDATA[
+@Controller
 public class UserController {
     @Inject
     private UserDao userDao;

src/main/java/ru/mystamps/web/controller/AccountController.java

@@ -21,6 +21,7 @@
 import javax.validation.Valid;
 
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -42,6 +43,7 @@
 import ru.mystamps.web.model.RegisterAccountForm;
 import ru.mystamps.web.service.UserService;
 
+@Controller
 public class AccountController {
 
 	private final UserService userService;

src/main/java/ru/mystamps/web/controller/CountryController.java

@@ -21,6 +21,7 @@
 import javax.validation.Valid;
 
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -36,6 +37,7 @@
 import ru.mystamps.web.model.AddCountryForm;
 import ru.mystamps.web.service.CountryService;
 
+@Controller
 public class CountryController {
 
 	private final CountryService countryService;

src/main/java/ru/mystamps/web/controller/ImageController.java

@@ -21,13 +21,15 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.Url;
 
+@Controller
 public class ImageController {
 
 	@RequestMapping(value = Url.GET_IMAGE_PAGE, method = RequestMethod.GET)

src/main/java/ru/mystamps/web/controller/NotFoundErrorController.java

@@ -23,6 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -32,6 +33,7 @@
 import ru.mystamps.web.service.SiteService;
 import ru.mystamps.web.support.spring.security.CustomUserDetails;
 
+@Controller
 @RequestMapping(Url.NOT_FOUND_PAGE)
 public class NotFoundErrorController {
 	private static final Logger LOG = LoggerFactory.getLogger(NotFoundErrorController.class);

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.BindingResult;
@@ -47,6 +48,7 @@
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.CatalogUtils;
 
+@Controller
 public class SeriesController {
 
 	private static final Integer SINCE_YEAR     = 1840;