You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2017/01/18 08:35:28 UTC
svn commit: r1779297 - in /sling/trunk/contrib/extensions/distribution:
extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
it/pom.xml sample/src/main/java/org/apache/sling/distribution/test/Init.java
Author: tommaso
Date: Wed Jan 18 08:35:27 2017
New Revision: 1779297
URL: http://svn.apache.org/viewvc?rev=1779297&view=rev
Log:
SLING-6475 - making it possible to run ITs with launchpad 8, adjusted timeout and sample init
Modified:
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
sling/trunk/contrib/extensions/distribution/it/pom.xml
sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
Modified: sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java?rev=1779297&r1=1779296&r2=1779297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java (original)
+++ sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java Wed Jan 18 08:35:27 2017
@@ -230,14 +230,13 @@ public class KryoContentSerializer imple
}
private void addResource(DistributionExportFilter.TreeFilter nodeFilter, LinkedList<Resource> resources, Resource resource) {
- resources.add(resource);
- for (Resource child : resource.getChildren()) {
- if (nodeFilter.matches(child.getPath())) {
+ if (nodeFilter.matches(resource.getPath())) {
+ resources.add(resource);
+ for (Resource child : resource.getChildren()) {
+ resources.add(child);
addResource(nodeFilter, resources, child);
}
}
-
-
}
Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1779297&r1=1779296&r2=1779297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Wed Jan 18 08:35:27 2017
@@ -67,7 +67,7 @@
<test.server.password />
<!-- Options for the VM that executes our runnable jar -->
- <jar.executor.vm.options>-Xmx512m</jar.executor.vm.options>
+ <jar.executor.vm.options>-Xmx2048m</jar.executor.vm.options>
<!-- Change this to use longer or shorter timeouts for testing -->
<sling.testing.timeout.multiplier>1.0</sling.testing.timeout.multiplier>
@@ -306,14 +306,12 @@
${project.build.directory},${project.build.directory}/sling/additional-bundles
</additional.bundles.path>
<keepJarRunning>${keepJarRunning}</keepJarRunning>
- <server.ready.timeout.seconds>60</server.ready.timeout.seconds>
+ <server.ready.timeout.seconds>360</server.ready.timeout.seconds>
<sling.testing.timeout.multiplier>${sling.testing.timeout.multiplier}
</sling.testing.timeout.multiplier>
<server.ready.path.1>/:script src="system/sling.js"</server.ready.path.1>
- <server.ready.path.2>/.explorer.html:href="/libs/sling/explorer/css/explorer.css"
- </server.ready.path.2>
- <server.ready.path.3>/sling-test/sling/sling-test.html:Sling client library tests
- </server.ready.path.3>
+ <server.ready.path.2>/.explorer.html:href="/libs/sling/explorer/css/explorer.css"</server.ready.path.2>
+ <server.ready.path.3>/sling-test/sling/sling-test.html:Sling client library tests</server.ready.path.3>
<start.bundles.timeout.seconds>30</start.bundles.timeout.seconds>
<bundle.install.timeout.seconds>20</bundle.install.timeout.seconds>
@@ -363,7 +361,7 @@
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>3.1.28</version>
+ <version>3.1.30</version>
<scope>provided</scope>
</dependency>
<!-- HTTP -->
@@ -394,7 +392,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java?rev=1779297&r1=1779296&r2=1779297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java Wed Jan 18 08:35:27 2017
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.UserManager;
import javax.jcr.RepositoryException;
+import javax.jcr.SimpleCredentials;
import javax.jcr.security.Privilege;
import org.apache.jackrabbit.commons.JcrUtils;
@@ -57,7 +58,7 @@ public class Init {
final String serviceUserName = "testDistributionUser";
final String distributorUserName = "testDistributorUser";
- Session session = slingRepository.loginAdministrative(null);
+ Session session = slingRepository.login(new SimpleCredentials("admin", "admin".toCharArray()));
JackrabbitSession jackrabittSession = (JackrabbitSession) session;
UserManager userManager = jackrabittSession.getUserManager();