move from annotations to XML configuration where appropriate

Some of the current configuration is performed using annotations such as `@RequestMapping`. This is very convenient when building a fixed configuration but isn't flexible particularly towards situations where the controller bean is instantiated more than once.

Examine all uses of annotations to see whether future flexibility requires them to be moved into the equivalent XML configuration.
