XD-1599 replacing springsource references