just before using context.xml in tap-service as well (major restructuring endeavour)