I'll clone your github repo and take a look; is the original pkg-java SVN repo available still? Getting an idea of the delta will help me calibrate.