You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/08 17:37:10 UTC
svn commit: r693136 - in
/servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features:
Feature.java internal/FeatureImpl.java internal/FeaturesServiceImpl.java
internal/RepositoryImpl.java
Author: gnodet
Date: Mon Sep 8 08:37:09 2008
New Revision: 693136
URL: http://svn.apache.org/viewvc?rev=693136&view=rev
Log:
Revert SMX4KNL-60 for 1.0.x branch
Modified:
servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java?rev=693136&r1=693135&r2=693136&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java Mon Sep 8 08:37:09 2008
@@ -26,8 +26,6 @@
String getName();
- String getVersion();
-
List<String> getDependencies();
List<String> getBundles();
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java?rev=693136&r1=693135&r2=693136&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java Mon Sep 8 08:37:09 2008
@@ -29,7 +29,6 @@
public class FeatureImpl implements Feature {
private String name;
- private String version;
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>>();
@@ -38,7 +37,6 @@
public FeatureImpl(String name) {
this.name = name;
- this.version = "0.0.0";
}
public String getName() {
@@ -77,11 +75,4 @@
this.installed = installed;
}
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
}
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java?rev=693136&r1=693135&r2=693136&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java Mon Sep 8 08:37:09 2008
@@ -222,17 +222,7 @@
for (Repository repo : repositories.values()) {
for (Feature f : repo.getFeatures()) {
String installStatus = f.isInstalled() ? "installed " : "uninstalled";
- String version = f.getVersion();
- switch (version.length()) {
- case 1: version = " " + version;
- case 2: version = " " + version;
- case 3: version = " " + version;
- case 4: version = " " + version;
- case 5: version = " " + version;
- case 6: version = " " + version;
- case 7: version = " " + version;
- }
- features.add("[" + installStatus + "] " + " [" + version + "] " + f.getName());
+ features.add("[" + installStatus + "] " + f.getName());
}
}
return features.toArray(new String[features.size()]);
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java?rev=693136&r1=693135&r2=693136&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java Mon Sep 8 08:37:09 2008
@@ -74,10 +74,6 @@
Element e = (Element) nodes.item(i);
String name = e.getAttribute("name");
FeatureImpl f = new FeatureImpl(name);
- String version = e.getAttribute("version");
- if (version != null && version.length() > 0) {
- f.setVersion(version);
- }
NodeList featureNodes = e.getElementsByTagName("feature");
for (int j = 0; j < featureNodes.getLength(); j++) {