In EJB3.1, data-source(s) can be defined in the ejb-jar.xml file as well as using the @DataSourceDefinition on ejb components. In the ejb-jar.xml file, the data-source element appears as part of the jndiEnvironmentRefsGroup and can be deployed for individual EJB components. Similarly, the @DataSourceDefinition(s) annotation can appear on each EJB type. Currently, the EJB metadata does not parse or create this portion of metadata. This needs to be added to support the EE6 specification part EE5.17 and exposed to clients that need this information to deploy the data source (ie, the new DataSourceDeployer as part of the connector project.