dao and service layer integration
fix integration test and modify xml structure