initial support for JDK7 (just enough to get all tests to pass)