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 2018/01/30 09:42:15 UTC
[sling-org-apache-sling-repoinit-it] branch master created (now
ad8bcea)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git.
at ad8bcea SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 7a5fb2e SLING-5449 - move the repoinit modules under extensions, they do contain Sling-specific stuff
new ee010b2 SLING-5449 - fix scm strings
new 1b5eb90 SLING-5355 - RepositoryInitializer created, reads from provisioning model, WIP:ProvisioningModelIT fails for now
new 1506cde SLING-5355 - ProvisioningModelIT passes
new 2f97b57 SLING-5355 - remove unnecessary snapshots and bundles in testing model
new 6e575d1 SLING-5355 - remove stray character
new 2168670 Update to Oak 1.5.3 for repoinit integration tests - which still depend on snapshots, should be fixed once those modules are released
new 209b358 SLING-5800 - back to current snapshots after releases
new c192eda Rename o.a.s.repoinit.oak-jcr to o.a.s.jcr.repoinit
new 7920504 Use released modules
new f86a64b SLING-5819 - jcr.repoinit bundle should only export what's strictly needed
new eed5e6a SLING-5819 - rename repoinit.jcr package to jcr.repoinit
new 9053c0e SLING-5819 - move jcr.repoinit module under jcr folder
new 091c759 SLING-5836 RepoInit ITs fail - 5 bundles stuck in installed state
new bee65e8 SLING-5836 - remove unused items in test provisioning model
new 003f69a SLING-5842, SLING-5843 - implement the register namespace and nodetype operations in the jcr.repoinit module
new a473bf1 SLING-5943 - support multiple model/raw references in RepositoryInitializer configuration
new 90f3ddb Back to snapshots after release
new 8738d90 SLING-6031 switch to latest teleporter version not requiring a WaitFor class This closes #164
new 93aa99f Update to parent pom 29
new cb8ca2a Use latest snapshots
new 87f6f02 Update slingstart maven plugin to 1.7.0 in all projects to avoid build problems using the reactor
new a28839b use Sling Parent 30
new fdf0f24 Fix ITs
new 7b6cb43 update slingstart options
new 3e2ccc6 Avoid snapshots
new 8ffef86 remove unneeded bundles that don't start
new 3f65583 Use recent versions and avoid more snapshots
new 2cb9af5 SLING-6984 - Allow to disable service user
new ad8bcea SLING-7167 Adjust READMEs
The 30 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 24/30: Fix ITs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit fdf0f249f970c6f15ba68f423ee004bd8d02d5ed
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 17 07:08:49 2017 +0000
Fix ITs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805262 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index ccf6aaf..b9f6df6 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,9 +19,9 @@
[feature name=repoinit-tests]
[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.jcr.repoinit/1.1.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.repoinit/1.1.5-SNAPSHOT
org.apache.sling/org.apache.sling.repoinit.parser/1.1.1-SNAPSHOT
- org.apache.sling/org.apache.sling.provisioning.model/1.4.2
+ org.apache.sling/org.apache.sling.provisioning.model/1.8.2
[artifacts]
org.apache.sling/org.apache.sling.junit.core/1.0.17-SNAPSHOT
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 14/30: SLING-5836 RepoInit ITs
fail - 5 bundles stuck in installed state
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 091c759888bc9bff769976661564c6f5bc16c591
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 12 17:35:23 2016 +0000
SLING-5836 RepoInit ITs fail - 5 bundles stuck in installed state
align artifacts and versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1752322 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/oak.txt | 4 ++--
src/main/provisioning/repoinit.txt | 3 ---
src/main/provisioning/sling.txt | 6 +++---
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
index de078f3..e301a08 100644
--- a/src/main/provisioning/oak.txt
+++ b/src/main/provisioning/oak.txt
@@ -20,7 +20,7 @@
[feature name=oak]
[variables]
- oak.version=1.5.3
+ oak.version=1.5.5
# The segment node store is used via a configuration
[artifacts startLevel=10]
@@ -42,7 +42,7 @@
# start the Oak server instance after all components have been configured
# and started to avoid restarting that component ( see SLING-4556 )
[artifacts startLevel=16]
- org.apache.sling/org.apache.sling.jcr.oak.server/1.0.0
+ org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
[configurations]
org.apache.felix.jaas.Configuration.factory-GuestLoginModule
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index f6fcf38..a78e73d 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -26,9 +26,6 @@
[artifacts]
org.apache.sling/org.apache.sling.junit.core/1.0.14
org.apache.sling/org.apache.sling.testing.tools/1.0.10
- org.apache.sling/org.apache.sling.jcr.api/2.4.0
- org.apache.sling/org.apache.sling.jcr.base/2.4.0
- org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
[settings]
org.apache.sling.commons.log.julenabled=true
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 8abcc06..2eecde5 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -20,7 +20,7 @@
[feature name=sling]
[variables]
- jackrabbit.version=2.12.1
+ jackrabbit.version=2.12.2
[artifacts]
commons-collections/commons-collections/3.2.2
@@ -87,8 +87,8 @@
[artifacts startLevel=15]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
- org.apache.sling/org.apache.sling.jcr.api/2.3.0
- org.apache.sling/org.apache.sling.jcr.base/2.3.2
+ org.apache.sling/org.apache.sling.jcr.api/2.4.0
+ org.apache.sling/org.apache.sling.jcr.base/2.4.0
org.apache.sling/org.apache.sling.jcr.registration/1.0.2
org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 30/30: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit ad8bcea174aecc042694022acd1c9023f1473406
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:23:46 2017 +0000
SLING-7167 Adjust READMEs
add missing README
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810704 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2dcc5e0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling RepoInit Integration Tests
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 25/30: update slingstart
options
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 7b6cb4336f0c2d0b25cd3d0d23c15d9578d17320
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 17 07:10:14 2017 +0000
update slingstart options
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805263 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 09458af..01a1fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,14 +55,9 @@
<test.host>localhost</test.host>
<!--
- Set this to true to stop mvn once the integration test Jetty instance is
- started. Useful to manually test the integration testing webapp.
- -->
- <integration.test.wait>false</integration.test.wait>
-
- <!--
If set to "true" this will start the launchpad with standard debug options,
or set to a string to provide custom debug settings
+ See slingstart-maven-plugin for more options (keep launchpad running etc)
-->
<launchpad.debug/>
</properties>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 23/30: use Sling Parent 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit a28839b9de040ce4ec9972f38f33e94ac63002ef
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d610d73..09458af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 28/30: Use recent versions and
avoid more snapshots
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 3f65583d873f7b6e5d9b1efe991f2069a935ac2f
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 17 07:37:40 2017 +0000
Use recent versions and avoid more snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805266 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/oak.txt | 6 +++---
src/main/provisioning/sling.txt | 26 +++++++++++++++++++++++---
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
index f230836..c223272 100644
--- a/src/main/provisioning/oak.txt
+++ b/src/main/provisioning/oak.txt
@@ -20,7 +20,7 @@
[feature name=oak]
[variables]
- oak.version=1.5.5
+ oak.version=1.6.1
# The segment node store is used via a configuration
[artifacts startLevel=10]
@@ -40,7 +40,7 @@
# and started to avoid restarting that component ( see SLING-4556 )
[artifacts startLevel=16]
# TODO replace with 1.0.2 once that's released
- org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4
[configurations]
org.apache.felix.jaas.Configuration.factory-LoginModuleImpl
@@ -68,4 +68,4 @@
[configurations runModes=oak_tar]
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
name="Default\ NodeStore"
- repository.home="sling/repository"
\ No newline at end of file
+ repository.home="sling/repository"
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 33d0f10..f0ea054 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -20,7 +20,7 @@
[feature name=sling]
[variables]
- jackrabbit.version=2.12.2
+ jackrabbit.version=2.14.0
[artifacts]
commons-collections/commons-collections/3.2.2
@@ -48,7 +48,7 @@
org.apache.sling/org.apache.sling.resourceresolver/1.4.12
org.apache.sling/org.apache.sling.scripting.api/2.1.8
org.apache.sling/org.apache.sling.scripting.core/2.0.36
- org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
+ org.apache.sling/org.apache.sling.serviceusermapper/1.3.4
org.apache.sling/org.apache.sling.servlets.get/2.1.14
org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
javax.mail/mail/1.4.7
@@ -71,7 +71,7 @@
[artifacts startLevel=15]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
org.apache.sling/org.apache.sling.jcr.api/2.4.0
- org.apache.sling/org.apache.sling.jcr.base/2.4.0
+ org.apache.sling/org.apache.sling.jcr.base/3.0.4
org.apache.sling/org.apache.sling.jcr.registration/1.0.2
org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
@@ -88,3 +88,23 @@
org.apache.sling.commons.log.level="info"
org.apache.sling.commons.log.file.size="'.'yyyy-MM-dd"
org.apache.sling.commons.log.file.number=I"7"
+
+ org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling
+ whitelist.name="sling"
+ whitelist.bundles=[
+ "org.apache.sling.junit.core",\
+ "org.apache.sling.discovery.commons",\
+ "org.apache.sling.discovery.base",\
+ "org.apache.sling.discovery.oak",\
+ "org.apache.sling.extensions.webconsolesecurityprovider",\
+ "org.apache.sling.i18n",\
+ "org.apache.sling.jcr.base",\
+ "org.apache.sling.jcr.contentloader",\
+ "org.apache.sling.jcr.davex",\
+ "org.apache.sling.jcr.jackrabbit.usermanager",\
+ "org.apache.sling.jcr.oak.server",\
+ "org.apache.sling.jcr.repoinit",\
+ "org.apache.sling.jcr.resource",\
+ "org.apache.sling.jcr.webconsole",\
+ "org.apache.sling.servlets.post"
+ ]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 02/30: SLING-5449 - fix scm
strings
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit ee010b2337ea279da35d732b81b73a078398621d
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu May 19 13:03:08 2016 +0000
SLING-5449 - fix scm strings
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1744566 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7e5d5f4..e5527eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
</description>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/repoinit/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/repoinit/it</developerConnection>
- <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/repoinit/it</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/it</developerConnection>
+ <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/it</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 01/30: SLING-5449 - move the
repoinit modules under extensions, they do contain Sling-specific stuff
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 7a5fb2e8a74bd2895ed705eb4ad15992cf20083d
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu May 19 12:50:58 2016 +0000
SLING-5449 - move the repoinit modules under extensions, they do contain Sling-specific stuff
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1744564 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 211 +++++++++++++++++++++
src/main/provisioning/model.txt | 30 +++
.../junit/teleporter/customizers/ITCustomizer.java | 34 ++++
.../org/apache/sling/repoinit/it/RepoInitIT.java | 155 +++++++++++++++
.../java/org/apache/sling/repoinit/it/Retry.java | 55 ++++++
.../java/org/apache/sling/repoinit/it/WaitFor.java | 50 +++++
src/test/resources/logback-test.xml | 49 +++++
src/test/resources/repoinit.txt | 43 +++++
8 files changed, 627 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..7e5d5f4
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>26</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.repoinit.it</artifactId>
+ <packaging>slingstart</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>Apache Sling RepoInit Integration Tests</name>
+ <description>
+ Integration tests for the RepoInit modules
+ </description>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/repoinit/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/repoinit/it</developerConnection>
+ <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/repoinit/it</url>
+ </scm>
+
+ <properties>
+ <!-- Timeout when checking for Sling readyness before starting tests -->
+ <HttpTestBase.readyTimeoutSeconds>62</HttpTestBase.readyTimeoutSeconds>
+
+ <!-- path suffix for HTTP access to Sling -->
+ <http.base.path/>
+
+ <!-- path suffix for WebDAV access to the repository -->
+ <webdav.workspace.path/>
+
+ <!-- hostname for integration tests -->
+ <test.host>localhost</test.host>
+
+ <!--
+ Set this to true to stop mvn once the integration test Jetty instance is
+ started. Useful to manually test the integration testing webapp.
+ -->
+ <integration.test.wait>false</integration.test.wait>
+
+ <!--
+ if set to "true" this will start the launchpad with the following debug options:
+ -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
+ otherwise you can provide your own debug settings
+ -->
+ <debug.options/>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>http.port</portName>
+ <portName>sling.control.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <runOrder>alphabetical</runOrder>
+ <systemPropertyVariables>
+ <launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url>
+ <launchpad.webdav.server.url>http://${test.host}:${http.port}/${webdav.workspace.path}</launchpad.webdav.server.url>
+ <HttpTestBase.readyTimeoutSeconds>${HttpTestBase.readyTimeoutSeconds}</HttpTestBase.readyTimeoutSeconds>
+ <launchpad.ready.1>GET:/index.html:200:.*Welcome to the Sling Launchpad.*</launchpad.ready.1>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>slingstart-maven-plugin</artifactId>
+ <version>1.3.6</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <servers>
+ <server>
+ <port>${http.port}</port>
+ <controlPort>${sling.control.port}</controlPort>
+ <runmode>jackrabbit</runmode>
+ <contextPath>${http.base.path}</contextPath>
+ <debug>${debug.options}</debug>
+ </server>
+ </servers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.testing</artifactId>
+ <version>2.0.18</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.junit.teleporter</artifactId>
+ <version>1.0.7-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.tools</artifactId>
+ <version>1.0.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
new file mode 100644
index 0000000..01ad176
--- /dev/null
+++ b/src/main/provisioning/model.txt
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+[feature name=sling]
+
+[artifacts]
+ org.apache.sling/org.apache.sling.launchpad/8/slingstart
+ org.apache.sling/org.apache.sling.junit.core/1.0.14
+ org.apache.sling/org.apache.sling.testing.tools/1.0.10
+
+ org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
+
+[settings]
+ org.apache.sling.commons.log.julenabled=true
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java b/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
new file mode 100644
index 0000000..668eda9
--- /dev/null
+++ b/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
@@ -0,0 +1,34 @@
+/*
+ * 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.junit.teleporter.customizers;
+
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.testing.teleporter.client.ClientSideTeleporter;
+import org.apache.sling.testing.tools.sling.TimeoutsProvider;
+
+public class ITCustomizer implements TeleporterRule.Customizer {
+
+ public static final String BASE_URL_PROP = "launchpad.http.server.url";
+ @Override
+ public void customize(TeleporterRule t, String options) {
+ final ClientSideTeleporter cst = (ClientSideTeleporter)t;
+ cst.setBaseUrl(System.getProperty(BASE_URL_PROP, BASE_URL_PROP + "_IS_NOT_SET"));
+ cst.setServerCredentials("admin", "admin");
+ cst.includeDependencyPrefix("org.apache.sling.repoinit.it");
+ cst.setTestReadyTimeoutSeconds(TimeoutsProvider.getInstance().getTimeout(5));
+ }
+}
diff --git a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
new file mode 100644
index 0000000..b40742f
--- /dev/null
+++ b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
@@ -0,0 +1,155 @@
+/*
+ * 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.it;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.UUID;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.LoginException;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.repoinit.jcr.JcrRepoInitOpVisitor;
+import org.apache.sling.repoinit.parser.RepoInitParser;
+import org.apache.sling.repoinit.parser.operations.Operation;
+import org.apache.sling.repoinit.parser.operations.OperationVisitor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/** Test service users and ACLs set from a text file. */
+public class RepoInitIT {
+
+ private Session session;
+ private static final String FRED_WILMA = "fredWilmaService";
+ private static final String ANOTHER = "anotherService";
+
+ public static final String REPO_INIT_FILE = "/repoinit.txt";
+
+ @Rule
+ public TeleporterRule teleporter = TeleporterRule
+ .forClass(getClass(), "IT")
+ .withResources(REPO_INIT_FILE);
+
+ @Before
+ public void setup() throws Exception {
+ WaitFor.services(teleporter, SlingRepository.class, RepoInitParser.class);
+ session = teleporter.getService(SlingRepository.class).loginAdministrative(null);
+
+ // Execute some repoinit statements
+ final InputStream is = getClass().getResourceAsStream(REPO_INIT_FILE);
+ assertNotNull("Expecting " + REPO_INIT_FILE, is);
+ try {
+ final RepoInitParser parser = teleporter.getService(RepoInitParser.class);
+ final OperationVisitor v = new JcrRepoInitOpVisitor(session);
+ for(Operation op : parser.parse(new InputStreamReader(is, "UTF-8"))) {
+ op.accept(v);
+ }
+ session.save();
+ } finally {
+ is.close();
+ }
+
+ // The repoinit file causes those nodes to be created
+ assertTrue("Expecting test nodes to be created", session.itemExists("/acltest/A/B"));
+ }
+
+ @After
+ public void cleanup() {
+ if(session != null) {
+ session.logout();
+ }
+ }
+
+ private boolean userExists(String id) throws LoginException, RepositoryException, InterruptedException {
+ final Authorizable a = ((JackrabbitSession)session).getUserManager().getAuthorizable(id);
+ return a != null;
+ }
+
+ private Session getServiceSession(String serviceId) throws LoginException, RepositoryException {
+ return session.impersonate(new SimpleCredentials(serviceId, new char[0]));
+ }
+
+ /** True if user can write to specified path.
+ * @throws PathNotFoundException if the path doesn't exist */
+ private boolean canWrite(String userId, String path) throws PathNotFoundException,RepositoryException {
+ if(!session.itemExists(path)) {
+ throw new PathNotFoundException(path);
+ }
+
+ final Session serviceSession = getServiceSession(userId);
+ final String testNodeName = "test_" + UUID.randomUUID().toString();
+ try {
+ ((Node)serviceSession.getItem(path)).addNode(testNodeName);
+ serviceSession.save();
+ } catch(AccessDeniedException ade) {
+ return false;
+ } finally {
+ serviceSession.logout();
+ }
+ return true;
+ }
+
+ @Test
+ public void serviceUserCreated() throws Exception {
+ new Retry() {
+ @Override
+ public Void call() throws Exception {
+ assertTrue("Expecting user " + FRED_WILMA, userExists(FRED_WILMA));
+ return null;
+ }
+ };
+ }
+
+ @Test
+ public void fredWilmaAcl() throws Exception {
+ new Retry() {
+ @Override
+ public Void call() throws Exception {
+ assertFalse("Expecting no write access to A", canWrite(FRED_WILMA, "/acltest/A"));
+ assertTrue("Expecting write access to A/B", canWrite(FRED_WILMA, "/acltest/A/B"));
+ return null;
+ }
+ };
+ }
+
+ @Test
+ public void anotherUserAcl() throws Exception {
+ new Retry() {
+ @Override
+ public Void call() throws Exception {
+ assertTrue("Expecting write access to A", canWrite(ANOTHER, "/acltest/A"));
+ assertFalse("Expecting no write access to B", canWrite(ANOTHER, "/acltest/A/B"));
+ return null;
+ }
+ };
+ }
+}
diff --git a/src/test/java/org/apache/sling/repoinit/it/Retry.java b/src/test/java/org/apache/sling/repoinit/it/Retry.java
new file mode 100644
index 0000000..65f7f8e
--- /dev/null
+++ b/src/test/java/org/apache/sling/repoinit/it/Retry.java
@@ -0,0 +1,55 @@
+/*
+ * 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.it;
+
+import static org.junit.Assert.fail;
+import java.util.concurrent.Callable;
+
+/** RetryRule does not seem to work for teleported tests */
+public abstract class Retry implements Callable<Void> {
+ public static final int DEFAULT_INTERVAL = 100;
+ public static final int DEFAULT_TIMEOUT = 10000;
+
+ public Retry() throws Exception {
+ this(DEFAULT_TIMEOUT, DEFAULT_INTERVAL);
+ }
+
+ public Retry(int timeout, int interval) {
+ final long endTime = System.currentTimeMillis() + timeout;
+ Throwable failure = null;
+ while(System.currentTimeMillis() < endTime) {
+ try {
+ failure = null;
+ call();
+ break;
+ } catch(Throwable t) {
+ failure = t;
+ try {
+ Thread.sleep(interval);
+ } catch(InterruptedException ignore) {
+ }
+ }
+ }
+ if(failure != null) {
+ if(failure instanceof AssertionError) {
+ throw (AssertionError)failure;
+ }
+ fail("Failed with timeout:" + failure.toString());
+ }
+ }
+}
diff --git a/src/test/java/org/apache/sling/repoinit/it/WaitFor.java b/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
new file mode 100644
index 0000000..60d2b81
--- /dev/null
+++ b/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
@@ -0,0 +1,50 @@
+/*
+ * 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.it;
+
+import static org.junit.Assert.fail;
+
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.testing.tools.sling.TimeoutsProvider;
+
+public class WaitFor {
+ /** Block until the specified set of serviceClasss are present, or timeout */
+ public static void services(TeleporterRule teleporter, Class <?> ... serviceClasses) {
+ for(Class<?> serviceClass : serviceClasses) {
+ service(teleporter, serviceClass);
+ }
+ }
+
+ /** Block until the specified serviceClass is present, or timeout */
+ public static void service(TeleporterRule teleporter, Class <?> serviceClass) {
+ final long timeout = System.currentTimeMillis() + TimeoutsProvider.getInstance().getTimeout(10000);
+ while(System.currentTimeMillis() < timeout) {
+ try {
+ if(teleporter.getService(serviceClass) != null) {
+ return;
+ }
+ } catch(IllegalStateException ignore) {
+ }
+
+ try {
+ Thread.sleep(50L);
+ } catch(InterruptedException ignore) {
+ }
+ }
+ fail("Timeout waiting for serviceClass " + serviceClass.getName());
+ }
+}
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..a28514c
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<configuration>
+
+ <appender name="file" class="ch.qos.logback.core.FileAppender">
+ <file>target/sling-tests.log</file>
+ <encoder>
+ <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="sift" class="ch.qos.logback.classic.sift.SiftingAppender">
+ <discriminator>
+ <Key>testclass</Key>
+ <DefaultValue>junit</DefaultValue>
+ </discriminator>
+ <sift>
+ <appender name="FILE-${testname}" class="ch.qos.logback.core.FileAppender">
+ <File>target/surefire-reports/${testclass}.log</File>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <Pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</Pattern>
+ </layout>
+ </appender>
+ </sift>
+ </appender>
+
+ <logger name="org.apache.sling.launchpad" level="DEBUG" />
+
+ <root level="INFO">
+ <appender-ref ref="file" />
+ <appender-ref ref="sift" />
+ </root>
+
+</configuration>
diff --git a/src/test/resources/repoinit.txt b/src/test/resources/repoinit.txt
new file mode 100644
index 0000000..de2286a
--- /dev/null
+++ b/src/test/resources/repoinit.txt
@@ -0,0 +1,43 @@
+#
+# 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.
+#
+
+# Paths on which ACLs will be set
+create path /acltest/A/B
+
+# Service users and ACLs for our integration tests
+create service user fredWilmaService
+create service user anotherService
+
+# ACLs for those service users
+set ACL for fredWilmaService
+ allow jcr:all on /acltest
+ deny jcr:write on /acltest/A
+end
+
+set ACL for fredWilmaService
+ allow jcr:write on /acltest/A/B
+end
+
+set ACL on /acltest
+ allow jcr:all for anotherService
+end
+
+set ACL on /acltest/A/B
+ deny jcr:write for anotherService
+end
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 03/30: SLING-5355 -
RepositoryInitializer created, reads from provisioning model,
WIP:ProvisioningModelIT fails for now
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 1b5eb9092d37d977f97cea0ec5fa671a8747a112
Author: Bertrand Delacretaz <bd...@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@1744594 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
src/main/provisioning/boot.txt | 55 +++++++
src/main/provisioning/{model.txt => launchpad.txt} | 17 +-
src/main/provisioning/model.txt | 25 ++-
src/main/provisioning/oak.txt | 90 +++++++++++
src/main/provisioning/{model.txt => repoinit.txt} | 12 +-
src/main/provisioning/sling.txt | 176 +++++++++++++++++++++
.../provisioning/{model.txt => standalone.txt} | 18 +--
.../sling/repoinit/it/ProvisioningModelIT.java | 67 ++++++++
.../org/apache/sling/repoinit/it/RepoInitIT.java | 48 +-----
src/test/java/org/apache/sling/repoinit/it/U.java | 80 ++++++++++
11 files changed, 508 insertions(+), 82 deletions(-)
diff --git a/pom.xml b/pom.xml
index e5527eb..8a89025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.3.6</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<executions>
<execution>
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
new file mode 100644
index 0000000..e598b24
--- /dev/null
+++ b/src/main/provisioning/boot.txt
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+# The :boot feature contains all things to bootstrap the installation.
+#
+[feature name=:boot]
+
+# additional entries for sling.properties
+# ---------------------------------------
+# oak_tar and oak_mongo run modes are mutually exclusive,
+# and cannot be changed after the first startup
+[settings]
+ sling.run.mode.install.options=oak_tar,oak_mongo
+
+[artifacts]
+ org.slf4j/slf4j-api/1.7.6
+ org.apache.sling/org.apache.sling.commons.log/4.0.6
+ org.apache.sling/org.apache.sling.commons.logservice/1.0.6
+ org.slf4j/jcl-over-slf4j/1.7.6
+ org.slf4j/log4j-over-slf4j/1.7.6
+ org.apache.sling/org.apache.sling.settings/1.3.8
+ org.apache.sling/org.apache.sling.fragment.xml/1.0.2
+ org.apache.sling/org.apache.sling.fragment.transaction/1.0.0
+ org.apache.sling/org.apache.sling.javax.activation/0.1.0
+ org.apache.sling/org.apache.sling.fragment.ws/1.0.2
+ org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
+ org.apache.sling/org.apache.sling.installer.core/3.6.8
+ org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
+ org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
+ org.apache.sling/org.apache.sling.installer.factory.subsystems/1.0.0
+ org.apache.sling/org.apache.sling.installer.factory.subsystems-base/1.0.0-SNAPSHOT
+ org.apache.felix/org.apache.felix.configadmin/1.8.8
+ org.apache.felix/org.apache.felix.eventadmin/1.4.4
+ org.apache.aries/org.apache.aries.util/1.1.1
+ org.apache.felix/org.apache.felix.coordinator/1.0.2
+ org.eclipse.equinox/org.eclipse.equinox.region/1.2.101.v20150831-1342
+ org.apache.aries.subsystem/org.apache.aries.subsystem.api/2.0.6
+ org.apache.aries.subsystem/org.apache.aries.subsystem.core/2.0.6
+ # dependency with javax.inject - required for Sling Models (SLING-4710)
+ org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/launchpad.txt
similarity index 66%
copy from src/main/provisioning/model.txt
copy to src/main/provisioning/launchpad.txt
index 01ad176..eeb0713 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/launchpad.txt
@@ -16,15 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
-[feature name=sling]
-
-[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8/slingstart
- org.apache.sling/org.apache.sling.junit.core/1.0.14
- org.apache.sling/org.apache.sling.testing.tools/1.0.10
-
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
-
-[settings]
- org.apache.sling.commons.log.julenabled=true
\ No newline at end of file
+# The :launchpad feature defines Sling's launchpad version
+# Only a single artifact is allowed within this feature.
+#
+[feature name=:launchpad]
+ org.apache.sling/org.apache.sling.launchpad.base/5.4.0-2.6.11-SNAPSHOT
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
index 01ad176..7c55e46 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/model.txt
@@ -16,15 +16,28 @@
# specific language governing permissions and limitations
# under the License.
#
-[feature name=sling]
+[feature name=repoinit-tests]
+
+[artifacts startLevel=2]
+ org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8/slingstart
org.apache.sling/org.apache.sling.junit.core/1.0.14
org.apache.sling/org.apache.sling.testing.tools/1.0.10
+ org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
-
[settings]
- org.apache.sling.commons.log.julenabled=true
\ No newline at end of file
+ org.apache.sling.commons.log.julenabled=true
+
+[:repoinit]
+# Test the RepositoryInitializer which reads such sections
+create path /repoinit/fromProvisioningModel
+
+create service user userFromProvisioningModel
+
+set ACL for userFromProvisioningModel
+ allow jcr:read on /repoinit/fromProvisioningModel
+ deny jcr:write on /repoinit/fromProvisioningModel
+end
\ No newline at end of file
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
new file mode 100644
index 0000000..31627b7
--- /dev/null
+++ b/src/main/provisioning/oak.txt
@@ -0,0 +1,90 @@
+#
+# 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.
+#
+# This is the OAK feature.
+[feature name=oak]
+
+[variables]
+ oak.version=1.4.0
+
+# The segment node store is used via a configuration
+[artifacts startLevel=10]
+ org.apache.felix/org.apache.felix.jaas/0.0.4
+
+[artifacts startLevel=15]
+ org.apache.jackrabbit/oak-core/${oak.version}
+ org.apache.jackrabbit/oak-commons/${oak.version}
+ org.apache.jackrabbit/oak-lucene/${oak.version}
+ org.apache.jackrabbit/oak-blob/${oak.version}
+
+[artifacts startLevel=15 runModes=oak_tar]
+ org.apache.jackrabbit/oak-segment/${oak.version}
+
+[artifacts startLevel=15 runModes=oak_mongo]
+ org.mongodb/mongo-java-driver/2.14.0
+
+# start the Oak server instance after all components have been configured
+# and started to avoid restarting that component ( see SLING-4556 )
+[artifacts startLevel=16]
+ org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
+
+[configurations]
+ org.apache.felix.jaas.Configuration.factory-GuestLoginModule
+ jaas.controlFlag="optional"
+ jaas.classname="org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule"
+ jaas.ranking=I"300"
+
+ org.apache.felix.jaas.Configuration.factory-LoginModuleImpl
+ jaas.controlFlag="required"
+ jaas.classname="org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl"
+
+ org.apache.felix.jaas.Configuration.factory-TokenLoginModule
+ jaas.controlFlag="sufficient"
+ jaas.classname="org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule"
+ jaas.ranking=I"200"
+
+ org.apache.felix.jaas.ConfigurationSpi
+ jaas.defaultRealmName="jackrabbit.oak"
+ jaas.configProviderName="FelixJaasProvider"
+
+ org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl
+ org.apache.jackrabbit.oak.authentication.configSpiName="FelixJaasProvider"
+
+ org.apache.jackrabbit.oak.security.user.UserConfigurationImpl
+ groupsPath="/home/groups"
+ usersPath="/home/users"
+ defaultDepth="1"
+ importBehavior="besteffort"
+
+ org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider
+ enabledActions=["org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction"]
+ userPrivilegeNames=["jcr:all"]
+ groupPrivilegeNames=["jcr:read"]
+
+ org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService
+ localIndexDir="sling/repository/index"
+
+[configurations runModes=oak_tar]
+ org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
+ name="Default\ NodeStore"
+ repository.home="sling/repository"
+
+[configurations runModes=oak_mongo]
+ org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService
+ mongouri="mongodb://localhost:27017"
+ db="sling"
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/repoinit.txt
similarity index 79%
copy from src/main/provisioning/model.txt
copy to src/main/provisioning/repoinit.txt
index 01ad176..e300bce 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -16,15 +16,9 @@
# specific language governing permissions and limitations
# under the License.
#
-[feature name=sling]
+[feature name=repoinit]
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8/slingstart
- org.apache.sling/org.apache.sling.junit.core/1.0.14
- org.apache.sling/org.apache.sling.testing.tools/1.0.10
-
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
-
-[settings]
- org.apache.sling.commons.log.julenabled=true
\ No newline at end of file
+ org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
+
\ No newline at end of file
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
new file mode 100644
index 0000000..4908aad
--- /dev/null
+++ b/src/main/provisioning/sling.txt
@@ -0,0 +1,176 @@
+#
+# 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.
+#
+# The feature for Apache Sling
+[feature name=sling]
+
+[variables]
+ jackrabbit.version=2.12.1
+
+[artifacts]
+ commons-collections/commons-collections/3.2.2
+ org.apache.commons/commons-collections4/4.1
+ commons-codec/commons-codec/1.9
+ commons-lang/commons-lang/2.6
+ org.apache.commons/commons-lang3/3.4
+ org.apache.commons/commons-math/2.2
+ org.apache.geronimo.bundles/commons-httpclient/3.1_1
+ org.apache.httpcomponents/httpcore-osgi/4.4.1
+ org.apache.httpcomponents/httpclient-osgi/4.4.1
+ com.google.guava/guava/15.0
+ org.apache.sling/org.apache.sling.adapter/2.1.6
+ org.apache.sling/org.apache.sling.api/2.11.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.auth.core/1.3.14
+ org.apache.sling/org.apache.sling.auth.form/1.0.8
+ org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
+ org.apache.sling/org.apache.sling.commons.classloader/1.3.2
+ org.apache.sling/org.apache.sling.commons.compiler/2.3.0
+ org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.commons.mime/2.1.9-SNAPSHOT
+ org.apache.sling/org.apache.sling.commons.osgi/2.4.0
+ org.apache.sling/org.apache.sling.commons.scheduler/2.4.14
+ org.apache.sling/org.apache.sling.commons.threads/3.2.5-SNAPSHOT
+ org.apache.sling/org.apache.sling.discovery.api/1.0.2
+ org.apache.sling/org.apache.sling.discovery.support/1.0.0
+ org.apache.sling/org.apache.sling.discovery.commons/1.0.10
+ org.apache.sling/org.apache.sling.discovery.base/1.1.2
+ org.apache.sling/org.apache.sling.discovery.oak/1.2.6
+ org.apache.sling/org.apache.sling.engine/2.4.7-SNAPSHOT
+ org.apache.sling/org.apache.sling.event/4.0.0
+ org.apache.sling/org.apache.sling.event.dea/1.0.4
+ org.apache.sling/org.apache.sling.fsresource/1.1.5-SNAPSHOT
+ org.apache.sling/org.apache.sling.hc.core/1.2.2
+ org.apache.sling/org.apache.sling.hc.webconsole/1.1.2
+ org.apache.sling/org.apache.sling.i18n/2.4.6
+ org.apache.sling/org.apache.sling.installer.console/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.17-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.resource/2.7.4
+ org.apache.sling/org.apache.sling.launchpad.content/2.0.8
+ org.apache.sling/org.apache.sling.models.api/1.2.2
+ org.apache.sling/org.apache.sling.models.impl/1.2.6
+ org.apache.sling/org.apache.sling.resourceresolver/1.4.12
+ org.apache.sling/org.apache.sling.scripting.api/2.1.8
+ org.apache.sling/org.apache.sling.scripting.core/2.0.37-SNAPSHOT
+ org.apache.sling/org.apache.sling.scripting.javascript/2.0.28
+ org.apache.sling/org.apache.sling.scripting.jsp/2.1.8
+ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.5-SNAPSHOT
+ org.apache.sling/org.apache.sling.scripting.sightly/1.0.16
+ org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.10
+ org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.0
+ org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.2
+ org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
+ org.apache.sling/org.apache.sling.servlets.get/2.1.14
+ org.apache.sling/org.apache.sling.servlets.post/2.3.10
+ org.apache.sling/org.apache.sling.servlets.resolver/2.4.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.xss/1.0.8
+ javax.mail/mail/1.4.7
+ org.apache.geronimo.bundles/jstl/1.2_1
+ org.apache.felix/org.apache.felix.http.whiteboard/3.0.0
+
+[artifacts startLevel=5]
+ org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.0
+ org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0
+ org.apache.felix/org.apache.felix.inventory/1.0.4
+ org.apache.felix/org.apache.felix.prefs/1.0.6
+ org.apache.felix/org.apache.felix.webconsole/4.2.14
+ org.apache.geronimo.bundles/json/20090211_1
+ org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.0.2
+ org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.2
+ org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.2
+ org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.4
+ org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6
+ org.apache.sling/org.apache.sling.commons.json/2.0.16
+ org.apache.felix/org.apache.felix.bundlerepository/1.6.4
+ org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
+ org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0
+ org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1
+ org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0
+ commons-io/commons-io/2.4
+ commons-fileupload/commons-fileupload/1.3.1
+
+[artifacts startLevel=10]
+ org.apache.felix/org.apache.felix.http.sslfilter/1.0.4
+ org.apache.felix/org.apache.felix.scr/2.0.2
+ org.apache.felix/org.apache.felix.metatype/1.1.2
+ org.apache.tika/tika-core/1.11
+ org.apache.tika/tika-bundle/1.11
+
+[artifacts startLevel=15]
+ org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
+ org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.base/2.3.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.registration/1.0.2
+ org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
+ org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
+ org.apache.jackrabbit/jackrabbit-spi/${jackrabbit.version}
+ org.apache.jackrabbit/jackrabbit-spi-commons/${jackrabbit.version}
+ org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}
+ org.apache.jackrabbit/jackrabbit-jcr-rmi/${jackrabbit.version}
+ org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
+ org.apache.sling/org.apache.sling.jcr.webdav/2.3.5-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.davex/1.3.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
+ org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
+ org.apache.sling/org.apache.sling.extensions.explorer/1.0.4
+ io.dropwizard.metrics/metrics-core/3.1.0
+ org.apache.sling/org.apache.sling.commons.metrics/1.0.1-SNAPSHOT
+
+[configurations]
+ org.apache.sling.engine.impl.log.RequestLogger
+ access.log.enabled=B"true"
+ request.log.outputtype=I"0"
+ access.log.output="log.access"
+ request.log.output="log.request"
+ request.log.enabled=B"true"
+ access.log.outputtype=I"0"
+
+ org.apache.sling.commons.log.LogManager
+ org.apache.sling.commons.log.pattern="%d{dd.MM.yyyy HH:mm:ss.SSS}\ *%level*\ [%thread]\ %logger\ %msg%n"
+ org.apache.sling.commons.log.file="logs/error.log"
+ org.apache.sling.commons.log.level="info"
+ org.apache.sling.commons.log.file.size="'.'yyyy-MM-dd"
+ org.apache.sling.commons.log.file.number=I"7"
+
+ org.apache.sling.commons.log.LogManager.factory.config-access.log
+ org.apache.sling.commons.log.pattern="%msg%n"
+ org.apache.sling.commons.log.names=["log.access"]
+ org.apache.sling.commons.log.file="logs/access.log"
+ org.apache.sling.commons.log.level="info"
+
+ org.apache.sling.commons.log.LogManager.factory.config-request.log
+ org.apache.sling.commons.log.pattern="%msg%n"
+ org.apache.sling.commons.log.names=["log.request"]
+ org.apache.sling.commons.log.file="logs/request.log"
+ org.apache.sling.commons.log.level="info"
+
+ # configure the ScriptCache for scripts used by org.apache.sling.scripting.sightly.js.provider
+ org.apache.sling.scripting.core.impl.ScriptCacheImpl
+ org.apache.sling.scripting.cache.additional_extensions=["js"]
+
+ # WebDAV servlet requires config now
+ org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet
+ dav.root="/dav"
+
+ # DavEx servlet requires config now
+ org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet
+ alias="/server"
+
+ org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge
+ enabled=B"true"
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/standalone.txt
similarity index 66%
copy from src/main/provisioning/model.txt
copy to src/main/provisioning/standalone.txt
index 01ad176..06aace4 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/standalone.txt
@@ -16,15 +16,11 @@
# specific language governing permissions and limitations
# under the License.
#
-[feature name=sling]
-
-[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8/slingstart
- org.apache.sling/org.apache.sling.junit.core/1.0.14
- org.apache.sling/org.apache.sling.testing.tools/1.0.10
-
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
+# The :standalone feature contains artifacts for the standalone jar
+#
+[feature name=standalone]
-[settings]
- org.apache.sling.commons.log.julenabled=true
\ No newline at end of file
+# Add a servlet implementation for the standalone case
+[artifacts startLevel=5 runModes=:standalone]
+ org.apache.felix/org.apache.felix.http.servlet-api/1.1.2
+ org.apache.felix/org.apache.felix.http.jetty/3.1.4
diff --git a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
new file mode 100644
index 0000000..df00cb3
--- /dev/null
+++ b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
@@ -0,0 +1,67 @@
+/*
+ * 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.it;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import javax.jcr.Session;
+
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.repoinit.parser.RepoInitParser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+@Ignore("Fails for now - initializer not executed?")
+/** Test repoinit statements supplied by our provisioning model */
+public class ProvisioningModelIT {
+
+ private Session session;
+ private static final String TEST_PATH = "/repoinit/fromProvisioningModel";
+ private static final String TEST_USER = "fromProvisioningModel";
+
+ @Rule
+ public TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "IT");
+
+ @Before
+ public void setup() throws Exception {
+ WaitFor.services(teleporter, SlingRepository.class, RepoInitParser.class);
+ session = teleporter.getService(SlingRepository.class).loginAdministrative(null);
+ }
+
+ @After
+ public void cleanup() {
+ if(session != null) {
+ session.logout();
+ }
+ }
+
+ @Test
+ public void provisioningModelUserExists() throws Exception {
+ assertTrue("Expecting user " + TEST_USER, U.userExists(session, TEST_USER));
+ }
+
+ @Test
+ public void provisioningModelUserAcl() throws Exception {
+ assertTrue("Expecting read access", U.canRead(session, TEST_USER, TEST_PATH));
+ assertFalse("Expecting no write access", U.canWrite(session, TEST_USER, TEST_PATH));
+ }
+}
diff --git a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
index b40742f..6c188fe 100644
--- a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
@@ -22,18 +22,9 @@ import static org.junit.Assert.assertTrue;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.UUID;
-import javax.jcr.AccessDeniedException;
-import javax.jcr.LoginException;
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.repoinit.jcr.JcrRepoInitOpVisitor;
@@ -89,41 +80,12 @@ public class RepoInitIT {
}
}
- private boolean userExists(String id) throws LoginException, RepositoryException, InterruptedException {
- final Authorizable a = ((JackrabbitSession)session).getUserManager().getAuthorizable(id);
- return a != null;
- }
-
- private Session getServiceSession(String serviceId) throws LoginException, RepositoryException {
- return session.impersonate(new SimpleCredentials(serviceId, new char[0]));
- }
-
- /** True if user can write to specified path.
- * @throws PathNotFoundException if the path doesn't exist */
- private boolean canWrite(String userId, String path) throws PathNotFoundException,RepositoryException {
- if(!session.itemExists(path)) {
- throw new PathNotFoundException(path);
- }
-
- final Session serviceSession = getServiceSession(userId);
- final String testNodeName = "test_" + UUID.randomUUID().toString();
- try {
- ((Node)serviceSession.getItem(path)).addNode(testNodeName);
- serviceSession.save();
- } catch(AccessDeniedException ade) {
- return false;
- } finally {
- serviceSession.logout();
- }
- return true;
- }
-
@Test
public void serviceUserCreated() throws Exception {
new Retry() {
@Override
public Void call() throws Exception {
- assertTrue("Expecting user " + FRED_WILMA, userExists(FRED_WILMA));
+ assertTrue("Expecting user " + FRED_WILMA, U.userExists(session, FRED_WILMA));
return null;
}
};
@@ -134,8 +96,8 @@ public class RepoInitIT {
new Retry() {
@Override
public Void call() throws Exception {
- assertFalse("Expecting no write access to A", canWrite(FRED_WILMA, "/acltest/A"));
- assertTrue("Expecting write access to A/B", canWrite(FRED_WILMA, "/acltest/A/B"));
+ assertFalse("Expecting no write access to A", U.canWrite(session, FRED_WILMA, "/acltest/A"));
+ assertTrue("Expecting write access to A/B", U.canWrite(session, FRED_WILMA, "/acltest/A/B"));
return null;
}
};
@@ -146,8 +108,8 @@ public class RepoInitIT {
new Retry() {
@Override
public Void call() throws Exception {
- assertTrue("Expecting write access to A", canWrite(ANOTHER, "/acltest/A"));
- assertFalse("Expecting no write access to B", canWrite(ANOTHER, "/acltest/A/B"));
+ assertTrue("Expecting write access to A", U.canWrite(session, ANOTHER, "/acltest/A"));
+ assertFalse("Expecting no write access to B", U.canWrite(session, ANOTHER, "/acltest/A/B"));
return null;
}
};
diff --git a/src/test/java/org/apache/sling/repoinit/it/U.java b/src/test/java/org/apache/sling/repoinit/it/U.java
new file mode 100644
index 0000000..918597d
--- /dev/null
+++ b/src/test/java/org/apache/sling/repoinit/it/U.java
@@ -0,0 +1,80 @@
+/*
+ * 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.it;
+
+import java.util.UUID;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.LoginException;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.api.security.user.Authorizable;
+
+/** Test utilities */
+public class U {
+ public static boolean userExists(Session session, String id) throws LoginException, RepositoryException, InterruptedException {
+ final Authorizable a = ((JackrabbitSession)session).getUserManager().getAuthorizable(id);
+ return a != null;
+ }
+
+ public static Session getServiceSession(Session session, String serviceId) throws LoginException, RepositoryException {
+ return session.impersonate(new SimpleCredentials(serviceId, new char[0]));
+ }
+
+ /** True if user can write to specified path.
+ * @throws PathNotFoundException if the path doesn't exist */
+ public static boolean canWrite(Session session, String userId, String path) throws PathNotFoundException,RepositoryException {
+ if(!session.itemExists(path)) {
+ throw new PathNotFoundException(path);
+ }
+
+ final Session serviceSession = getServiceSession(session, userId);
+ final String testNodeName = "test_" + UUID.randomUUID().toString();
+ try {
+ ((Node)serviceSession.getItem(path)).addNode(testNodeName);
+ serviceSession.save();
+ } catch(AccessDeniedException ade) {
+ return false;
+ } finally {
+ serviceSession.logout();
+ }
+ return true;
+ }
+
+ /** True if user can read specified path.
+ * @throws PathNotFoundException if the path doesn't exist */
+ public static boolean canRead(Session session, String userId, String path) throws PathNotFoundException,RepositoryException {
+ if(!session.itemExists(path)) {
+ throw new PathNotFoundException(path);
+ }
+
+ final Session serviceSession = getServiceSession(session, userId);
+ try {
+ serviceSession.getItem(path);
+ } catch(AccessDeniedException ade) {
+ return false;
+ } finally {
+ serviceSession.logout();
+ }
+ return true;
+ }
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 07/30: Update to Oak 1.5.3 for
repoinit integration tests - which still depend on snapshots,
should be fixed once those modules are released
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 2168670d0c710aaa875cc43f268c2a741b9b6fbf
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jun 21 12:27:43 2016 +0000
Update to Oak 1.5.3 for repoinit integration tests - which still depend on snapshots, should be fixed once those modules are released
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1749500 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/oak.txt | 3 ++-
src/main/provisioning/sling.txt | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
index 72445b3..de078f3 100644
--- a/src/main/provisioning/oak.txt
+++ b/src/main/provisioning/oak.txt
@@ -20,7 +20,7 @@
[feature name=oak]
[variables]
- oak.version=1.4.0
+ oak.version=1.5.3
# The segment node store is used via a configuration
[artifacts startLevel=10]
@@ -31,6 +31,7 @@
org.apache.jackrabbit/oak-commons/${oak.version}
org.apache.jackrabbit/oak-lucene/${oak.version}
org.apache.jackrabbit/oak-blob/${oak.version}
+ org.apache.jackrabbit/oak-jcr/${oak.version}
[artifacts startLevel=15 runModes=oak_tar]
org.apache.jackrabbit/oak-segment/${oak.version}
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 02daff7..8abcc06 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -57,7 +57,7 @@
org.apache.sling/org.apache.sling.scripting.core/2.0.36
org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
org.apache.sling/org.apache.sling.servlets.get/2.1.14
- org.apache.sling/org.apache.sling.servlets.post/2.3.10
+ org.apache.sling/org.apache.sling.servlets.post/2.3.12
org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
javax.mail/mail/1.4.7
org.apache.geronimo.bundles/jstl/1.2_1
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 10/30: Use released modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 79205045b921b6580c52db7f6a38be8070ed85fe
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Jun 27 17:51:08 2016 +0000
Use released modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1750394 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 48bc57b..9e70f5f 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -26,8 +26,8 @@
[artifacts]
org.apache.sling/org.apache.sling.junit.core/1.0.14
org.apache.sling/org.apache.sling.testing.tools/1.0.10
- org.apache.sling/org.apache.sling.jcr.api/2.4.1-SNAPSHOT
- org.apache.sling/org.apache.sling.jcr.base/2.4.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.api/2.4.0
+ org.apache.sling/org.apache.sling.jcr.base/2.4.0
org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
[settings]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 05/30: SLING-5355 - remove
unnecessary snapshots and bundles in testing model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 2f97b572acb8a312e9407f31d6fa68096f16b9eb
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri May 20 10:04:32 2016 +0000
SLING-5355 - remove unnecessary snapshots and bundles in testing model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1744682 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/boot.txt | 2 --
src/main/provisioning/launchpad.txt | 2 +-
src/main/provisioning/oak.txt | 2 +-
src/main/provisioning/repoinit.txt | 4 ++-
src/main/provisioning/sling.txt | 51 ++++++++-----------------------------
5 files changed, 16 insertions(+), 45 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index e598b24..b08d1f9 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -42,8 +42,6 @@
org.apache.sling/org.apache.sling.installer.core/3.6.8
org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
- org.apache.sling/org.apache.sling.installer.factory.subsystems/1.0.0
- org.apache.sling/org.apache.sling.installer.factory.subsystems-base/1.0.0-SNAPSHOT
org.apache.felix/org.apache.felix.configadmin/1.8.8
org.apache.felix/org.apache.felix.eventadmin/1.4.4
org.apache.aries/org.apache.aries.util/1.1.1
diff --git a/src/main/provisioning/launchpad.txt b/src/main/provisioning/launchpad.txt
index eeb0713..27158a9 100644
--- a/src/main/provisioning/launchpad.txt
+++ b/src/main/provisioning/launchpad.txt
@@ -20,4 +20,4 @@
# Only a single artifact is allowed within this feature.
#
[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/5.4.0-2.6.11-SNAPSHOT
+ org.apache.sling/org.apache.sling.launchpad.base/5.4.0-2.6.10
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
index 31627b7..72445b3 100644
--- a/src/main/provisioning/oak.txt
+++ b/src/main/provisioning/oak.txt
@@ -41,7 +41,7 @@
# start the Oak server instance after all components have been configured
# and started to avoid restarting that component ( see SLING-4556 )
[artifacts startLevel=16]
- org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.oak.server/1.0.0
[configurations]
org.apache.felix.jaas.Configuration.factory-GuestLoginModule
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 7c55e46..15308f3 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -27,7 +27,9 @@
org.apache.sling/org.apache.sling.junit.core/1.0.14
org.apache.sling/org.apache.sling.testing.tools/1.0.10
org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
-
+ org.apache.sling/org.apache.sling.jcr.base/2.3.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
+
[settings]
org.apache.sling.commons.log.julenabled=true
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 4908aad..02daff7 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -34,67 +34,41 @@
org.apache.httpcomponents/httpclient-osgi/4.4.1
com.google.guava/guava/15.0
org.apache.sling/org.apache.sling.adapter/2.1.6
- org.apache.sling/org.apache.sling.api/2.11.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.api/2.11.0
org.apache.sling/org.apache.sling.auth.core/1.3.14
org.apache.sling/org.apache.sling.auth.form/1.0.8
org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
org.apache.sling/org.apache.sling.commons.classloader/1.3.2
org.apache.sling/org.apache.sling.commons.compiler/2.3.0
- org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.3-SNAPSHOT
- org.apache.sling/org.apache.sling.commons.mime/2.1.9-SNAPSHOT
+ org.apache.sling/org.apache.sling.commons.mime/2.1.8
org.apache.sling/org.apache.sling.commons.osgi/2.4.0
org.apache.sling/org.apache.sling.commons.scheduler/2.4.14
- org.apache.sling/org.apache.sling.commons.threads/3.2.5-SNAPSHOT
+ org.apache.sling/org.apache.sling.commons.threads/3.2.4
org.apache.sling/org.apache.sling.discovery.api/1.0.2
- org.apache.sling/org.apache.sling.discovery.support/1.0.0
- org.apache.sling/org.apache.sling.discovery.commons/1.0.10
- org.apache.sling/org.apache.sling.discovery.base/1.1.2
- org.apache.sling/org.apache.sling.discovery.oak/1.2.6
- org.apache.sling/org.apache.sling.engine/2.4.7-SNAPSHOT
+ org.apache.sling/org.apache.sling.engine/2.4.6
org.apache.sling/org.apache.sling.event/4.0.0
org.apache.sling/org.apache.sling.event.dea/1.0.4
- org.apache.sling/org.apache.sling.fsresource/1.1.5-SNAPSHOT
- org.apache.sling/org.apache.sling.hc.core/1.2.2
- org.apache.sling/org.apache.sling.hc.webconsole/1.1.2
+ org.apache.sling/org.apache.sling.fsresource/1.1.4
org.apache.sling/org.apache.sling.i18n/2.4.6
- org.apache.sling/org.apache.sling.installer.console/1.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.17-SNAPSHOT
- org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT
org.apache.sling/org.apache.sling.jcr.resource/2.7.4
org.apache.sling/org.apache.sling.launchpad.content/2.0.8
- org.apache.sling/org.apache.sling.models.api/1.2.2
- org.apache.sling/org.apache.sling.models.impl/1.2.6
org.apache.sling/org.apache.sling.resourceresolver/1.4.12
org.apache.sling/org.apache.sling.scripting.api/2.1.8
- org.apache.sling/org.apache.sling.scripting.core/2.0.37-SNAPSHOT
- org.apache.sling/org.apache.sling.scripting.javascript/2.0.28
- org.apache.sling/org.apache.sling.scripting.jsp/2.1.8
- org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.5-SNAPSHOT
- org.apache.sling/org.apache.sling.scripting.sightly/1.0.16
- org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.10
- org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.0
- org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.2
+ org.apache.sling/org.apache.sling.scripting.core/2.0.36
org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
org.apache.sling/org.apache.sling.servlets.get/2.1.14
org.apache.sling/org.apache.sling.servlets.post/2.3.10
- org.apache.sling/org.apache.sling.servlets.resolver/2.4.3-SNAPSHOT
- org.apache.sling/org.apache.sling.xss/1.0.8
+ org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
javax.mail/mail/1.4.7
org.apache.geronimo.bundles/jstl/1.2_1
org.apache.felix/org.apache.felix.http.whiteboard/3.0.0
[artifacts startLevel=5]
- org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.0
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0
org.apache.felix/org.apache.felix.inventory/1.0.4
org.apache.felix/org.apache.felix.prefs/1.0.6
org.apache.felix/org.apache.felix.webconsole/4.2.14
org.apache.geronimo.bundles/json/20090211_1
- org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.0.2
- org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.2
- org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.2
- org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.4
- org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6
org.apache.sling/org.apache.sling.commons.json/2.0.16
org.apache.felix/org.apache.felix.bundlerepository/1.6.4
org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
@@ -113,8 +87,8 @@
[artifacts startLevel=15]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
- org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
- org.apache.sling/org.apache.sling.jcr.base/2.3.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.api/2.3.0
+ org.apache.sling/org.apache.sling.jcr.base/2.3.2
org.apache.sling/org.apache.sling.jcr.registration/1.0.2
org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
@@ -123,14 +97,11 @@
org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-rmi/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
- org.apache.sling/org.apache.sling.jcr.webdav/2.3.5-SNAPSHOT
- org.apache.sling/org.apache.sling.jcr.davex/1.3.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.webdav/2.3.4
+ org.apache.sling/org.apache.sling.jcr.davex/1.3.2
org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
- org.apache.sling/org.apache.sling.extensions.explorer/1.0.4
- io.dropwizard.metrics/metrics-core/3.1.0
- org.apache.sling/org.apache.sling.commons.metrics/1.0.1-SNAPSHOT
[configurations]
org.apache.sling.engine.impl.log.RequestLogger
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 29/30: SLING-6984 - Allow to
disable service user
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 2cb9af511c4b438257467bab0aa37efe9c0c3b2c
Author: Timothée Maret <tm...@apache.org>
AuthorDate: Fri Aug 18 13:11:46 2017 +0000
SLING-6984 - Allow to disable service user
* Implement UserVisitor#visitDisableServiceUser
* Add integration test
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805421 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 3 +++
.../org/apache/sling/repoinit/it/ProvisioningModelIT.java | 8 ++++++++
src/test/java/org/apache/sling/repoinit/it/U.java | 14 +++++++++++++-
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index de6e48e..fa39eae 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -45,6 +45,9 @@ set ACL for userFromProvisioningModel
deny jcr:write on /repoinit/fromProvisioningModel
end
+create service user thirdUserFromProvisioningModel
+disable service user thirdUserFromProvisioningModel : "Disabled for testing reason"
+
register namespace (slingtest) http://sling.apache.org/ns/test/repoinit-it/v1.0
register nodetypes
diff --git a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
index f06f8e4..c640a6d 100644
--- a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
@@ -37,6 +37,7 @@ public class ProvisioningModelIT {
private static final String TEST_PATH = "/repoinit/fromProvisioningModel";
private static final String TEST_USER = "userFromProvisioningModel";
private static final String SECOND_TEST_USER = "secondUserFromProvisioningModel";
+ private static final String THIRD_TEST_USER = "thirdUserFromProvisioningModel";
private final String uniqueID = UUID.randomUUID().toString();
@Rule
@@ -58,6 +59,13 @@ public class ProvisioningModelIT {
public void usersCreated() throws Exception {
assertTrue("Expecting user " + TEST_USER, U.userExists(session, TEST_USER));
assertTrue("Expecting user " + SECOND_TEST_USER, U.userExists(session, SECOND_TEST_USER));
+ assertTrue("Expecting user " + THIRD_TEST_USER, U.userExists(session, THIRD_TEST_USER));
+ }
+
+ @Test
+ public void userDisabled() throws Exception {
+ assertTrue(String.format("Expecting user %s to be disabled", THIRD_TEST_USER), U.userIsDisabled(session, THIRD_TEST_USER));
+ assertFalse(String.format("Expecting user %s to be enabled", TEST_USER), U.userIsDisabled(session,TEST_USER));
}
@Test
diff --git a/src/test/java/org/apache/sling/repoinit/it/U.java b/src/test/java/org/apache/sling/repoinit/it/U.java
index 918597d..d5b91f1 100644
--- a/src/test/java/org/apache/sling/repoinit/it/U.java
+++ b/src/test/java/org/apache/sling/repoinit/it/U.java
@@ -28,6 +28,7 @@ import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.User;
/** Test utilities */
public class U {
@@ -35,7 +36,18 @@ public class U {
final Authorizable a = ((JackrabbitSession)session).getUserManager().getAuthorizable(id);
return a != null;
}
-
+
+ public static boolean userIsDisabled(Session session, String id) throws RepositoryException {
+ final Authorizable a = ((JackrabbitSession)session).getUserManager().getAuthorizable(id);
+ if (a == null) {
+ throw new IllegalStateException("Authorizable not found:" + id);
+ }
+ if (a.isGroup()) {
+ throw new IllegalStateException("Authorizable is a group:" + id);
+ }
+ return ((User)a).isDisabled();
+ }
+
public static Session getServiceSession(Session session, String serviceId) throws LoginException, RepositoryException {
return session.impersonate(new SimpleCredentials(serviceId, new char[0]));
}
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 08/30: SLING-5800 - back to
current snapshots after releases
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 209b3581158211820144b7a2514adfeb8c0d271c
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jun 21 14:50:54 2016 +0000
SLING-5800 - back to current snapshots after releases
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1749545 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 89e5024..5d45c74 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,15 +19,15 @@
[feature name=repoinit-tests]
[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.oak-jcr/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/1.0.1-SNAPSHOT
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
org.apache.sling/org.apache.sling.junit.core/1.0.14
org.apache.sling/org.apache.sling.testing.tools/1.0.10
- org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
- org.apache.sling/org.apache.sling.jcr.base/2.3.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.api/2.4.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.base/2.4.1-SNAPSHOT
org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
[settings]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 20/30: Update to parent pom 29
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 93aa99f44df5d55dd27321aaa3b7b109b63f7ede
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 8 16:06:00 2016 +0000
Update to parent pom 29
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768718 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index f0152b6..0940d6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath/>
</parent>
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.4.2</version>
+ <version>1.4.4</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -140,7 +140,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -186,7 +186,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -197,7 +196,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.teleporter</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 16/30: SLING-5842,
SLING-5843 - implement the register namespace and nodetype
operations in the jcr.repoinit module
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 003f69a2117fc9a30e68d38555aabf4d49bb505e
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jul 19 15:54:38 2016 +0000
SLING-5842, SLING-5843 - implement the register namespace and nodetype operations in the jcr.repoinit module
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1753399 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 8 ++++++++
src/main/provisioning/sling.txt | 5 -----
.../apache/sling/repoinit/it/ProvisioningModelIT.java | 16 +++++++++++++---
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index a78e73d..c515fb8 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -40,3 +40,11 @@ set ACL for userFromProvisioningModel
allow jcr:read on /repoinit/fromProvisioningModel
deny jcr:write on /repoinit/fromProvisioningModel
end
+
+register namespace (slingtest) http://sling.apache.org/ns/test/repoinit-it/v1.0
+
+register nodetypes
+<<===
+<< <slingtest='http://sling.apache.org/ns/test/repoinit-it/v1.0'>
+<< [slingtest:unstructured] > nt:unstructured
+===>>
\ No newline at end of file
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 8af59d8..9263516 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -45,7 +45,6 @@
org.apache.sling/org.apache.sling.commons.threads/3.2.4
org.apache.sling/org.apache.sling.engine/2.4.6
org.apache.sling/org.apache.sling.event/4.0.0
- org.apache.sling/org.apache.sling.event.dea/1.0.4
org.apache.sling/org.apache.sling.jcr.resource/2.7.4
org.apache.sling/org.apache.sling.resourceresolver/1.4.12
org.apache.sling/org.apache.sling.scripting.api/2.1.8
@@ -55,7 +54,6 @@
org.apache.sling/org.apache.sling.servlets.post/2.3.12
org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
javax.mail/mail/1.4.7
- org.apache.geronimo.bundles/jstl/1.2_1
org.apache.felix/org.apache.felix.http.whiteboard/3.0.0
[artifacts startLevel=5]
@@ -63,9 +61,6 @@
org.apache.felix/org.apache.felix.webconsole/4.2.14
org.apache.geronimo.bundles/json/20090211_1
org.apache.sling/org.apache.sling.commons.json/2.0.16
- org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0
- org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1
- org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0
commons-io/commons-io/2.4
commons-fileupload/commons-fileupload/1.3.1
diff --git a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
index 31f80b9..7e270ab 100644
--- a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
@@ -19,6 +19,9 @@ package org.apache.sling.repoinit.it;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.util.UUID;
+
+import javax.jcr.Node;
import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
@@ -26,7 +29,6 @@ import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -36,6 +38,7 @@ public class ProvisioningModelIT {
private Session session;
private static final String TEST_PATH = "/repoinit/fromProvisioningModel";
private static final String TEST_USER = "userFromProvisioningModel";
+ private final String uniqueID = UUID.randomUUID().toString();
@Rule
public TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "IT");
@@ -54,13 +57,20 @@ public class ProvisioningModelIT {
}
@Test
- public void provisioningModelUserExists() throws Exception {
+ public void userCreated() throws Exception {
assertTrue("Expecting user " + TEST_USER, U.userExists(session, TEST_USER));
}
@Test
- public void provisioningModelUserAcl() throws Exception {
+ public void userAclSet() throws Exception {
assertTrue("Expecting read access", U.canRead(session, TEST_USER, TEST_PATH));
assertFalse("Expecting no write access", U.canWrite(session, TEST_USER, TEST_PATH));
}
+
+ @Test
+ public void namespaceAndCndRegistered() throws Exception {
+ final String nodeName = "ns-" + uniqueID;
+ session.getRootNode().addNode(nodeName, "slingtest:unstructured");
+ session.save();
+ }
}
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 09/30: Rename
o.a.s.repoinit.oak-jcr to o.a.s.jcr.repoinit
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit c192eda7ab9fbd611a7eacb94db7a18cf098b0d0
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Jun 27 17:49:13 2016 +0000
Rename o.a.s.repoinit.oak-jcr to o.a.s.jcr.repoinit
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1750393 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 5d45c74..48bc57b 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,7 +19,7 @@
[feature name=repoinit-tests]
[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.repoinit/0.9.9-SNAPSHOT
org.apache.sling/org.apache.sling.repoinit.parser/1.0.1-SNAPSHOT
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 18/30: Back to snapshots after
release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 90f3ddb6525f0a69270cba06f5402a36a11010d7
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Aug 22 16:26:13 2016 +0000
Back to snapshots after release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1757228 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 56392c8..e81a475 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,8 +19,8 @@
[feature name=repoinit-tests]
[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.jcr.repoinit/1.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/1.0.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.repoinit/1.0.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/1.0.5-SNAPSHOT
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 22/30: Update slingstart maven
plugin to 1.7.0 in all projects to avoid build problems using the reactor
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 87f6f029cd5005933889c5ace0b20b7759f4f4fd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Dec 29 14:29:30 2016 +0000
Update slingstart maven plugin to 1.7.0 in all projects to avoid build problems using the reactor
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1776436 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0940d6d..d610d73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.4.4</version>
+ <version>1.7.0</version>
<extensions>true</extensions>
<executions>
<execution>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 04/30: SLING-5355 -
ProvisioningModelIT passes
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 1506cde4cb8e2bce7ed00a1b1639cc3448b446ff
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri May 20 09:40:50 2016 +0000
SLING-5355 - ProvisioningModelIT passes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1744678 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 9 ++---
src/main/provisioning/model.txt | 43 ----------------------
src/main/provisioning/repoinit.txt | 27 ++++++++++++--
.../sling/repoinit/it/ProvisioningModelIT.java | 3 +-
4 files changed, 28 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8a89025..f0152b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,10 @@
<integration.test.wait>false</integration.test.wait>
<!--
- if set to "true" this will start the launchpad with the following debug options:
- -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
- otherwise you can provide your own debug settings
+ If set to "true" this will start the launchpad with standard debug options,
+ or set to a string to provide custom debug settings
-->
- <debug.options/>
+ <launchpad.debug/>
</properties>
<build>
@@ -130,7 +129,7 @@
<controlPort>${sling.control.port}</controlPort>
<runmode>jackrabbit</runmode>
<contextPath>${http.base.path}</contextPath>
- <debug>${debug.options}</debug>
+ <debug>${launchpad.debug}</debug>
</server>
</servers>
</configuration>
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
deleted file mode 100644
index 7c55e46..0000000
--- a/src/main/provisioning/model.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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.
-#
-[feature name=repoinit-tests]
-
-[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.provisioning.model/1.4.2
-
-[artifacts]
- org.apache.sling/org.apache.sling.junit.core/1.0.14
- org.apache.sling/org.apache.sling.testing.tools/1.0.10
- org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
-
-[settings]
- org.apache.sling.commons.log.julenabled=true
-
-[:repoinit]
-# Test the RepositoryInitializer which reads such sections
-create path /repoinit/fromProvisioningModel
-
-create service user userFromProvisioningModel
-
-set ACL for userFromProvisioningModel
- allow jcr:read on /repoinit/fromProvisioningModel
- deny jcr:write on /repoinit/fromProvisioningModel
-end
\ No newline at end of file
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index e300bce..7c55e46 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -16,9 +16,28 @@
# specific language governing permissions and limitations
# under the License.
#
-[feature name=repoinit]
+[feature name=repoinit-tests]
-[artifacts]
- org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
+[artifacts startLevel=2]
org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
-
\ No newline at end of file
+ org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.provisioning.model/1.4.2
+
+[artifacts]
+ org.apache.sling/org.apache.sling.junit.core/1.0.14
+ org.apache.sling/org.apache.sling.testing.tools/1.0.10
+ org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
+
+[settings]
+ org.apache.sling.commons.log.julenabled=true
+
+[:repoinit]
+# Test the RepositoryInitializer which reads such sections
+create path /repoinit/fromProvisioningModel
+
+create service user userFromProvisioningModel
+
+set ACL for userFromProvisioningModel
+ allow jcr:read on /repoinit/fromProvisioningModel
+ deny jcr:write on /repoinit/fromProvisioningModel
+end
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
index df00cb3..31f80b9 100644
--- a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
@@ -30,13 +30,12 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-@Ignore("Fails for now - initializer not executed?")
/** Test repoinit statements supplied by our provisioning model */
public class ProvisioningModelIT {
private Session session;
private static final String TEST_PATH = "/repoinit/fromProvisioningModel";
- private static final String TEST_USER = "fromProvisioningModel";
+ private static final String TEST_USER = "userFromProvisioningModel";
@Rule
public TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "IT");
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 06/30: SLING-5355 - remove
stray character
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 6e575d137711cc90f484c5f8895ba80e2d2d6849
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri May 20 10:34:50 2016 +0000
SLING-5355 - remove stray character
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1744690 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 15308f3..89e5024 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -34,7 +34,7 @@
org.apache.sling.commons.log.julenabled=true
[:repoinit]
-# Test the RepositoryInitializer which reads such sections
+# Test the RepositoryInitializer which reads such sections
create path /repoinit/fromProvisioningModel
create service user userFromProvisioningModel
@@ -42,4 +42,4 @@ create service user userFromProvisioningModel
set ACL for userFromProvisioningModel
allow jcr:read on /repoinit/fromProvisioningModel
deny jcr:write on /repoinit/fromProvisioningModel
-end
\ No newline at end of file
+end
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 19/30: SLING-6031 switch to
latest teleporter version not requiring a WaitFor class This closes #164
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 8738d904441ef6914060a3e2bf8bb632bafd23c1
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Sep 6 20:02:31 2016 +0000
SLING-6031 switch to latest teleporter version not requiring a WaitFor class
This closes #164
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759500 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 2 +-
.../sling/repoinit/it/ProvisioningModelIT.java | 3 --
.../org/apache/sling/repoinit/it/RepoInitIT.java | 1 -
.../java/org/apache/sling/repoinit/it/WaitFor.java | 50 ----------------------
4 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index e81a475..be58599 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -24,7 +24,7 @@
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
- org.apache.sling/org.apache.sling.junit.core/1.0.14
+ org.apache.sling/org.apache.sling.junit.core/1.0.17-SNAPSHOT
org.apache.sling/org.apache.sling.testing.tools/1.0.10
[settings]
diff --git a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
index e5c1776..f06f8e4 100644
--- a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
@@ -21,12 +21,10 @@ import static org.junit.Assert.assertTrue;
import java.util.UUID;
-import javax.jcr.Node;
import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.repoinit.parser.RepoInitParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -46,7 +44,6 @@ public class ProvisioningModelIT {
@Before
public void setup() throws Exception {
- WaitFor.services(teleporter, SlingRepository.class, RepoInitParser.class);
session = teleporter.getService(SlingRepository.class).loginAdministrative(null);
}
diff --git a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
index 77072f3..2a49fbb 100644
--- a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
@@ -50,7 +50,6 @@ public class RepoInitIT {
@Before
public void setup() throws Exception {
- WaitFor.services(teleporter, SlingRepository.class, RepoInitParser.class);
session = teleporter.getService(SlingRepository.class).loginAdministrative(null);
// Execute some repoinit statements
diff --git a/src/test/java/org/apache/sling/repoinit/it/WaitFor.java b/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
deleted file mode 100644
index 60d2b81..0000000
--- a/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.it;
-
-import static org.junit.Assert.fail;
-
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.testing.tools.sling.TimeoutsProvider;
-
-public class WaitFor {
- /** Block until the specified set of serviceClasss are present, or timeout */
- public static void services(TeleporterRule teleporter, Class <?> ... serviceClasses) {
- for(Class<?> serviceClass : serviceClasses) {
- service(teleporter, serviceClass);
- }
- }
-
- /** Block until the specified serviceClass is present, or timeout */
- public static void service(TeleporterRule teleporter, Class <?> serviceClass) {
- final long timeout = System.currentTimeMillis() + TimeoutsProvider.getInstance().getTimeout(10000);
- while(System.currentTimeMillis() < timeout) {
- try {
- if(teleporter.getService(serviceClass) != null) {
- return;
- }
- } catch(IllegalStateException ignore) {
- }
-
- try {
- Thread.sleep(50L);
- } catch(InterruptedException ignore) {
- }
- }
- fail("Timeout waiting for serviceClass " + serviceClass.getName());
- }
-}
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 13/30: SLING-5819 - move
jcr.repoinit module under jcr folder
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 9053c0ef64c3103ee8a967fb2df137f772b02567
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Jul 11 14:34:14 2016 +0000
SLING-5819 - move jcr.repoinit module under jcr folder
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1752162 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 9e70f5f..f6fcf38 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,8 +19,8 @@
[feature name=repoinit-tests]
[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.jcr.repoinit/0.9.9-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.repoinit/1.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/1.0.3-SNAPSHOT
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 17/30: SLING-5943 - support
multiple model/raw references in RepositoryInitializer configuration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit a473bf12341effd3827836f3097b89df41e20835
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Aug 16 14:28:28 2016 +0000
SLING-5943 - support multiple model/raw references in RepositoryInitializer configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1756518 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 10 +++++++++-
.../java/org/apache/sling/repoinit/it/ProvisioningModelIT.java | 4 +++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index c515fb8..56392c8 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -30,6 +30,10 @@
[settings]
org.apache.sling.commons.log.julenabled=true
+[configurations]
+ org.apache.sling.jcr.repoinit.impl.RepositoryInitializer
+ references=["model:context:/resources/provisioning/model.txt","model@repoinitTwo:context:/resources/provisioning/model.txt"]
+
[:repoinit]
# Test the RepositoryInitializer which reads such sections
create path /repoinit/fromProvisioningModel
@@ -47,4 +51,8 @@ register nodetypes
<<===
<< <slingtest='http://sling.apache.org/ns/test/repoinit-it/v1.0'>
<< [slingtest:unstructured] > nt:unstructured
-===>>
\ No newline at end of file
+===>>
+
+# second section to test multiple configured URLs
+[:repoinitTwo]
+create service user secondUserFromProvisioningModel
diff --git a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
index 7e270ab..e5c1776 100644
--- a/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
@@ -38,6 +38,7 @@ public class ProvisioningModelIT {
private Session session;
private static final String TEST_PATH = "/repoinit/fromProvisioningModel";
private static final String TEST_USER = "userFromProvisioningModel";
+ private static final String SECOND_TEST_USER = "secondUserFromProvisioningModel";
private final String uniqueID = UUID.randomUUID().toString();
@Rule
@@ -57,8 +58,9 @@ public class ProvisioningModelIT {
}
@Test
- public void userCreated() throws Exception {
+ public void usersCreated() throws Exception {
assertTrue("Expecting user " + TEST_USER, U.userExists(session, TEST_USER));
+ assertTrue("Expecting user " + SECOND_TEST_USER, U.userExists(session, SECOND_TEST_USER));
}
@Test
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 26/30: Avoid snapshots
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 3e2ccc6bbc1dae4b77741455ff9ad0a636e901b3
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 17 07:13:14 2017 +0000
Avoid snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805264 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index b9f6df6..de6e48e 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -24,7 +24,7 @@
org.apache.sling/org.apache.sling.provisioning.model/1.8.2
[artifacts]
- org.apache.sling/org.apache.sling.junit.core/1.0.17-SNAPSHOT
+ org.apache.sling/org.apache.sling.junit.core/1.0.18
org.apache.sling/org.apache.sling.testing.tools/1.0.10
[settings]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 27/30: remove unneeded bundles
that don't start
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit 8ffef86d9924f8029e2a733cd59457012a8cbbdc
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Aug 17 07:15:40 2017 +0000
remove unneeded bundles that don't start
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805265 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/sling.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 9263516..33d0f10 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -44,14 +44,12 @@
org.apache.sling/org.apache.sling.commons.scheduler/2.4.14
org.apache.sling/org.apache.sling.commons.threads/3.2.4
org.apache.sling/org.apache.sling.engine/2.4.6
- org.apache.sling/org.apache.sling.event/4.0.0
org.apache.sling/org.apache.sling.jcr.resource/2.7.4
org.apache.sling/org.apache.sling.resourceresolver/1.4.12
org.apache.sling/org.apache.sling.scripting.api/2.1.8
org.apache.sling/org.apache.sling.scripting.core/2.0.36
org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
org.apache.sling/org.apache.sling.servlets.get/2.1.14
- org.apache.sling/org.apache.sling.servlets.post/2.3.12
org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
javax.mail/mail/1.4.7
org.apache.felix/org.apache.felix.http.whiteboard/3.0.0
@@ -82,8 +80,6 @@
org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-rmi/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
- org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4
- org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
[configurations]
org.apache.sling.commons.log.LogManager
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 11/30: SLING-5819 -
jcr.repoinit bundle should only export what's strictly needed
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit f86a64b153cbd513ab1a231f426fcceb883be486
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Jul 4 11:38:33 2016 +0000
SLING-5819 - jcr.repoinit bundle should only export what's strictly needed
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1751251 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
index 6c188fe..f71fc04 100644
--- a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
@@ -27,10 +27,8 @@ import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.repoinit.jcr.JcrRepoInitOpVisitor;
+import org.apache.sling.repoinit.jcr.JcrRepoInitOpsProcessor;
import org.apache.sling.repoinit.parser.RepoInitParser;
-import org.apache.sling.repoinit.parser.operations.Operation;
-import org.apache.sling.repoinit.parser.operations.OperationVisitor;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -60,10 +58,8 @@ public class RepoInitIT {
assertNotNull("Expecting " + REPO_INIT_FILE, is);
try {
final RepoInitParser parser = teleporter.getService(RepoInitParser.class);
- final OperationVisitor v = new JcrRepoInitOpVisitor(session);
- for(Operation op : parser.parse(new InputStreamReader(is, "UTF-8"))) {
- op.accept(v);
- }
+ final JcrRepoInitOpsProcessor processor = teleporter.getService(JcrRepoInitOpsProcessor.class);
+ processor.apply(session, parser.parse(new InputStreamReader(is, "UTF-8")));
session.save();
} finally {
is.close();
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 15/30: SLING-5836 - remove
unused items in test provisioning model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit bee65e8b23fe28196cc211a32a73dba192582bb0
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jul 12 21:12:32 2016 +0000
SLING-5836 - remove unused items in test provisioning model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1752346 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/boot.txt | 9 +-------
src/main/provisioning/oak.txt | 24 ++-------------------
src/main/provisioning/sling.txt | 48 -----------------------------------------
3 files changed, 3 insertions(+), 78 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index b08d1f9..a7050a1 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -43,11 +43,4 @@
org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
org.apache.felix/org.apache.felix.configadmin/1.8.8
- org.apache.felix/org.apache.felix.eventadmin/1.4.4
- org.apache.aries/org.apache.aries.util/1.1.1
- org.apache.felix/org.apache.felix.coordinator/1.0.2
- org.eclipse.equinox/org.eclipse.equinox.region/1.2.101.v20150831-1342
- org.apache.aries.subsystem/org.apache.aries.subsystem.api/2.0.6
- org.apache.aries.subsystem/org.apache.aries.subsystem.core/2.0.6
- # dependency with javax.inject - required for Sling Models (SLING-4710)
- org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
+ org.apache.felix/org.apache.felix.eventadmin/1.4.4
\ No newline at end of file
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
index e301a08..f230836 100644
--- a/src/main/provisioning/oak.txt
+++ b/src/main/provisioning/oak.txt
@@ -36,29 +36,17 @@
[artifacts startLevel=15 runModes=oak_tar]
org.apache.jackrabbit/oak-segment/${oak.version}
-[artifacts startLevel=15 runModes=oak_mongo]
- org.mongodb/mongo-java-driver/2.14.0
-
# start the Oak server instance after all components have been configured
# and started to avoid restarting that component ( see SLING-4556 )
[artifacts startLevel=16]
+ # TODO replace with 1.0.2 once that's released
org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
[configurations]
- org.apache.felix.jaas.Configuration.factory-GuestLoginModule
- jaas.controlFlag="optional"
- jaas.classname="org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule"
- jaas.ranking=I"300"
-
org.apache.felix.jaas.Configuration.factory-LoginModuleImpl
jaas.controlFlag="required"
jaas.classname="org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl"
- org.apache.felix.jaas.Configuration.factory-TokenLoginModule
- jaas.controlFlag="sufficient"
- jaas.classname="org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule"
- jaas.ranking=I"200"
-
org.apache.felix.jaas.ConfigurationSpi
jaas.defaultRealmName="jackrabbit.oak"
jaas.configProviderName="FelixJaasProvider"
@@ -77,15 +65,7 @@
userPrivilegeNames=["jcr:all"]
groupPrivilegeNames=["jcr:read"]
- org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService
- localIndexDir="sling/repository/index"
-
[configurations runModes=oak_tar]
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
name="Default\ NodeStore"
- repository.home="sling/repository"
-
-[configurations runModes=oak_mongo]
- org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService
- mongouri="mongodb://localhost:27017"
- db="sling"
+ repository.home="sling/repository"
\ No newline at end of file
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 2eecde5..8af59d8 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -37,21 +37,16 @@
org.apache.sling/org.apache.sling.api/2.11.0
org.apache.sling/org.apache.sling.auth.core/1.3.14
org.apache.sling/org.apache.sling.auth.form/1.0.8
- org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
org.apache.sling/org.apache.sling.commons.classloader/1.3.2
org.apache.sling/org.apache.sling.commons.compiler/2.3.0
org.apache.sling/org.apache.sling.commons.mime/2.1.8
org.apache.sling/org.apache.sling.commons.osgi/2.4.0
org.apache.sling/org.apache.sling.commons.scheduler/2.4.14
org.apache.sling/org.apache.sling.commons.threads/3.2.4
- org.apache.sling/org.apache.sling.discovery.api/1.0.2
org.apache.sling/org.apache.sling.engine/2.4.6
org.apache.sling/org.apache.sling.event/4.0.0
org.apache.sling/org.apache.sling.event.dea/1.0.4
- org.apache.sling/org.apache.sling.fsresource/1.1.4
- org.apache.sling/org.apache.sling.i18n/2.4.6
org.apache.sling/org.apache.sling.jcr.resource/2.7.4
- org.apache.sling/org.apache.sling.launchpad.content/2.0.8
org.apache.sling/org.apache.sling.resourceresolver/1.4.12
org.apache.sling/org.apache.sling.scripting.api/2.1.8
org.apache.sling/org.apache.sling.scripting.core/2.0.36
@@ -65,13 +60,9 @@
[artifacts startLevel=5]
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0
- org.apache.felix/org.apache.felix.inventory/1.0.4
- org.apache.felix/org.apache.felix.prefs/1.0.6
org.apache.felix/org.apache.felix.webconsole/4.2.14
org.apache.geronimo.bundles/json/20090211_1
org.apache.sling/org.apache.sling.commons.json/2.0.16
- org.apache.felix/org.apache.felix.bundlerepository/1.6.4
- org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0
org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1
org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0
@@ -79,7 +70,6 @@
commons-fileupload/commons-fileupload/1.3.1
[artifacts startLevel=10]
- org.apache.felix/org.apache.felix.http.sslfilter/1.0.4
org.apache.felix/org.apache.felix.scr/2.0.2
org.apache.felix/org.apache.felix.metatype/1.1.2
org.apache.tika/tika-core/1.11
@@ -97,51 +87,13 @@
org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-rmi/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
- org.apache.sling/org.apache.sling.jcr.webdav/2.3.4
- org.apache.sling/org.apache.sling.jcr.davex/1.3.2
org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
- org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
[configurations]
- org.apache.sling.engine.impl.log.RequestLogger
- access.log.enabled=B"true"
- request.log.outputtype=I"0"
- access.log.output="log.access"
- request.log.output="log.request"
- request.log.enabled=B"true"
- access.log.outputtype=I"0"
-
org.apache.sling.commons.log.LogManager
org.apache.sling.commons.log.pattern="%d{dd.MM.yyyy HH:mm:ss.SSS}\ *%level*\ [%thread]\ %logger\ %msg%n"
org.apache.sling.commons.log.file="logs/error.log"
org.apache.sling.commons.log.level="info"
org.apache.sling.commons.log.file.size="'.'yyyy-MM-dd"
org.apache.sling.commons.log.file.number=I"7"
-
- org.apache.sling.commons.log.LogManager.factory.config-access.log
- org.apache.sling.commons.log.pattern="%msg%n"
- org.apache.sling.commons.log.names=["log.access"]
- org.apache.sling.commons.log.file="logs/access.log"
- org.apache.sling.commons.log.level="info"
-
- org.apache.sling.commons.log.LogManager.factory.config-request.log
- org.apache.sling.commons.log.pattern="%msg%n"
- org.apache.sling.commons.log.names=["log.request"]
- org.apache.sling.commons.log.file="logs/request.log"
- org.apache.sling.commons.log.level="info"
-
- # configure the ScriptCache for scripts used by org.apache.sling.scripting.sightly.js.provider
- org.apache.sling.scripting.core.impl.ScriptCacheImpl
- org.apache.sling.scripting.cache.additional_extensions=["js"]
-
- # WebDAV servlet requires config now
- org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet
- dav.root="/dav"
-
- # DavEx servlet requires config now
- org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet
- alias="/server"
-
- org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge
- enabled=B"true"
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 21/30: Use latest snapshots
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit cb8ca2a2892fe620636f1ad468b0d95808803bf5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 9 06:34:39 2016 +0000
Use latest snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768841 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/repoinit.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index be58599..ccf6aaf 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,8 +19,8 @@
[feature name=repoinit-tests]
[artifacts startLevel=2]
- org.apache.sling/org.apache.sling.jcr.repoinit/1.0.3-SNAPSHOT
- org.apache.sling/org.apache.sling.repoinit.parser/1.0.5-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.repoinit/1.1.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/1.1.1-SNAPSHOT
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-org-apache-sling-repoinit-it] 12/30: SLING-5819 - rename
repoinit.jcr package to jcr.repoinit
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit eed5e6aebc2d7724bb1312cf6dd6b88f0430e0f6
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Jul 4 12:21:03 2016 +0000
SLING-5819 - rename repoinit.jcr package to jcr.repoinit
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1751260 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
index f71fc04..77072f3 100644
--- a/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
+++ b/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
@@ -26,8 +26,8 @@ import java.io.InputStreamReader;
import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.repoinit.JcrRepoInitOpsProcessor;
import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.repoinit.jcr.JcrRepoInitOpsProcessor;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.junit.After;
import org.junit.Before;
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.