For this kind of thing, do you think we should have a stateless (or Application) component that does this component resolution for us? If we centralize all Service locator style requests behind a facade of sorts, migrating later to Seam 3 or whatever we choose might be easier.
(Obviously not for this pull request)