Apache moves Geronimo to OSGi base