Added code samples to show the javaconfig and hybrid ways to configure a spring container