added javahome, catalinahome, etc.