Refactored oracle-java and initial java7 support