You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/04/01 16:54:56 UTC
svn commit: r1737406 - in /sling/trunk/launchpad:
builder/src/main/provisioning/ integration-tests/
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/
test-services/ test-services/src/main/java/org/apache/slin...
Author: bdelacretaz
Date: Fri Apr 1 14:54:56 2016
New Revision: 1737406
URL: http://svn.apache.org/viewvc?rev=1737406&view=rev
Log:
SLING-5571 - reactivate tests related to SlingRepositoryInitializer
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/integration-tests/pom.xml
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
sling/trunk/launchpad/test-services/pom.xml
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/FirstRepositoryInitializer.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SecondRepositoryInitializer.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SystemUsersInitializer.java
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Apr 1 14:54:56 2016
@@ -113,8 +113,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.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}
Modified: sling/trunk/launchpad/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/pom.xml (original)
+++ sling/trunk/launchpad/integration-tests/pom.xml Fri Apr 1 14:54:56 2016
@@ -239,7 +239,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java Fri Apr 1 14:54:56 2016
@@ -21,13 +21,11 @@ import java.io.IOException;
import org.apache.sling.commons.testing.integration.HttpTest;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/** Verify that the SlingRepositoryInitializer provided by our test
* services bundle have run.
*/
-@Ignore("TODO reactivate once jcr.base 2.3.2 is released")
public class RepositoryInitializersTest {
private final HttpTest H = new HttpTest();
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java Fri Apr 1 14:54:56 2016
@@ -25,12 +25,10 @@ import javax.jcr.SimpleCredentials;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.junit.rules.TeleporterRule;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
/** Verify that required system users have been created */
-@Ignore("TODO reactivate once jcr.base 2.3.2 is released")
public class SystemUsersTest {
@Rule
Modified: sling/trunk/launchpad/test-services/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/pom.xml?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/pom.xml (original)
+++ sling/trunk/launchpad/test-services/pom.xml Fri Apr 1 14:54:56 2016
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/FirstRepositoryInitializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/FirstRepositoryInitializer.java?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/FirstRepositoryInitializer.java (original)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/FirstRepositoryInitializer.java Fri Apr 1 14:54:56 2016
@@ -16,14 +16,22 @@
*/
package org.apache.sling.launchpad.testservices.repository;
+import javax.jcr.Session;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepositoryInitializer;
+import org.osgi.framework.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class FirstRepositoryInitializer {}
/**
* SlingRepositoryInitializer that creates a node to which SecondRepositoryInitializer
* can add a property, to verify that they are executed in order of their service ranking.
*/
-/** TODO reactivate once jcr.base 2.3.2 is released
-
@Component
@Service(SlingRepositoryInitializer.class)
@Properties({
@@ -52,4 +60,3 @@ public class FirstRepositoryInitializer
}
}
}
-*/
\ No newline at end of file
Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SecondRepositoryInitializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SecondRepositoryInitializer.java?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SecondRepositoryInitializer.java (original)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SecondRepositoryInitializer.java Fri Apr 1 14:54:56 2016
@@ -16,15 +16,22 @@
*/
package org.apache.sling.launchpad.testservices.repository;
+import javax.jcr.Session;
-public class SecondRepositoryInitializer {}
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepositoryInitializer;
+import org.osgi.framework.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* SlingRepositoryInitializer that adds a property to the node created by
* FirstRepositoryInitializer.
*/
-/** TODO reactivate once jcr.base 2.3.2 is released
-
@Component
@Service(SlingRepositoryInitializer.class)
@Properties({
@@ -54,4 +61,3 @@ public class SecondRepositoryInitializer
}
}
}
-*/
\ No newline at end of file
Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SystemUsersInitializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SystemUsersInitializer.java?rev=1737406&r1=1737405&r2=1737406&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SystemUsersInitializer.java (original)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/SystemUsersInitializer.java Fri Apr 1 14:54:56 2016
@@ -16,15 +16,29 @@
*/
package org.apache.sling.launchpad.testservices.repository;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import javax.jcr.Session;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepositoryInitializer;
+import org.apache.sling.repoinit.jcr.JcrRepoInitOpVisitor;
+import org.apache.sling.repoinit.parser.RepoInitParser;
+import org.apache.sling.repoinit.parser.operations.Operation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* SlingRepositoryInitializer that creates system users and sets their ACLs.
* Meant to be used for our integration tests until we can create those from
* the provisioning model.
*/
-
-public class SystemUsersInitializer {}
-/** TODO reactivate once jcr.base 2.3.2 is released
@Component
@Service(SlingRepositoryInitializer.class)
public class SystemUsersInitializer implements SlingRepositoryInitializer {
@@ -59,4 +73,3 @@ public class SystemUsersInitializer impl
}
}
}
-*/
\ No newline at end of file