removed warnings and move to spring 3.0