[Date: Thu May 08 01:15:55 CEST 2014, Author: julianhyde]
Sorry I took so long to review this.
`FrameworkContext` should not live in `net.hydromatic.optiq.tools`, since it is used in several packages. Can you find a better name and place for it.
Regarding the name. The `Framework` would need to go, but you can keep `Context`. ("Context" is an over-used term, and there is already a `OptiqPrepare.Context`, but I see that `Context` is the term of art in dependency-injection, which is what this thing does.)
I suggest you make `StdFrameworkConfig` private (or at least package protected) and move `StdFrameworkConfig.newBuilder` to `Frameworks`. We don't want people to start depending on the "standard" config class.
And there is some crap to be cleaned up: '//' on the end of some lines; some broken javadoc (make sure `mvn site` works).
No need to rebase master - I checked and the latest merges just fine.