Tomcat CP support #2

Add support for Tomcat JDBC CP