You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/11/24 05:10:51 UTC

[karaf] branch karaf-4.1.x updated: [KARAF-5789] Add Felix HTTP feature

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
     new 7eb7cd0  [KARAF-5789] Add Felix HTTP feature
7eb7cd0 is described below

commit 7eb7cd0885492d49f2221f4a3cfda9847880764e
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Nov 23 06:17:46 2018 +0100

    [KARAF-5789] Add Felix HTTP feature
---
 .../features/standard/src/main/feature/feature.xml | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 6d696ad..f11313d 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -804,6 +804,35 @@ start-level = admin                           # admin can set any start level, i
         <capability>http-service;provider:=felix-httplite</capability>
     </feature>
 
+    <feature name="felix-http" version="4.0.6" description="Felix HTTP Jetty Service">
+        <config name="org.apache.felix.http">
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You 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.
+#
+################################################################################
+
+org.apache.felix.http.port=8181
+        </config>
+        <bundle start-level="30" dependency="true">mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.2</bundle>
+        <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.http.jetty/4.0.6</bundle>
+        <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.http.whiteboard/4.0.0</bundle>
+        <capability>http-service;provider:=felix</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>