Thanks @pgesek, looks good to me at first glance - thanks for doing all of that necessary refactoring work! I didn't pore over this too closely, but one quick question- what is the minimum openmrs version this supports? I see references to 1.7 and 1.8 OpenMRS profiles. I also see a comment:
<!-- include groovy, but mark as provided since it is included with openmrs-core v1.10+--
Generally I think we should make this module support 1.9+ (it may be required by the mdrtb module, which is on 1.9). It's possible though that this isn't even a requirement and we could go higher. If we change the minimum version in config.xml, we might as well get rid of the older OpenMRS profiles for testing as well.
Thanks for working on this,