Added more data on env
Added glassfish specific descriptor

Should be removed later.