Renamed <jdbc:dataSource into <jdbc:data-source (to be consistent with all other element names)
Remove id attribute for data-source element resolves #21