added generic parameters to use java 7 benefits.
removed embedded osgi.core classes