Converted remote-invoke to OSGi