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.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit e87acee7901b5ee807c54203a8830e7ebb9c0dfe
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Thu May 19 15:14:49 2016 +0000
SLING-5355 - RepositoryInitializer created, reads from provisioning model,
WIP:ProvisioningModelIT fails for now
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/oak-jcr@1744594
13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 26 +++-
.../sling/repoinit/jcr/RepositoryInitializer.java | 161 +++++++++++++++++++++
2 files changed, 186 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a469558..dfc5d61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,14 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -99,6 +107,23 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.provisioning.model</artifactId>
+ <version>1.4.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -106,7 +131,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
diff --git
a/src/main/java/org/apache/sling/repoinit/jcr/RepositoryInitializer.java
b/src/main/java/org/apache/sling/repoinit/jcr/RepositoryInitializer.java
new file mode 100644
index 0000000..3f4f288
--- /dev/null
+++ b/src/main/java/org/apache/sling/repoinit/jcr/RepositoryInitializer.java
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.repoinit.jcr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Map;
+
+import javax.jcr.Session;
+
+import org.apache.commons.io.IOUtils;
+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.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepositoryInitializer;
+import org.apache.sling.provisioning.model.Feature;
+import org.apache.sling.provisioning.model.Model;
+import org.apache.sling.provisioning.model.Section;
+import org.apache.sling.provisioning.model.io.ModelReader;
+import org.apache.sling.repoinit.parser.RepoInitParser;
+import org.apache.sling.repoinit.parser.operations.Operation;
+import org.osgi.framework.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** SlingRepositoryInitializer that executes repoinit statements read
+ * from a configurable URL.
+ */
+@Component
+@Service(SlingRepositoryInitializer.class)
+@Properties({
+ // SlingRepositoryInitializers are executed in ascending
+ // order of their service ranking
+ @Property(name=Constants.SERVICE_RANKING, intValue=100)
+})
+public class RepositoryInitializer implements SlingRepositoryInitializer {
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ public static final String DEFAULT_TEXT_URL =
"context:/resources/provisioning/model.txt";
+
+ @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.",
+ value=DEFAULT_TEXT_URL)
+ public static final String PROP_TEXT_URL = "text.url";
+ private String textURL;
+
+ public static final String DEFAULT_MODEL_SECTION_NAME = ":repoinit";
+
+ @Property(
+ label="Model section name",
+ description=
+ "Optional provisioning model section name to used to extract
repoinit statements"
+ + " from the raw text provided by our text URL. Leave empty to
consider the content"
+ + " provided by that URL to already be in repoinit format",
+ value=DEFAULT_MODEL_SECTION_NAME)
+ public static final String PROP_MODEL_SECTION_NAME = "model.section.name";
+ private String modelSectionName;
+
+ @Reference
+ private RepoInitParser parser;
+
+ @Activate
+ public void activate(Map<String, Object> config) {
+ textURL = PropertiesUtil.toString(config.get(PROP_TEXT_URL),
DEFAULT_TEXT_URL);
+ modelSectionName =
PropertiesUtil.toString(config.get(PROP_MODEL_SECTION_NAME),
DEFAULT_MODEL_SECTION_NAME);
+ }
+
+ @Override
+ public void processRepository(SlingRepository repo) throws Exception {
+ final String repoinit = getRepoInitText();
+ int count=0;
+
+ // loginAdministrative is ok here, definitely an admin operation
+ final Session s = repo.loginAdministrative(null);
+ final JcrRepoInitOpVisitor v = new JcrRepoInitOpVisitor(s);
+ try {
+ for(Operation op : parser.parse(new StringReader(repoinit))) {
+ count++;
+ log.info("Executing {}", op);
+ op.accept(v);
+ }
+ log.info("{} repoinit operations executed", count);
+ } finally {
+ s.logout();
+ }
+ }
+
+ /** Get the repoinit statements to execute */
+ private String getRawRepoInitText() {
+ String result = "";
+ try {
+ final URL url = new URL(textURL);
+ final URLConnection c = url.openConnection();
+ final InputStream is = c.getInputStream();
+ if(is == null) {
+ log.warn("Cannot get InputStream for {}", url);
+ } else {
+ final StringWriter w = new StringWriter();
+ IOUtils.copy(is, w, "UTF-8");
+ }
+ } catch(Exception e) {
+ log.warn("Error reading repoinit statements from " + textURL, e);
+ }
+ return result;
+ }
+
+ private String getRepoInitText() {
+ final boolean parseRawText = modelSectionName.trim().length() > 0;
+ if(parseRawText) {
+ log.info("Reading repoinit statements from {}", textURL);
+ } else {
+ log.info("Extracting repoinit statements from section {} of
provisioning model {}", modelSectionName, textURL);
+ }
+ String result = getRawRepoInitText();
+ log.debug("Raw text from {}: \n{}", textURL, result);
+ if(parseRawText) {
+ final StringReader r = new StringReader(result);
+ try {
+ final Model m = ModelReader.read(r, textURL);
+ final StringBuilder b = new StringBuilder();
+ for(Feature f : m.getFeatures()) {
+ for(Section s : f.getAdditionalSections(modelSectionName))
{
+ b.append("# ").append(modelSectionName).append(" from
").append(f.getName()).append("\n");
+ b.append("# ").append(s.getComment()).append("\n");
+ b.append(s.getContents()).append("\n");
+ }
+ }
+ result = b.toString();
+ } catch (IOException e) {
+ result = "";
+ log.warn("Error parsing provisioning model from " + textURL,
e);
+ }
+ }
+ return result;
+ }
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
