I branched the CVS today for 2.2
2.2 will contains bug fixes only as well as 2.0, the next release will be 2.2.1 and 2.0.2
The new module name to get portal 2.4 is jboss-portal-2.4, I have created a wiki entry that contains the most used cvs checkouts http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalCVS