Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

Commit

Permalink
Service-Component header uses uniform wildcard (#3892)
Browse files Browse the repository at this point in the history 
Signed-off-by: Svilen Valkanov <svilen.valkanov@musala.com>
  • Loading branch information
@kaikreuzer
Svilen authored and kaikreuzer committed Jul 26, 2017
1 parent a665da7 commit bad2941
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 32 deletions.
2 changes: 1 addition & 1 deletion bundles/io/org.eclipse.smarthome.io.monitor/META-INF/MANIFEST.MF
View file
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Service-Component: OSGI-INF/eventlogger.xml
Service-Component: OSGI-INF/*.xml
Private-Package: org.eclipse.smarthome.core.monitor.internal
Ignore-Package: org.eclipse.smarthome.core.monitor.internal
Bundle-Name: Eclipse SmartHome Monitor
Expand Down
2 changes: 1 addition & 1 deletion bundles/io/org.eclipse.smarthome.io.rest.log/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,4 +10,4 @@ Import-Package: io.swagger.annotations;resolution:=optional,
javax.ws.rs.core,
org.eclipse.smarthome.io.rest,
org.slf4j
Service-Component: OSGI-INF/loghandler.xml
Service-Component: OSGI-INF/*.xml
2 changes: 1 addition & 1 deletion bundles/io/org.eclipse.smarthome.io.transport.mqtt/META-INF/MANIFEST.MF
View file
Expand Up @@ -18,6 +18,6 @@ Import-Package: javax.naming,
org.eclipse.smarthome.io.transport.mqtt,
org.osgi.service.cm,
org.slf4j
Service-Component: OSGI-INF/mqtt-*.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
2 changes: 1 addition & 1 deletion bundles/io/org.eclipse.smarthome.io.transport.upnp/META-INF/MANIFEST.MF
View file
Expand Up @@ -18,5 +18,5 @@ Import-Package: org.eclipse.smarthome.io.transport.upnp,
org.osgi.framework;version="1.3.0",
org.slf4j
Export-Package: org.eclipse.smarthome.io.transport.upnp
Service-Component: OSGI-INF/UpnpIOService.xml
Service-Component: OSGI-INF/*.xml
Bundle-Vendor: Eclipse.org/SmartHome
2 changes: 1 addition & 1 deletion bundles/model/org.eclipse.smarthome.model.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -26,6 +26,6 @@ Import-Package: com.google.common.base,
org.osgi.framework,
org.osgi.service.component,
org.slf4j
Service-Component: OSGI-INF/folderobserver.xml, OSGI-INF/modelrepository.xml
Service-Component: OSGI-INF/*.xml
Export-Package: org.eclipse.smarthome.model.core
Bundle-ActivationPolicy: lazy
2 changes: 1 addition & 1 deletion bundles/model/org.eclipse.smarthome.model.item.runtime/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,4 +9,4 @@ Import-Package: org.eclipse.smarthome.model.core,
org.osgi.framework,
org.slf4j
Require-Bundle: org.eclipse.smarthome.model.item
Service-Component: OSGI-INF/runtime.xml
Service-Component: OSGI-INF/*.xml
2 changes: 1 addition & 1 deletion bundles/model/org.eclipse.smarthome.model.sitemap.runtime/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,4 +9,4 @@ Import-Package: org.eclipse.smarthome.model.core,
org.osgi.framework,
org.slf4j
Require-Bundle: org.eclipse.smarthome.model.sitemap
Service-Component: OSGI-INF/runtime.xml
Service-Component: OSGI-INF/*.xml
2 changes: 1 addition & 1 deletion bundles/model/org.eclipse.smarthome.model.sitemap/META-INF/MANIFEST.MF
View file
Expand Up @@ -34,5 +34,5 @@ Export-Package: org.eclipse.smarthome.model,
org.eclipse.smarthome.model.sitemap.impl,
org.eclipse.smarthome.model.sitemap.util,
org.eclipse.smarthome.model.validation
Service-Component: OSGI-INF/sitemapprovider.xml
Service-Component: OSGI-INF/*.xml
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion bundles/model/org.eclipse.smarthome.model.thing.runtime/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,5 +9,5 @@ Import-Package: org.eclipse.smarthome.model.core,
org.osgi.framework,
org.slf4j
Require-Bundle: org.eclipse.smarthome.model.thing
Service-Component: OSGI-INF/runtime.xml
Service-Component: OSGI-INF/*.xml

4 changes: 1 addition & 3 deletions bundles/model/org.eclipse.smarthome.model.thing.tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -32,7 +32,5 @@ Import-Package: groovy.lang,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Fragment-Host: org.eclipse.smarthome.model.thing
Export-Package: org.eclipse.smarthome.model.thing
Service-Component: OSGI-INF/HueThingHandlerFactory.xml,
OSGI-INF/HueThingTypeProvider.xml,
OSGI-INF/DumbThingTypeProvider.xml
Service-Component: OSGI-INF/*.xml

3 changes: 1 addition & 2 deletions bundles/ui/org.eclipse.smarthome.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -43,5 +43,4 @@ Bundle-SymbolicName: org.eclipse.smarthome.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.smarthome.ui.chart,
org.eclipse.smarthome.ui.items
Service-Component: OSGI-INF/genericitemuiprovider.xml, OSGI-INF/itemuiregistry.xml,
OSGI-INF/proxy.xml, OSGI-INF/chartservlet.xml, OSGI-INF/chartprovider.xml
Service-Component: OSGI-INF/*.xml
2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.exec/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,6 +9,6 @@ Import-Package: org.eclipse.smarthome.core.transform,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.exec
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/execservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.javascript/META-INF/MANIFEST.MF
View file
Expand Up @@ -11,6 +11,6 @@ Import-Package: javax.script,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.javascript
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/javascriptservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.jsonpath/META-INF/MANIFEST.MF
View file
Expand Up @@ -14,5 +14,5 @@ Import-Package: com.jayway.jsonpath,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.jsonpath
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/jsonpathservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .
2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.map/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,6 +10,6 @@ Import-Package: org.eclipse.smarthome.core.i18n,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.map
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/mapservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.regex/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,6 +9,6 @@ Import-Package: org.eclipse.smarthome.config.core,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.regex
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/regexservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.scale/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,6 +10,6 @@ Import-Package: org.eclipse.smarthome.core.i18n,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.scale
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/scaleservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.xpath/META-INF/MANIFEST.MF
View file
Expand Up @@ -12,6 +12,6 @@ Import-Package: javax.xml.parsers,
org.xml.sax
Bundle-SymbolicName: org.eclipse.smarthome.transform.xpath
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/xpathservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/transform/org.eclipse.smarthome.transform.xslt/META-INF/MANIFEST.MF
View file
Expand Up @@ -11,6 +11,6 @@ Import-Package: javax.xml.transform,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.transform.xslt
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/xsltservice.xml
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: .

2 changes: 1 addition & 1 deletion extensions/ui/iconset/org.eclipse.smarthome.ui.iconset.classic/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,4 +9,4 @@ Import-Package: org.eclipse.smarthome.core.i18n,
org.eclipse.smarthome.ui.icon,
org.osgi.framework,
org.slf4j
Service-Component: OSGI-INF/classiciconprovider.xml
Service-Component: OSGI-INF/*.xml
9 changes: 1 addition & 8 deletions extensions/ui/org.eclipse.smarthome.ui.classic/META-INF/MANIFEST.MF
View file
Expand Up @@ -27,12 +27,5 @@ Import-Package: javax.servlet,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.ui.classic
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/webappservlet.xml, OSGI-INF/pagerenderer.xml,
OSGI-INF/cmdservlet.xml, OSGI-INF/grouprenderer.xml, OSGI-INF/framerenderer.xml,
OSGI-INF/switchrenderer.xml, OSGI-INF/selectionrenderer.xml,
OSGI-INF/listrenderer.xml, OSGI-INF/textrenderer.xml,
OSGI-INF/imagerenderer.xml, OSGI-INF/sliderrenderer.xml,
OSGI-INF/chartrenderer.xml, OSGI-INF/videorenderer.xml,
OSGI-INF/webviewrenderer.xml, OSGI-INF/setpointrenderer.xml,
OSGI-INF/colorpickerrenderer.xml, OSGI-INF/mapviewrenderer.xml
Service-Component: OSGI-INF/*.xml
Export-Package: org.eclipse.smarthome.ui.classic.render
2 changes: 1 addition & 1 deletion extensions/ui/org.eclipse.smarthome.ui.paper/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,5 +9,5 @@ Import-Package: org.osgi.service.component,
org.slf4j
Bundle-SymbolicName: org.eclipse.smarthome.ui.paper;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*
Service-Component: OSGI-INF/*.xml
Bundle-ClassPath: patch/,.

0 comments on commit bad2941

Please sign in to comment.