replaced XML configuration with Java configuration