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/02/29 16:28:24 UTC
svn commit: r1732909 - in /sling/trunk/launchpad:
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/
test-services/
test-services/src/main/java/org/apache/sling/launchpad/testservices/repository/
Author: bdelacretaz
Date: Mon Feb 29 15:28:23 2016
New Revision: 1732909
URL: http://svn.apache.org/viewvc?rev=1732909&view=rev
Log:
SLING-5571 - temporarily revert to o.a.s.jcr.api 2.3.0 and disable the affected tests
Modified:
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/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=1732909&r1=1732908&r2=1732909&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 Mon Feb 29 15:28:23 2016
@@ -16,20 +16,18 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest.repository;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import org.apache.sling.commons.testing.integration.HttpTest;
-import org.apache.sling.launchpad.testservices.repository.FirstRepositoryInitializer;
-import org.apache.sling.launchpad.testservices.repository.SecondRepositoryInitializer;
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();
@@ -46,6 +44,7 @@ public class RepositoryInitializersTest
@Test
public void checkSignalProperty() throws IOException {
+/** TODO reactivate once jcr.base 2.3.2 is released")
final String path =
FirstRepositoryInitializer.SIGNAL_NODE_PATH
+ "/" + SecondRepositoryInitializer.class.getSimpleName()
@@ -54,5 +53,6 @@ public class RepositoryInitializersTest
final String url = HttpTest.HTTP_BASE_URL + path;
final String content = H.getContent(url, HttpTest.CONTENT_TYPE_PLAIN);
assertTrue("Expecting a numeric value at " + path + ", got " + content, Long.valueOf(content) > 0);
+ */
}
}
\ No newline at end of file
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=1732909&r1=1732908&r2=1732909&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 Mon Feb 29 15:28:23 2016
@@ -17,6 +17,7 @@
package org.apache.sling.launchpad.webapp.integrationtest.repository;
import static org.junit.Assert.fail;
+
import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -24,10 +25,12 @@ 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=1732909&r1=1732908&r2=1732909&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/pom.xml (original)
+++ sling/trunk/launchpad/test-services/pom.xml Mon Feb 29 15:28:23 2016
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.0</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=1732909&r1=1732908&r2=1732909&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 Mon Feb 29 15:28:23 2016
@@ -16,22 +16,14 @@
*/
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({
@@ -60,3 +52,4 @@ 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=1732909&r1=1732908&r2=1732909&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 Mon Feb 29 15:28:23 2016
@@ -16,22 +16,15 @@
*/
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 SecondRepositoryInitializer {}
/**
* 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({
@@ -61,3 +54,4 @@ 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=1732909&r1=1732908&r2=1732909&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 Mon Feb 29 15:28:23 2016
@@ -16,29 +16,15 @@
*/
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 {
@@ -73,3 +59,4 @@ public class SystemUsersInitializer impl
}
}
}
+*/
\ No newline at end of file