Take a look for the coming IntellyJ Idea feature: http://blogs.jetbrains.com/idea/2009/07/writing-jsf-20-composite-components-in-maia/ .
In addition to simple components creation, tool could help to extract template or fragment for include from page source.
Because Facelets and JSP 2.1 have a similar abilites, that feature could be useful for existing JSF 2.1 tools too.