Follow all the rules for section 5 of the Java EE public draft. Specifically:

• Section 5.2.3 on how @Resource.name() @EJB.name(), etc.. will default to the FQN of the class/fieldname or setter name. Get me?
• @Resource should have a mappedName() attribute added to it. Our @Resource annotation should use this attribute for its global JNDI lookup name. The @Resource.name() should default as specified in Section 5.2.3. If no mappedName() is specified, then throw an error (except for things like SessionContext, UserTransaction, etc...)
• Add a mapped-name element to resource-env-ref and other XML ref types:

http://java.sun.com/xml/ns/javaee/javaee_5.xsd
mapped-name should be used for what we bind to Global JNDI. For instance

<resource-env-ref>
<mapped-name>java:/DefaultDS</mapped-name>
</resource-env-ref>