refactored a bit and also upgraded to camel 2.11.0 and spring 3.2.2