FELIX-1766: Refactor and enable AdminServiceMBean

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@828802 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index d34b25d..e36a367 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -80,12 +80,20 @@
             <artifactId>org.apache.felix.karaf.features.management</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix.karaf.shell</groupId>
-            <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+            <groupId>org.apache.felix.karaf.admin</groupId>
+            <artifactId>org.apache.felix.karaf.admin.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix.karaf.admin</groupId>
+            <artifactId>org.apache.felix.karaf.admin.command</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix.karaf.admin</groupId>
+            <artifactId>org.apache.felix.karaf.admin.management</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf.shell</groupId>
-            <artifactId>org.apache.felix.karaf.shell.admin</artifactId>
+            <artifactId>org.apache.felix.karaf.shell.console</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf.shell</groupId>