partial commit spring xml branch