[sling-org-apache-sling-jcr-repoinit] 13/17: SLING-5943 - better config metadata + logging

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.jcr.repoinit-1.0.2
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git

commit ed70824c2192e932e24a7f54365b32ddb96c734c
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Tue Aug 2 14:16:38 2016 +0000

    SLING-5943 - better config metadata + logging
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/repoinit@1754936 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/jcr/repoinit/impl/RepositoryInitializer.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java 
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
index 0c6475f..9b5c686 100644
--- 
a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
+++ 
b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
@@ -33,6 +33,7 @@ import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.PropertyOption;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.commons.osgi.PropertiesUtil;
@@ -69,8 +70,7 @@ public class RepositoryInitializer implements 
SlingRepositoryInitializer {
     
     @Property(
             label="Text URL", 
-            description="URL of the source text that provides repoinit 
statements."
-                + " That text is processed according to the model section name 
parameter.", 
+            description="URL of the source text that provides repoinit 
statements.",
             value=DEFAULT_TEXT_URL)
     public static final String PROP_TEXT_URL = "text.url";
     private String textURL;
@@ -92,7 +92,11 @@ public class RepositoryInitializer implements 
SlingRepositoryInitializer {
                 "The format to use to interpret the text provided by the 
configured source text URL. "
                 + "That text can be either a Sling provisioning model with 
repoinit statements embedded in additional sections,"
                 + " or raw repoinit statements",
-            value=DEFAULT_MODEL_SECTION_NAME)
+            options = {
+                    @PropertyOption(name = "MODEL", value = "Provisioning 
Model (MODEL)"),
+                    @PropertyOption(name = "RAW", value = "Raw Repoinit 
statements (RAW)")
+                },                
+            value="MODEL")
     public static final String PROP_TEXT_FORMAT = "text.format";
     public static enum TextFormat { RAW, MODEL };
     private TextFormat textFormat;
@@ -184,7 +188,7 @@ public class RepositoryInitializer implements 
SlingRepositoryInitializer {
             log.info("Parsing raw repoinit statements from {}", textURL);
             return rawText;
         } else {
-            log.info("Extracting repoinit statements from section '{}' of 
provisioning model {}", modelSectionName, textURL);
+            log.info("Extracting repoinit statements from section ':{}' of 
provisioning model {}", modelSectionName, textURL);
             final StringReader reader = new StringReader(rawText);
             try {
                 final Model model = ModelReader.read(reader, textURL);

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.