Upgrade to gatein_resources_1_5