Tidy for Eclipse
Port jena: code to current codebase