fixed and little refactor on the project, only jaxb implementation for going to production :)