svn commit: r1797151 - in /sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature: ArtifactId.java json/FeatureJSONWriter.java

[cziegeler]

Author: cziegeler
Date: Thu Jun  1 07:52:01 2017
New Revision: 1797151

URL: http://svn.apache.org/viewvc?rev=1797151&view=rev
Log:
Add model converter

Modified:
    
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
    
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/FeatureJSONWriter.java

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java?rev=1797151&r1=1797150&r2=1797151&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
 Thu Jun  1 07:52:01 2017
@@ -244,6 +244,11 @@ public class ArtifactId implements Compa
      */
     public Version getOSGiVersion() {
         String parts[] = version.split("\\.");
+        // special case for strange versions like NUMBER_NUMBER
+        if ( parts.length == 1 && parts[0].indexOf('_') != -1 ) {
+            final int pos = parts[0].indexOf('_');
+            parts = new String[] {parts[0].substring(0, pos), 
parts[0].substring(pos +1)};
+        }
         if ( parts.length < 4) {
             final int pos = parts[parts.length - 1].indexOf('-');
             if ( pos != -1 ) {

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/FeatureJSONWriter.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/FeatureJSONWriter.java?rev=1797151&r1=1797150&r2=1797151&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/FeatureJSONWriter.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/FeatureJSONWriter.java
 Thu Jun  1 07:52:01 2017
@@ -263,7 +263,7 @@ public class FeatureJSONWriter {
                         w.write(key, (Boolean)val);
                     } else {
                         //  TODO - full type conversion, we have to reverse 
all types supported by the configurator
-                        w.write(key, val.toString());
+                        w.write(name, val.toString());
                     }
                 }