OSGi resource registration via SCR (#11166)

* Changed the way resources, themes, and widgetsets are registered to the HttpService by only using the VaadinResourceTrackerComponent

1 files changed, 6 insertions, 23 deletions

diff --git a/compatibility-client-compiled/src/main/java/com/vaadin/osgi/compatibility/widgetset/CompatibilityWidgetsetContribution.java b/compatibility-client-compiled/src/main/java/com/vaadin/osgi/compatibility/widgetset/CompatibilityWidgetsetContribution.java
index 155d7070b3..b4b7d5c064 100644
--- a/compatibility-client-compiled/src/main/java/com/vaadin/osgi/compatibility/widgetset/CompatibilityWidgetsetContribution.java
+++ b/compatibility-client-compiled/src/main/java/com/vaadin/osgi/compatibility/widgetset/CompatibilityWidgetsetContribution.java
@@ -15,33 +15,16 @@
  */
 package com.vaadin.osgi.compatibility.widgetset;
 
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.http.HttpService;
 
-import com.vaadin.osgi.resources.OsgiVaadinResources;
-import com.vaadin.osgi.resources.VaadinResourceService;
-
-@Component(immediate = true)
-public class CompatibilityWidgetsetContribution {
-    private HttpService httpService;
+import com.vaadin.osgi.resources.OsgiVaadinWidgetset;
 
+@Component
+public class CompatibilityWidgetsetContribution implements OsgiVaadinWidgetset {
     private static final String WIDGETSET_NAME = "com.vaadin.v7.Vaadin7WidgetSet";
 
-    @Activate
-    void startup(ComponentContext context) throws Exception {
-        VaadinResourceService service = OsgiVaadinResources.getService();
-        service.publishWidgetset(WIDGETSET_NAME, httpService);
-    }
-
-    @Reference
-    void setHttpService(HttpService httpService) {
-        this.httpService = httpService;
-    }
-
-    void unsetHttpService(HttpService httpService) {
-        this.httpService = null;
+    @Override
+    public String getName() {
+        return WIDGETSET_NAME;
     }
 }