svn commit: r1709755 - in /sling/trunk/tooling/support/provisioning-model/src: main/java/org/apache/sling/provisioning/model/io/ test/resources/

[cziegeler]

Author: cziegeler
Date: Wed Oct 21 08:44:46 2015
New Revision: 1709755

URL: http://svn.apache.org/viewvc?rev=1709755&view=rev
Log:
SLING-5172 : Provide support for custom sections in the provisioning model

Modified:
    
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
    
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
    
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
    
sling/trunk/tooling/support/provisioning-model/src/test/resources/additional.txt

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java?rev=1709755&r1=1709754&r2=1709755&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
 Wed Oct 21 08:44:46 2015
@@ -176,6 +176,9 @@ public class ModelReader {
                 }
                 if ( found == null ) {
                     // additional section
+                    if ( !category.startsWith(":") ) {
+                        throw new IOException(exceptionPrefix + "Unknown 
category in line " + this.lineNumberReader.getLineNumber() + ": " + category);
+                    }
                     found = CATEGORY.ADDITIONAL;
                 }
                 this.mode = found;
@@ -232,7 +235,7 @@ public class ModelReader {
                     case ADDITIONAL: checkFeature();
                                      this.runMode = null;
                                      this.artifactGroup = null;
-                                     this.additionalSection = new 
Section(category);
+                                     this.additionalSection = new 
Section(category.substring(1));
                                      this.init(this.additionalSection);
                                      
this.feature.getAdditionalSections().add(this.additionalSection);
                                      
this.additionalSection.getAttributes().putAll(parameters);

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java?rev=1709755&r1=1709754&r2=1709755&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
 Wed Oct 21 08:44:46 2015
@@ -241,7 +241,7 @@ public class ModelWriter {
 
             // additional sections
             for(final Section section : feature.getAdditionalSections()) {
-                pw.print("  [");
+                pw.print("  [:");
                 pw.print(section.getName());
                 for(final Map.Entry<String, String> entry : 
section.getAttributes().entrySet()) {
                     pw.print(' ');

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/package-info.java?rev=1709755&r1=1709754&r2=1709755&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
 Wed Oct 21 08:44:46 2015
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-@Version("1.1")
+@Version("1.2")
 package org.apache.sling.provisioning.model.io;
 
 import aQute.bnd.annotation.Version;

Modified: 
sling/trunk/tooling/support/provisioning-model/src/test/resources/additional.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/test/resources/additional.txt?rev=1709755&r1=1709754&r2=1709755&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/provisioning-model/src/test/resources/additional.txt
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/test/resources/additional.txt
 Wed Oct 21 08:44:46 2015
@@ -24,7 +24,7 @@
 [artifacts]
     commons-io/commons-io/1.4/jar
 
-[additional stuff=free]
+[:additional stuff=free]
   # Hello
   world