karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1536031 - in /karaf/trunk/bundle/command: pom.xml src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java src/main/resources/OSGI-INF/blueprint/shell-bundles.xml
Date Sat, 26 Oct 2013 20:05:08 GMT
Author: cschneider
Date: Sat Oct 26 20:05:08 2013
New Revision: 1536031

URL: http://svn.apache.org/r1536031
Log:
Fixes for tree:show

Modified:
    karaf/trunk/bundle/command/pom.xml
    karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
    karaf/trunk/bundle/command/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml

Modified: karaf/trunk/bundle/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1536031&r1=1536030&r2=1536031&view=diff
==============================================================================
--- karaf/trunk/bundle/command/pom.xml (original)
+++ karaf/trunk/bundle/command/pom.xml Sat Oct 26 20:05:08 2013
@@ -105,8 +105,7 @@
                         <Private-Package>
                             org.apache.karaf.bundle.command*,
                             org.apache.felix.utils.version;-split-package:=merge-first,
-                            org.apache.felix.utils.manifest;-split-package:=merge-first,
-                            !*
+                            org.apache.felix.utils.manifest;-split-package:=merge-first
                         </Private-Package>
                     </instructions>
                 </configuration>

Modified: karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java?rev=1536031&r1=1536030&r2=1536031&view=diff
==============================================================================
--- karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
(original)
+++ karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
Sat Oct 26 20:05:08 2013
@@ -31,7 +31,6 @@ import org.apache.felix.utils.version.Ve
 import org.apache.felix.utils.version.VersionTable;
 import org.apache.karaf.bundle.command.bundletree.Node;
 import org.apache.karaf.bundle.command.bundletree.Tree;
-import org.apache.karaf.bundle.core.BundleService;
 import org.apache.karaf.shell.commands.Command;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
@@ -51,15 +50,10 @@ import org.slf4j.LoggerFactory;
 public class ShowBundleTree extends BundleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ShowBundleTree.class);
-    private BundleService bundleService;
     private Tree<Bundle> tree;
 
-    public ShowBundleTree(boolean defaultAllBundles) {
-        super(defaultAllBundles);
-    }
-
-    public void setBundleService(BundleService bundleService) {
-        this.bundleService = bundleService;
+    public ShowBundleTree() {
+        super(false);
     }
 
     @Override

Modified: karaf/trunk/bundle/command/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml?rev=1536031&r1=1536030&r2=1536031&view=diff
==============================================================================
--- karaf/trunk/bundle/command/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml (original)
+++ karaf/trunk/bundle/command/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml Sat
Oct 26 20:05:08 2013
@@ -115,7 +115,6 @@
         <command>
             <action class="org.apache.karaf.bundle.command.ShowBundleTree">
                 <property name="bundleService" ref="bundleService"/>
-                <property name="bundleContext" ref="blueprintBundleContext" />
             </action>
         </command>
         <command>



Mime
View raw message