Add metatype to the webconsole feature so that configurations are correctly displayed
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@783693 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index 7140135..80575dc 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -196,6 +196,10 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.prefs</artifactId>
</dependency>
<dependency>
diff --git a/karaf/assembly/src/main/filtered-resources/features.xml b/karaf/assembly/src/main/filtered-resources/features.xml
index 26af833..2a62897 100644
--- a/karaf/assembly/src/main/filtered-resources/features.xml
+++ b/karaf/assembly/src/main/filtered-resources/features.xml
@@ -35,6 +35,7 @@
</feature>
<feature name="webconsole" version="${version}">
<feature version="${version}">felix-http</feature>
+ <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}/jar</bundle>
<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
diff --git a/karaf/pom.xml b/karaf/pom.xml
index c5d5af8..fd8ce48 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -86,6 +86,7 @@
<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>
+ <felix.metatype.version>1.0.2</felix.metatype.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>
@@ -366,6 +367,11 @@
<version>${felix.webconsole.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>${felix.metatype.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>