Add OSGi support vaadin#8830 vaadin#8827 vaadin#8828 vaadin#8829

Use bnd-maven-plugin instead of maven-bundle-plugin and helper class, and add support for publishing static resources such as themes and widgetsets.
mmerruko · Mar 28, 2017 · 687a900 · 687a900
1 parent 3d018d4
commit 687a900
Show file tree

Hide file tree

Showing 30 changed files with 647 additions and 578 deletions.
diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java
diff --git a/client-compiled/bnd.bnd b/client-compiled/bnd.bnd
@@ -0,0 +1,6 @@
+Bundle-SymbolicName: ${project.groupId}.client.compiled
+Bundle-Name: Default Widgetset
+Bundle-Version: ${osgi.bundle.version}
+Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
+    *
+Export-Package: com.vaadin.osgi.widgetset;-noimport:=true
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
@@ -29,6 +29,13 @@
 			<scope>provided</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-shared</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>vaadin-client</artifactId>
@@ -49,40 +56,19 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-export-package</id>
-						<phase>package</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<classpathScope>compile</classpathScope>
-							<executable>${java.home}/bin/java</executable>
-							<arguments>
-								<argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
-								<argument>-DincludeNumberPackages=1</argument>
-
-								<argument>-classpath</argument>
-								<classpath />
-
-								<argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
-
-								<argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
-								<argument>VAADIN/widgetsets</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-maven-plugin</artifactId>
@@ -103,32 +89,10 @@
 					</execution>
 				</executions>
 			</plugin>
-
-
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-Version>${osgi.bundle.version}</Bundle-Version>
-						<Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
-						<!-- Export package is handled in exec plugin -->
-						<Export-Package></Export-Package>
-						<Import-Package></Import-Package>
-					</instructions>
-				</configuration>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>

diff --git a/client-compiled/src/main/java/com/vaadin/osgi/widgetset/DefaultWidgetsetContribution.java b/client-compiled/src/main/java/com/vaadin/osgi/widgetset/DefaultWidgetsetContribution.java
@@ -0,0 +1,32 @@
+package com.vaadin.osgi.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 DefaultWidgetsetContribution {
+    private HttpService httpService;
+
+    private static final String WIDGETSET_NAME = "com.vaadin.DefaultWidgetSet";
+
+    @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;
+    }
+}
diff --git a/compatibility-client-compiled/bnd.bnd b/compatibility-client-compiled/bnd.bnd
@@ -0,0 +1,6 @@
+Bundle-SymbolicName: ${project.groupId}.compatibility.client.compiled
+Bundle-Name: Compatibility Widgetset
+Bundle-Version: ${osgi.bundle.version}
+Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
+    *
+Export-Package: com.vaadin.osgi.compatibility.widgetset;-noimport:=true