Currently when we have separate configurations for XA sources and Non-XA sources, these should be combined into one definition, and by default we should make attempt use the data sources instead of Drivers. This will make it easy on the user in specifying the properties rather than coming up with unique URL for the data source.

This will add

DatabaseName
ServerName
Port

properties in addition to already provided,

User
Password
URL -> expert=true

properties. The URL property will be set to "expert", so that if one needs to use the Driver, you can still use it. In addition this needs to provide support to add additional properties that may be needed by the specific data source. For this add

OptionalProperties

This should be supplied in the format [name=value;name=value] and runtime engines should support these to add these properties as DataSource bean properties.