You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/08/28 04:43:03 UTC
svn commit: r689702 - in
/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features:
Feature.java internal/FeatureImpl.java internal/FeaturesServiceImpl.java
internal/commands/ListFeaturesCommand.java
Author: ffang
Date: Wed Aug 27 19:43:03 2008
New Revision: 689702
URL: http://svn.apache.org/viewvc?rev=689702&view=rev
Log:
[SMX4KNL-69]revise to get more clear output layout
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java?rev=689702&r1=689701&r2=689702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java Wed Aug 27 19:43:03 2008
@@ -32,4 +32,7 @@
Map<String, Map<String, String>> getConfigurations();
+ boolean getInstallStatus();
+
+ void setInstallStatus(boolean status);
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java?rev=689702&r1=689701&r2=689702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java Wed Aug 27 19:43:03 2008
@@ -32,7 +32,9 @@
private List<String> dependencies = new ArrayList<String>();
private List<String> bundles = new ArrayList<String>();
private Map<String, Map<String,String>> configs = new HashMap<String, Map<String,String>>();
-
+ private boolean installStatus = false;
+
+
public FeatureImpl(String name) {
this.name = name;
}
@@ -64,4 +66,12 @@
public void addConfig(String name, Map<String,String> properties) {
configs.put(name, properties);
}
+
+ public boolean getInstallStatus() {
+ return installStatus;
+ }
+
+ public void setInstallStatus(boolean status) {
+ installStatus = status;
+ }
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java?rev=689702&r1=689701&r2=689702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java Wed Aug 27 19:43:03 2008
@@ -163,6 +163,7 @@
bundles.add(b.getBundleId());
}
installed.put(name, bundles);
+ f.setInstallStatus(true);
saveState();
}
@@ -220,8 +221,8 @@
Collection<String> features = new ArrayList<String>();
for (Repository repo : repositories.values()) {
for (Feature f : repo.getFeatures()) {
- String installStatus = installed.containsKey(f.getName()) ? "installed" : "uninstalled";
- features.add(f.getName() + " " + installStatus);
+ String installStatus = f.getInstallStatus() ? "installed " : "uninstalled";
+ features.add("[" + installStatus + "] " + f.getName());
}
}
return features.toArray(new String[features.size()]);
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java?rev=689702&r1=689701&r2=689702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java Wed Aug 27 19:43:03 2008
@@ -17,7 +17,6 @@
package org.apache.servicemix.gshell.features.internal.commands;
import org.apache.servicemix.gshell.features.FeaturesService;
-import org.apache.servicemix.gshell.features.Repository;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.clp.Option;
@@ -32,6 +31,8 @@
if (installed) {
features = admin.listInstalledFeatures();
} else {
+ // Print column headers.
+ io.out.println(" State Name");
features = admin.listFeatures();
}
if ((features != null) && (features.length > 0)) {