Author: gnodet
Date: Mon Jun 21 08:32:00 2010
New Revision: 956491
URL: http://svn.apache.org/viewvc?rev=956491&view=rev
Log:
FELIX-2141: Add features:info command
Added:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/InfoFeatureCommand.java
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AllFeatureCompleter.java
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/FeatureCompleterSupport.java
- copied, changed from r956295,
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java
Modified:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java
felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/FeaturesService.java
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
Added:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/InfoFeatureCommand.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/InfoFeatureCommand.java?rev=956491&view=auto
==============================================================================
---
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/InfoFeatureCommand.java
(added)
+++
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/InfoFeatureCommand.java
Mon Jun 21 08:32:00 2010
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.karaf.features.command;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.karaf.features.Feature;
+import org.apache.felix.karaf.features.FeaturesService;
+
+/**
+ * Utility command to display info about features.
+ */
+...@command(scope = "features", name = "info", description = "Shows
information about selected information.")
+public class InfoFeatureCommand extends FeaturesCommandSupport {
+
+ @Argument(index = 0, name = "name", description = "The name of the
feature", required = true, multiValued = false)
+ private String name;
+
+ @Argument(index = 1, name = "version", description = "The version of the
feature", required = false, multiValued = false)
+ private String version;
+
+ @Option(name = "-c", aliases={"--configuration"}, description="Display
configuration info", required = false, multiValued = false)
+ private boolean config;
+
+ @Option(name = "-d", aliases={"--dependency"}, description="Display
dependencies info", required = false, multiValued = false)
+ private boolean dependency;
+
+ @Option(name = "-b", aliases={"--bundle"}, description="Display bundles
info", required = false, multiValued = false)
+ private boolean bundle;
+
+ @Option(name = "-t", aliases={"--tree"}, description="Display feature
tree", required = false, multiValued = false)
+ private boolean tree;
+
+ protected void doExecute(FeaturesService admin) throws Exception {
+ Feature feature = null;
+
+ if (version != null && version.length() > 0) {
+ feature = admin.getFeature(name, version);
+ } else {
+ feature = admin.getFeature(name);
+ }
+
+ if (feature == null) {
+ System.out.println("Feature not found");
+ return;
+ }
+
+ // default behavior
+ if (!config && !dependency && !bundle) {
+ config = true;
+ dependency = true;
+ bundle = true;
+ }
+
+ System.out.println("Description of " + feature.getName() + " " +
feature.getVersion() + " feature");
+
System.out.println("----------------------------------------------------------------");
+ if (config) {
+ displayConfigInformation(feature);
+ }
+
+ if (dependency) {
+ displayDependencyInformation(feature);
+ }
+
+ if (bundle) {
+ displayBundleInformation(feature);
+ }
+
+ if (tree) {
+ if (config || dependency || bundle) {
+ System.out.println("\nFeature tree");
+ }
+
+ int unresolved = displayFeatureTree(admin, feature, 0, false);
+ if (unresolved > 0) {
+ System.out.println("Tree contains " + unresolved + "
unresolved dependencies");
+ System.out.println(" * means that node declares dependency but
the dependant feature is not available.");
+ }
+ }
+ }
+
+ private void displayBundleInformation(Feature feature) {
+ List<String> bundles = feature.getBundles();
+ if (bundles.isEmpty()) {
+ System.out.println("Feature has no bundles.");
+ } else {
+ System.out.println("Feature contains followed bundles:");
+ for (String featureBundle : bundles) {
+ System.out.println(" " + featureBundle);
+ }
+ }
+ }
+
+ private void displayDependencyInformation(Feature feature) {
+ List<Feature> dependencies = feature.getDependencies();
+ if (dependencies.isEmpty()) {
+ System.out.println("Feature has no dependencies.");
+ } else {
+ System.out.println("Feature depends on:");
+ for (Feature featureDependency : dependencies) {
+ System.out.println(" " + featureDependency.getName() + " " +
featureDependency.getVersion());
+ }
+ }
+ }
+
+ private void displayConfigInformation(Feature feature) {
+ Map<String, Map<String, String>> configurations =
feature.getConfigurations();
+ if (configurations.isEmpty()) {
+ System.out.println("Feature has no configuration");
+ } else {
+ System.out.println("Feature configuration:");
+ for (String name : configurations.keySet()) {
+ System.out.println(" " + name);
+ }
+ }
+ }
+
+
+ private int displayFeatureTree(FeaturesService admin, Feature feature, int
level, boolean last) throws Exception {
+ int unresolved = 0;
+ String prefix = repeat(" ", level);
+
+ Feature resolved = resolveFeature(admin, feature);
+ if (resolved != null) {
+ System.out.println(prefix + " " + resolved.getName() + " " +
resolved.getVersion());
+ } else {
+ System.out.println(prefix + " " + feature.getName() + " " +
feature.getVersion() + " *");
+ unresolved++;
+ }
+
+ if (bundle) {
+ List<String> bundles = resolved != null ? resolved.getBundles() :
feature.getBundles();
+ for (int i = 0, j = bundles.size(); i < j; i++) {
+ System.out.println(prefix + " " + (i+1 == j ? "\\" : "+") + "
" + bundles.get(i));
+ }
+ }
+ List<Feature> dependencies = resolved != null ?
resolved.getDependencies() : feature.getDependencies();
+ for (int i = 0, j = dependencies.size(); i < j; i++) {
+ Feature toDisplay = resolveFeature(admin, dependencies.get(i));
+ if (toDisplay == null) {
+ toDisplay = dependencies.get(i);
+ }
+ unresolved += displayFeatureTree(admin, toDisplay, level+1, i + 1
== j);
+ }
+
+ return unresolved;
+ }
+
+ private Feature resolveFeature(FeaturesService admin, Feature feature)
throws Exception {
+ return admin.getFeature(feature.getName(), feature.getVersion());
+ }
+
+ private static String repeat(String string, int times) {
+ if (times <= 0) {
+ return "";
+ }
+ else if (times % 2 == 0) {
+ return repeat(string+string, times/2);
+ }
+ else {
+ return string + repeat(string+string, times/2);
+ }
+ }
+}
Added:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AllFeatureCompleter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AllFeatureCompleter.java?rev=956491&view=auto
==============================================================================
---
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AllFeatureCompleter.java
(added)
+++
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AllFeatureCompleter.java
Mon Jun 21 08:32:00 2010
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.karaf.features.command.completers;
+
+import org.apache.felix.karaf.features.Feature;
+
+/**
+ * {...@link jline.Completor} for available features.
+ */
+public class AllFeatureCompleter extends FeatureCompleterSupport {
+
+ @Override
+ protected boolean acceptsFeature(Feature feature) {
+ return true;
+ }
+
+}
Modified:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java?rev=956491&r1=956490&r2=956491&view=diff
==============================================================================
---
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java
(original)
+++
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java
Mon Jun 21 08:32:00 2010
@@ -16,40 +16,16 @@
*/
package org.apache.felix.karaf.features.command.completers;
-import java.util.List;
-
-import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.features.FeaturesService;
import org.apache.felix.karaf.features.Feature;
/**
- * {...@link jline.Completor} for available features.
- *
- * Displays a list of available features from installed repositories.
- *
+ * {...@link jline.Completor} for features not installed yet.
*/
-public class AvailableFeatureCompleter implements Completer {
-
- private FeaturesService featuresService;
+public class AvailableFeatureCompleter extends FeatureCompleterSupport {
- public void setFeaturesService(FeaturesService featuresService) {
- this.featuresService = featuresService;
+ @Override
+ protected boolean acceptsFeature(Feature feature) {
+ return !featuresService.isInstalled(feature);
}
- public int complete(final String buffer, final int cursor, final List
candidates) {
- StringsCompleter delegate = new StringsCompleter();
- try {
- for (Feature feature : featuresService.listFeatures()) {
- if (!featuresService.isInstalled( feature )) {
- delegate.getStrings().add(feature.getName());
- }
- }
- } catch (Exception e) {
- // Ignore
- }
- return delegate.complete(buffer, cursor, candidates);
- }
-
-
}
Copied:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/FeatureCompleterSupport.java
(from r956295,
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/FeatureCompleterSupport.java?p2=felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/FeatureCompleterSupport.java&p1=felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java&r1=956295&r2=956491&rev=956491&view=diff
==============================================================================
---
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/AvailableFeatureCompleter.java
(original)
+++
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/FeatureCompleterSupport.java
Mon Jun 21 08:32:00 2010
@@ -18,20 +18,20 @@ package org.apache.felix.karaf.features.
import java.util.List;
-import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.features.FeaturesService;
import org.apache.felix.karaf.features.Feature;
+import org.apache.felix.karaf.features.FeaturesService;
+import org.apache.felix.karaf.shell.console.Completer;
+import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
/**
- * {...@link jline.Completor} for available features.
- *
- * Displays a list of available features from installed repositories.
- *
+ * Base completer for feature commands.
*/
-public class AvailableFeatureCompleter implements Completer {
+public abstract class FeatureCompleterSupport implements Completer {
- private FeaturesService featuresService;
+ /**
+ * Feature service.
+ */
+ protected FeaturesService featuresService;
public void setFeaturesService(FeaturesService featuresService) {
this.featuresService = featuresService;
@@ -41,7 +41,7 @@ public class AvailableFeatureCompleter i
StringsCompleter delegate = new StringsCompleter();
try {
for (Feature feature : featuresService.listFeatures()) {
- if (!featuresService.isInstalled( feature )) {
+ if (acceptsFeature(feature)) {
delegate.getStrings().add(feature.getName());
}
}
@@ -51,5 +51,11 @@ public class AvailableFeatureCompleter i
return delegate.complete(buffer, cursor, candidates);
}
-
+ /**
+ * Method for filtering features.
+ *
+ * @param feature The feature.
+ * @return True if feature should be available in completer.
+ */
+ protected abstract boolean acceptsFeature(Feature feature);
}
Modified:
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java?rev=956491&r1=956490&r2=956491&view=diff
==============================================================================
---
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java
(original)
+++
felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java
Mon Jun 21 08:32:00 2010
@@ -16,37 +16,16 @@
*/
package org.apache.felix.karaf.features.command.completers;
-import java.util.List;
-
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
-import org.apache.felix.karaf.features.FeaturesService;
import org.apache.felix.karaf.features.Feature;
/**
* {...@link jline.Completor} for installed features.
- *
- * Displays a list of currently installed features.
- *
*/
-public class InstalledFeatureCompleter implements Completer {
-
- private FeaturesService featuresService;
-
- public void setFeaturesService(FeaturesService featuresService) {
- this.featuresService = featuresService;
- }
+public class InstalledFeatureCompleter extends FeatureCompleterSupport {
- public int complete(final String buffer, final int cursor, final List
candidates) {
- StringsCompleter delegate = new StringsCompleter();
- try {
- for (Feature feature : featuresService.listInstalledFeatures()) {
- delegate.getStrings().add(feature.getName());
- }
- } catch (Exception e) {
- // Ignore
- }
- return delegate.complete(buffer, cursor, candidates);
+ @Override
+ protected boolean acceptsFeature(Feature feature) {
+ return featuresService.isInstalled(feature);
}
}
Modified:
felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml?rev=956491&r1=956490&r2=956491&view=diff
==============================================================================
---
felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
(original)
+++
felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
Mon Jun 21 08:32:00 2010
@@ -39,27 +39,37 @@
<command name="features/install">
<action
class="org.apache.felix.karaf.features.command.InstallFeatureCommand"/>
<completers>
- <ref component-id="installFeatureCompleter" />
+ <ref component-id="uninstalledFeatureCompleter" />
</completers>
</command>
<command name="features/uninstall">
<action
class="org.apache.felix.karaf.features.command.UninstallFeatureCommand"/>
<completers>
- <ref component-id="uninstallFeatureCompleter" />
+ <ref component-id="installedFeatureCompleter" />
</completers>
</command>
<command name="features/list">
<action
class="org.apache.felix.karaf.features.command.ListFeaturesCommand"/>
</command>
+ <command name="features/info">
+ <action
class="org.apache.felix.karaf.features.command.InfoFeatureCommand"/>
+ <completers>
+ <ref component-id="allFeatureCompleter" />
+ </completers>
+ </command>
</command-bundle>
<reference id="featuresService"
interface="org.apache.felix.karaf.features.FeaturesService" />
- <bean id="installFeatureCompleter"
class="org.apache.felix.karaf.features.command.completers.AvailableFeatureCompleter">
+ <bean id="uninstalledFeatureCompleter"
class="org.apache.felix.karaf.features.command.completers.AvailableFeatureCompleter">
+ <property name="featuresService" ref="featuresService" />
+ </bean>
+
+ <bean id="installedFeatureCompleter"
class="org.apache.felix.karaf.features.command.completers.InstalledFeatureCompleter">
<property name="featuresService" ref="featuresService" />
</bean>
- <bean id="uninstallFeatureCompleter"
class="org.apache.felix.karaf.features.command.completers.InstalledFeatureCompleter">
+ <bean id="allFeatureCompleter"
class="org.apache.felix.karaf.features.command.completers.AllFeatureCompleter">
<property name="featuresService" ref="featuresService" />
</bean>
Modified:
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/FeaturesService.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/FeaturesService.java?rev=956491&r1=956490&r2=956491&view=diff
==============================================================================
---
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/FeaturesService.java
(original)
+++
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/FeaturesService.java
Mon Jun 21 08:32:00 2010
@@ -58,4 +58,7 @@ public interface FeaturesService {
boolean isInstalled(Feature f);
+ Feature getFeature(String name, String version) throws Exception;
+
+ Feature getFeature(String name) throws Exception;
}
Modified:
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java?rev=956491&r1=956490&r2=956491&view=diff
==============================================================================
---
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
(original)
+++
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
Mon Jun 21 08:32:00 2010
@@ -616,7 +616,11 @@ public class FeaturesServiceImpl impleme
return installed.containsKey(f);
}
- protected Feature getFeature(String name, String version) throws Exception
{
+ public Feature getFeature(String name) throws Exception {
+ return getFeature(name, FeatureImpl.DEFAULT_VERSION);
+ }
+
+ public Feature getFeature(String name, String version) throws Exception {
if (version != null) {
version = version.trim();
}
