BISERVER-10435: Added Jersey tags to DatasourceCatalog.  Added JAXB annotations to referenced classes.  Applied formatting