Hi, a last tip: for development, note that the 2.0.x branch is in maintenance mode so it changes only a little (and requires Java 6 or higher), while trunk requires minimum Java 7 and there could be many changes during next weeks ...
Probably a simpler thing could be in your case to have your workspace work on a branch derived from 2.0.x ... Let's update. Bye
