You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:58:23 UTC
[sling-org-apache-sling-provisioning-model] 08/11: SLING-5172 :
Provide support for custom sections in the provisioning model
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.4.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit b0f38e779a1874097e1fa707e002e5ed43872058
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 21 08:44:46 2015 +0000
SLING-5172 : Provide support for custom sections in the provisioning model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1709755 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/provisioning/model/io/ModelReader.java | 5 ++++-
.../java/org/apache/sling/provisioning/model/io/ModelWriter.java | 2 +-
.../java/org/apache/sling/provisioning/model/io/package-info.java | 2 +-
src/test/resources/additional.txt | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
index 836ff77..98619a4 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
@@ -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);
diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
index 13e4d00..de004d9 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
@@ -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(' ');
diff --git a/src/main/java/org/apache/sling/provisioning/model/io/package-info.java b/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
index 7db48c0..175208e 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/package-info.java
@@ -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;
diff --git a/src/test/resources/additional.txt b/src/test/resources/additional.txt
index b9b1524..b94f5e5 100644
--- a/src/test/resources/additional.txt
+++ b/src/test/resources/additional.txt
@@ -24,7 +24,7 @@
[artifacts]
commons-io/commons-io/1.4/jar
-[additional stuff=free]
+[:additional stuff=free]
# Hello
world
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.