fix java version (java 6)
huge refactoring ! uses spring injection