Add support for Sun and Oracle Java