sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-repoinit-it] 04/30: SLING-5355 - ProvisioningModelIT passes
Date Tue, 30 Jan 2018 09:42:19 GMT
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 <bdelacretaz@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.

Mime
View raw message