* add Spring Retry * remove redundant code * convert tab to space in XML file * align spaces in xml file