WEB-139 - Making this an OSGI guy