Return-Path: 
 <commits-return-7107-apmail-felix-commits-archive=felix.apache.org@felix.apache.org>
Delivered-To: apmail-felix-commits-archive@www.apache.org
Received: (qmail 70470 invoked from network); 11 Jun 2009 08:36:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Jun 2009 08:36:33 -0000
Received: (qmail 63886 invoked by uid 500); 11 Jun 2009 08:36:44 -0000
Delivered-To: apmail-felix-commits-archive@felix.apache.org
Received: (qmail 63832 invoked by uid 500); 11 Jun 2009 08:36:44 -0000
Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@felix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@felix.apache.org>
List-Post: <mailto:commits@felix.apache.org>
List-Id: <commits.felix.apache.org>
Reply-To: dev@felix.apache.org
Delivered-To: mailing list commits@felix.apache.org
Received: (qmail 63823 invoked by uid 99); 11 Jun 2009 08:36:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2009 08:36:44 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2009 08:36:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7F9B5238889C; Thu, 11 Jun 2009 08:36:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r783693 - in /felix/trunk/karaf: assembly/pom.xml
 assembly/src/main/filtered-resources/features.xml pom.xml
Date: Thu, 11 Jun 2009 08:36:22 -0000
To: commits@felix.apache.org
From: gnodet@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090611083622.7F9B5238889C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gnodet
Date: Thu Jun 11 08:36:21 2009
New Revision: 783693

URL: http://svn.apache.org/viewvc?rev=783693&view=rev
Log:
Add metatype to the webconsole feature so that configurations are correctly displayed

Modified:
    felix/trunk/karaf/assembly/pom.xml
    felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
    felix/trunk/karaf/pom.xml

Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=783693&r1=783692&r2=783693&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Thu Jun 11 08:36:21 2009
@@ -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>

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml?rev=783693&r1=783692&r2=783693&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml Thu Jun 11 08:36:21 2009
@@ -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

Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=783693&r1=783692&r2=783693&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Thu Jun 11 08:36:21 2009
@@ -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>