Mark the servlet API as provided

Shipping it doesn't seem to make much sense
Rely on tomcats datasource to provide the connection
Add support for displaying markers as portals