Repository: karaf Updated Branches: refs/heads/master 2688eab14 -> 5706802ff
[KARAF-4841] Add support for Felix httplite Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5706802f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5706802f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5706802f Branch: refs/heads/master Commit: 5706802ff4ad67543bcfe3e84cd69ebfae89b5fa Parents: 2688eab Author: Guillaume Nodet <[email protected]> Authored: Wed Nov 23 16:10:00 2016 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Wed Nov 23 18:08:00 2016 +0100 ---------------------------------------------------------------------- .../features/standard/src/main/feature/feature.xml | 11 +++++++++++ pom.xml | 1 + 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5706802f/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 26588c9..3a3cdf2 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -338,8 +338,19 @@ </feature> <feature name="http" version="${project.version}" description="Implementation of the OSGI HTTP Service"> + <feature dependency="true">pax-http-service</feature> + <requirement>http-service</requirement> + </feature> + + <feature name="httplite" version="${project.version}" description="Felix Httplite OSGi HTTP Service"> + <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.httplite.complete/${felix.httplite.version}</bundle> + <capability>http-service;provider:=felix-httplite</capability> + </feature> + + <feature name="pax-http-service" description="Pax-Web OSGi HTTP Service"> <feature>pax-http</feature> <bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.core/${project.version}</bundle> + <capability>http-service;provider:=pax-http</capability> </feature> <feature name="http-whiteboard" description="Provide HTTP Whiteboard pattern support" version="${project.version}"> http://git-wip-us.apache.org/repos/asf/karaf/blob/5706802f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 34a08c1..cec0563 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,7 @@ <felix.framework.security.version>2.6.0</felix.framework.security.version> <felix.gogo.runtime.version>1.0.0</felix.gogo.runtime.version> <felix.gogo.jline.version>1.0.0</felix.gogo.jline.version> + <felix.httplite.version>0.1.4</felix.httplite.version> <felix.inventory.version>1.0.4</felix.inventory.version> <felix.plugin.version>3.0.1</felix.plugin.version> <felix.utils.version>1.8.2</felix.utils.version>
