Merge changes from GERONIMO-6341 orm.xml does not take effect in latest Geronimo 3.0 beta branch.

git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1341511 13f79535-47bb-0310-9956-ffa450edef68
7 files changed