JSP is a view technology which allows interaction with
Java in form of taglibs and EL.
JSF is a component based MVC framework which provides taglibs for use in JSP.
When you want to use JSF, I highly recommend
Facelets as view technology over JSP. Facelets is going to be the default supported view technology as per the upcoming JSF 2.0.