From 9a6ebeb5a80bdb1d97d47422c62a973b3f2d2cf9 Mon Sep 17 00:00:00 2001 From: Mirjan Merruko Date: Fri, 24 Mar 2017 13:33:37 +0200 Subject: Add OSGi support #8830 #8827 #8828 #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. --- push/bnd.bnd | 6 +++ push/pom.xml | 38 +++++++--------- .../osgi/push/PushResourcesContribution.java | 51 ++++++++++++++++++++++ 3 files changed, 73 insertions(+), 22 deletions(-) create mode 100644 push/bnd.bnd create mode 100644 push/src/main/java/com/vaadin/osgi/push/PushResourcesContribution.java (limited to 'push') diff --git a/push/bnd.bnd b/push/bnd.bnd new file mode 100644 index 0000000000..f5d0deb9a7 --- /dev/null +++ b/push/bnd.bnd @@ -0,0 +1,6 @@ +Bundle-SymbolicName: ${project.groupId}.push +Bundle-Name: Vaadin Push +Bundle-Version: ${osgi.bundle.version} +Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\ + * +Export-Package: com.vaadin.osgi.push;-noimport:=true diff --git a/push/pom.xml b/push/pom.xml index af51026084..ee9d82e1fe 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -29,7 +29,20 @@ war provided - + + ${project.groupId} + vaadin-shared + ${project.version} + provided + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + @@ -134,28 +147,9 @@ ${project.build.outputDirectory}/VAADIN - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.bundle.version} - ${osgi.execution.environment} - VAADIN - com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport - - - - - bundle-manifest - process-classes - - manifest - - - + biz.aQute.bnd + bnd-maven-plugin org.apache.maven.plugins diff --git a/push/src/main/java/com/vaadin/osgi/push/PushResourcesContribution.java b/push/src/main/java/com/vaadin/osgi/push/PushResourcesContribution.java new file mode 100644 index 0000000000..8d4564c582 --- /dev/null +++ b/push/src/main/java/com/vaadin/osgi/push/PushResourcesContribution.java @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.osgi.push; + +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 PushResourcesContribution { + private HttpService httpService; + + private static final String[] RESOURCES = { "vaadinPush.js", + "vaadinPush.js.gz", "vaadinPush.debug.js", + "vaadinPush.debug.js.gz" }; + + @Activate + void startup(ComponentContext context) throws Exception { + VaadinResourceService service = OSGiVaadinResources.getService(); + for (String resourceName : RESOURCES) { + service.publishResource(resourceName, httpService); + } + } + + @Reference + void setHttpService(HttpService httpService) { + this.httpService = httpService; + } + + void unsetHttpService(HttpService httpService) { + this.httpService = null; + } +} -- cgit v1.2.3