Which CVS branch to work on?

I lost track of what was going on in the DWR CVS repository, and I'm trying to find my way back so I can address some long-standing issues with the DWR-Guice integration.

I notice that Joe has edited many if not all of the files in org.directwebremoting.guice since the Version_2_0_2_RC3 tag was applied. The revision message is "adding missing comments, and removing warnings from guice".

Are these being considered for release as part of 2.0.2? I hope not, because I can't compile with against these revisions. I get this message about one of my extensions of AbstractMapContextScope:

[My class] is not abstract and does not override abstract method <T>remove(ConcurrentMap<?,?>,Key<T>, String, InstanceProvider<T>) in ContextRegistry

AbstractMapContextScope has a remove method declared with:

public <T> boolean remove(ConcurrentMap<Key<T>, InstanceProvider<T>> registry, Key<T> key, String keyString, InstanceProvider<T> creator) {...}

ConcurrentMap<?, ?> is not the same thing as ConcurrentMap<Key<T>, InstanceProvider<T>>, so that explains the error message. Not sure what to do about it, but I'll try to make things nice without resorting to raw types.

Should I be addressing this and other issues in the HEAD revisions, or is there a branch that I should be using?

What happened to Subversion?

--tim