FELIX-1121: Add feature for installing Felix Web Console
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@782239 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/filtered-resources/features.xml b/karaf/assembly/src/main/filtered-resources/features.xml
index dbce2f9..b833e96 100644
--- a/karaf/assembly/src/main/filtered-resources/features.xml
+++ b/karaf/assembly/src/main/filtered-resources/features.xml
@@ -24,4 +24,21 @@
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
<bundle>mvn:org.apache.felix.karaf.gshell/org.apache.felix.karaf.gshell.obr/${version}</bundle>
</feature>
+ <feature name="felix-http" version="${version}">
+ <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}/jar</bundle>
+ <bundle>mvn:org.mortbay.jetty/jetty-sslengine/${jetty.version}/jar</bundle>
+ <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}/jar</bundle>
+ <bundle>mvn:org.apache.felix/org.apache.felix.http.jetty/${felix.http.version}/jar</bundle>
+ <config name="org.apache.felix.http">
+ org.osgi.service.http.port=8080
+ </config>
+ </feature>
+ <feature name="webconsole" version="${version}">
+ <feature version="${version}">felix-http</feature>
+ <bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}/jar</bundle>
+ <config name="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ username=karaf
+ password=karaf
+ </config>
+ </feature>
</features>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9f28627..8f0b5be 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -76,17 +76,20 @@
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
<equinox.version> 3.5.0.v20090429-1630</equinox.version>
- <felix.configadmin.version>1.0.4</felix.configadmin.version>
- <felix.plugin.version>2.0.0</felix.plugin.version>
- <felix.framework.version>1.6.0</felix.framework.version>
- <felix.osgi.version>1.2.0</felix.osgi.version>
- <felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.4.0</felix.bundlerepository.version>
+ <felix.compendium.version>1.2.0</felix.compendium.version>
+ <felix.configadmin.version>1.0.4</felix.configadmin.version>
+ <felix.framework.version>1.6.0</felix.framework.version>
+ <felix.http.version>1.0.0</felix.http.version>
+ <felix.osgi.version>1.2.0</felix.osgi.version>
+ <felix.plugin.version>2.0.0</felix.plugin.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
+ <felix.webconsole.version>1.2.10</felix.webconsole.version>
<geronimo.annotation.version>1.1.1</geronimo.annotation.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<gshell.version>1.0-alpha-2</gshell.version>
<jaxp.ri.version>1.4.2_2</jaxp.ri.version>
+ <jetty.version>6.1.14</jetty.version>
<junit.version>3.8.2_1</junit.version>
<jline.version>0.9.94_1</jline.version>
<log4j.version>1.2.14</log4j.version>