svn commit: r1345810 - in /karaf/trunk: features/core/src/main/java/org/apache/karaf/features/ features/core/src/main/java/org/apache/karaf/features/internal/model/ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ webconsole/...

[ff...@apache.org]

Author: ffang
Date: Mon Jun  4 00:26:37 2012
New Revision: 1345810

URL: http://svn.apache.org/viewvc?rev=1345810&view=rev
Log:
[KARAF-1515]features-generate-descriptor does not set the version in generated features

Modified:
    karaf/trunk/features/core/src/main/java/org/apache/karaf/features/Feature.java
    karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
    karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java

Modified: karaf/trunk/features/core/src/main/java/org/apache/karaf/features/Feature.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/Feature.java?rev=1345810&r1=1345809&r2=1345810&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/java/org/apache/karaf/features/Feature.java (original)
+++ karaf/trunk/features/core/src/main/java/org/apache/karaf/features/Feature.java Mon Jun  4 00:26:37 2012
@@ -36,6 +36,8 @@ public interface Feature {
 
     String getVersion();
 
+    boolean hasVersion();
+
     String getResolver();
 
     String getInstall();

Modified: karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java?rev=1345810&r1=1345809&r2=1345810&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java (original)
+++ karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java Mon Jun  4 00:26:37 2012
@@ -35,6 +35,7 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
+
 import org.apache.karaf.features.BundleInfo;
 import org.apache.karaf.features.ConfigFileInfo;
 
@@ -302,6 +303,14 @@ public class Feature implements org.apac
     }
 
     /**
+     * Since version has a default value ("0.0.0"), returns
+     * whether or not the version has been set.
+     */
+    public boolean hasVersion() {
+        return this.version != null;
+    }
+
+    /**
      * Gets the value of the description property.
      * 
      * @return

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java?rev=1345810&r1=1345809&r2=1345810&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java Mon Jun  4 00:26:37 2012
@@ -309,7 +309,7 @@ public class GenerateDescriptorMojo exte
             feature = objectFactory.createFeature();
             feature.setName(project.getArtifactId());
         }
-        if (feature.getVersion() == null) {
+        if (!feature.hasVersion()) {
             feature.setVersion(project.getArtifact().getBaseVersion());
         }
         if (feature.getDescription() == null) {

Modified: karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java?rev=1345810&r1=1345809&r2=1345810&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java (original)
+++ karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java Mon Jun  4 00:26:37 2012
@@ -140,8 +140,15 @@ public class ExtendedFeature implements 
         return 0;
     }
 
+    public boolean hasVersion() {
+        return this.feature.hasVersion();
+    }
+
+
     @Override
     public String getRegion() {
         return feature.getRegion();
     }
+
+    
 }