GERONIMO-6446: Use genesis 2.1 and other changes to compile with Java 7

git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/branches/3.0@1466631 13f79535-47bb-0310-9956-ffa450edef68