moving to Java Config from xml

Change-Id: If70206c41602a055665396291d711d09603dfbbe