Your second option would be the best approach according to Tomcat Documentations
It is NOT recommended to place elements directly in the server.xml file. This is because it makes modifying the Context configuration more invasive since the main conf/server.xml file cannot be reloaded without restarting Tomcat.
Informational link:
Apache Tomcat Configuration Reference (6.0.41) - The Context Container