FELIX-1766: fix various problems

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@828809 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/admin/command/pom.xml b/karaf/admin/command/pom.xml
index 6a67a21..906de60 100644
--- a/karaf/admin/command/pom.xml
+++ b/karaf/admin/command/pom.xml
@@ -85,6 +85,7 @@
                         <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
                         <Import-Package>
                             !${pom.artifactId}*,
+                            !org.apache.felix.karaf.admin.internal,
                             javax.management,
                             javax.management.loading,
                             org.osgi.service.command,
@@ -92,7 +93,9 @@
                             org.apache.felix.karaf.shell.console,
                             *
                         </Import-Package>
-                        <Private-Package>!*</Private-Package>
+                        <Private-Package>
+                            org.apache.felix.karaf.admin.main
+                        </Private-Package>
                         <_versionpolicy>${bnd.version.policy}</_versionpolicy>
                     </instructions>
                 </configuration>
diff --git a/karaf/admin/core/pom.xml b/karaf/admin/core/pom.xml
index 86bff82..4b9b0cb 100644
--- a/karaf/admin/core/pom.xml
+++ b/karaf/admin/core/pom.xml
@@ -205,8 +205,10 @@
                             *
                         </Import-Package>
                         <Private-Package>
+                            org.apache.felix.karaf.admin.bin,
+                            org.apache.felix.karaf.admin.etc,
                             org.apache.felix.karaf.admin.internal,
-                            org.apache.felix.karaf.jpm.impl
+                            org.apache.felix.karaf.jpm.impl,
                         </Private-Package>
                         <_versionpolicy>${bnd.version.policy}</_versionpolicy>
                     </instructions>