Feature/3.x/issue #599

fix for issue #599 
* XSD refactor
* client config enhenced
* spring config enhenced