svn commit: r1782759 - in /sling/trunk/contrib/extensions/distribution: it/src/test/java/org/apache/sling/distribution/it/ sample/src/main/java/org/apache/sling/distribution/test/ sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install....

[tm...@apache.org]

Author: tmaret
Date: Mon Feb 13 12:23:03 2017
New Revision: 1782759

URL: http://svn.apache.org/viewvc?rev=1782759&view=rev
Log:
SLING-6512 - Distribution ITs fail as they expect packages to be deleted synchronously

* Configure package cleaner to run every second
* Add wait to allow for packages to be cleaned
* Add distribution-agent-user service user mapping configuration & setup ACL for service user

Modified:
    sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
    sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java
    sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
    sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.notshared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json
    sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json
    sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.shared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json
    sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distributionAgentService.json

Modified: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java?rev=1782759&r1=1782758&r2=1782759&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java Mon Feb 13 12:23:03 2017
@@ -19,27 +19,20 @@
 package org.apache.sling.distribution.it;
 
 import java.io.IOException;
-import java.util.Iterator;
 
 import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
 import org.apache.sling.testing.tools.sling.SlingClient;
 import org.apache.sling.testing.tools.sling.SlingInstance;
 import org.apache.sling.testing.tools.sling.SlingInstanceManager;
 import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 
 import static org.apache.sling.distribution.it.DistributionUtils.agentUrl;
 import static org.apache.sling.distribution.it.DistributionUtils.assertEmptyFolder;
 import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
-import static org.apache.sling.distribution.it.DistributionUtils.assertPostResourceWithParameters;
 import static org.apache.sling.distribution.it.DistributionUtils.authorAgentConfigUrl;
 import static org.apache.sling.distribution.it.DistributionUtils.exporterUrl;
-import static org.apache.sling.distribution.it.DistributionUtils.getResource;
 import static org.apache.sling.distribution.it.DistributionUtils.importerUrl;
 import static org.apache.sling.distribution.it.DistributionUtils.setArrayProperties;
-import static org.junit.Assert.assertFalse;
 
 /**
  * Integration test base class for distribution
@@ -132,8 +125,9 @@ public abstract class DistributionIntegr
 
 
     @After
-    public void checkNoPackagesLeft() throws IOException, JSONException {
+    public void checkNoPackagesLeft() throws IOException, JSONException, InterruptedException {
 
+        Thread.sleep(5000);
 
         assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/default/shared");
         assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/default/data");

Modified: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java?rev=1782759&r1=1782758&r2=1782759&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java Mon Feb 13 12:23:03 2017
@@ -55,6 +55,8 @@ public class DistributionPackageExporter
 
         String content = doExport(publish, "temp", DistributionRequestType.PULL);
 
+        Thread.sleep(5000);
+
         jcrPackages =  getChildrenForFolder(publish, "/var/sling/distribution/packages/tempvlt/data");
         assertEquals(0, jcrPackages.size());
 

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=1782759&r1=1782758&r2=1782759&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 Mon Feb 13 12:23:03 2017
@@ -88,6 +88,7 @@ public class Init {
             User defaultAgentUser = createOrGetServiceUser(userManager, defaultAgentUserName);
 
             if (defaultAgentUser != null) {
+                AccessControlUtils.addAccessControlEntry(session, "/var/sling/distribution/packages", defaultAgentUser.getPrincipal(), new String[]{ Privilege.JCR_ALL }, true);
                 ((User) distributorUser).getImpersonation().grantImpersonation(defaultAgentUser.getPrincipal());
                 ((User) serviceUser).getImpersonation().grantImpersonation(defaultAgentUser.getPrincipal());
             }

Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.notshared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.notshared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json?rev=1782759&r1=1782758&r2=1782759&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.notshared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.notshared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json Mon Feb 13 12:23:03 2017
@@ -2,5 +2,7 @@
     "jcr:primaryType": "sling:OsgiConfig",
     "name": "default",
     "type": "jcrvlt",
-    "package.filters": ["/content|-.*/excluded"]
+    "cleanupDelay" : 1,
+    "package.filters": ["/content|-.*/excluded"],
+    "tempFsFolder" : "/var/sling/distribution/packages"
 }
\ No newline at end of file

Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json?rev=1782759&r1=1782758&r2=1782759&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json Mon Feb 13 12:23:03 2017
@@ -2,5 +2,6 @@
     "jcr:primaryType": "sling:OsgiConfig",
     "name": "tempvlt",
     "type": "jcrvlt",
+    "cleanupDelay" : 1,
     "tempFsFolder" : "/var/sling/distribution/packages"
 }
\ No newline at end of file

Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.shared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.shared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json?rev=1782759&r1=1782758&r2=1782759&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.shared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.shared/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json Mon Feb 13 12:23:03 2017
@@ -2,6 +2,8 @@
     "jcr:primaryType": "sling:OsgiConfig",
     "name": "default",
     "type": "jcrvlt",
+    "cleanupDelay": 1,
     "package.filters": ["/content|-.*/excluded"],
-    "useBinaryReferences": true
+    "useBinaryReferences": true,
+    "tempFsFolder" : "/var/sling/distribution/packages"
 }

Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distributionAgentService.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distributionAgentService.json?rev=1782759&r1=1782758&r2=1782759&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distributionAgentService.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distributionAgentService.json Mon Feb 13 12:23:03 2017
@@ -1,5 +1,5 @@
 {
     "jcr:primaryType": "sling:OsgiConfig",
     "user.default": "",
-    "user.mapping": "org.apache.sling.distribution.core:defaultAgentService=distribution-agent-user"
+    "user.mapping": ["org.apache.sling.distribution.core:defaultAgentService=distribution-agent-user","org.apache.sling.distribution.core=distribution-agent-user"]
 }