[sling-org-apache-sling-distribution-core] branch master updated: [maven-release-plugin] prepare for next development iteration

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 093d4f2  [maven-release-plugin] prepare for next development iteration
093d4f2 is described below

commit 093d4f273dc96ed5b88aa73b33c3ff0fe00cf732
Author: Marius Petria 
AuthorDate: Wed Dec 5 09:50:58 2018 +0200

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64fb255..b623077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.4.0
+0.4.1-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core
@@ -45,7 +45,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-distribution-core.git
-  org.apache.sling.distribution.core-0.4.0
+  HEAD
   
 
 

[sling-org-apache-sling-distribution-core] branch master updated: [maven-release-plugin] prepare release org.apache.sling.distribution.core-0.4.0

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 81fe00f  [maven-release-plugin] prepare release 
org.apache.sling.distribution.core-0.4.0
81fe00f is described below

commit 81fe00f4afe2f5f7a6e5a0aa5bef40db2267fa9e
Author: Marius Petria 
AuthorDate: Wed Dec 5 09:50:39 2018 +0200

[maven-release-plugin] prepare release 
org.apache.sling.distribution.core-0.4.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f62adf..64fb255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.3.5-SNAPSHOT
+0.4.0
 bundle
 
 Apache Sling Distribution Core
@@ -45,7 +45,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-distribution-core.git
-  HEAD
+  org.apache.sling.distribution.core-0.4.0
   
 
 

[sling-org-apache-sling-distribution-core] annotated tag org.apache.sling.distribution.core-0.4.0 created (now a121ed5)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to annotated tag 
org.apache.sling.distribution.core-0.4.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


  at a121ed5  (tag)
 tagging 81fe00f4afe2f5f7a6e5a0aa5bef40db2267fa9e (commit)
 replaces org.apache.sling.distribution.core-0.3.4
  by Marius Petria
  on Wed Dec 5 09:50:54 2018 +0200

- Log -
[maven-release-plugin] copy for tag org.apache.sling.distribution.core-0.4.0
---

No new revisions were added by this update.

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7754: added some more logging

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 6046e6d  SLING-7754: added some more logging
6046e6d is described below

commit 6046e6d7d1749e9818f719d0d06be0bc79b24c30
Author: Marius Petria 
AuthorDate: Wed Oct 17 16:09:44 2018 +0300

SLING-7754: added some more logging
---
 .../queue/impl/resource/ResourceQueueCleanupTask.java | 2 +-
 .../distribution/queue/impl/resource/ResourceQueueUtils.java  | 8 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueCleanupTask.java
 
b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueCleanupTask.java
index f41b16e..7a13e2e 100644
--- 
a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueCleanupTask.java
+++ 
b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueCleanupTask.java
@@ -102,7 +102,7 @@ public class ResourceQueueCleanupTask implements Runnable {
 continue;
 }
 
-log.debug("removing empty folder {}", res.getPath());
+log.debug("removing minute resource folder {}", res.getPath());
 
 resolver.delete(res);
 resolver.commit();
diff --git 
a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
 
b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
index b221998..a54767e 100644
--- 
a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
+++ 
b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
@@ -228,11 +228,12 @@ public class ResourceQueueUtils {
  */
 private static Resource getOrCreateMinuteResource(Resource root) throws 
PersistenceException {
 
-for (int i=0; i<2; i++) {
+final int retries = 2;
+for (int i=0; i < retries; i++) {
 try {
 return tryGetOrCreateMinutes(root);
 } catch (PersistenceException e) {
-log.warn("creating minute resource failed. retrying {} more 
times.", 5-i);
+log.warn("creating minute resource failed. retrying {} more 
times.", retries-i);
 }
 
 root.getResourceResolver().revert();
@@ -260,9 +261,10 @@ public class ResourceQueueUtils {
 }
 
 for (int i=0; i < 3; i++) {
-now.add(Calendar.MINUTE, i);
 String newMinutePath = getTimePath(now);
 Resource resource = createResource(root, newMinutePath);
+log.debug("minute resource created {}", resource.getPath());
+now.add(Calendar.MINUTE, 1);
 }
 
 resourceResolver.commit();

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7754: fix entered date for resource queue items

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new bd06647  SLING-7754: fix entered date for resource queue items
bd06647 is described below

commit bd066470920a1e722a2b38717fa9d80feaa73851
Author: Marius Petria 
AuthorDate: Wed Oct 17 13:57:29 2018 +0300

SLING-7754: fix entered date for resource queue items
---
 .../distribution/queue/impl/resource/ResourceQueueUtils.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
 
b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
index 1408cb6..b221998 100644
--- 
a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
+++ 
b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueUtils.java
@@ -69,6 +69,7 @@ public class ResourceQueueUtils {
 private static final String DISTRIBUTION_PACKAGE_PREFIX = "distribution.";
 private static final String DISTRIBUTION_PACKAGE_ID = 
DISTRIBUTION_PACKAGE_PREFIX + "item.id";
 private static final String DISTRIBUTION_PACKAGE_SIZE = 
DISTRIBUTION_PACKAGE_PREFIX + "package.size";
+private static final String ENTERED_DATE = "entered.date";
 
 
 private static final AtomicLong itemCounter = new AtomicLong(0);
@@ -141,8 +142,11 @@ public class ResourceQueueUtils {
 }
 
 String queueName = queueRoot.getName();
-DistributionQueueItem queueItem = 
deserializeItem(resource.getValueMap());
-DistributionQueueItemStatus queueItemStatus = new 
DistributionQueueItemStatus(DistributionQueueItemState.QUEUED, queueName);
+ValueMap valueMap = resource.getValueMap();
+DistributionQueueItem queueItem = deserializeItem(valueMap);
+Calendar entered = valueMap.get(ENTERED_DATE, Calendar.getInstance());
+DistributionQueueItemStatus queueItemStatus = new 
DistributionQueueItemStatus(entered,
+DistributionQueueItemState.QUEUED, 0, queueName);
 
 String entryId = getIdFromPath(queueRoot.getPath(), 
resource.getPath());
 
@@ -209,6 +213,7 @@ public class ResourceQueueUtils {
 Map properties = serializeItem(queueItem);
 
 properties.put("sling:resourceType", RESOURCE_ITEM);
+properties.put(ENTERED_DATE, Calendar.getInstance());
 Resource resourceItem =  
ResourceUtil.getOrCreateResource(resourceResolver, entryPath, properties,
 RESOURCE_FOLDER, true);
 

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7754: implementation of Resource Based Queues

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 6a3670c  SLING-7754: implementation of Resource Based Queues
6a3670c is described below

commit 6a3670c1cfe1779aff3f9fe9e1b4df04b4e112cd
Author: Marius Petria 
AuthorDate: Mon Jun 25 17:13:03 2018 +0300

SLING-7754: implementation of Resource Based Queues
---
 pom.xml|  75 
 .../agent/impl/QueueDistributionAgentFactory.java  |  21 +-
 .../impl/DistributionQueueProviderFactory.java |  28 ++
 ...obHandlingQueueDistributionProviderFactory.java |  61 +++
 .../queue/impl/resource/ResourceIterator.java  | 123 ++
 .../queue/impl/resource/ResourceQueue.java | 231 
 .../impl/resource/ResourceQueueCleanupTask.java| 112 ++
 .../queue/impl/resource/ResourceQueueProvider.java |  92 +
 .../resource/ResourceQueueProviderFactory.java |  62 +++
 .../queue/impl/resource/ResourceQueueUtils.java| 416 +
 .../sling/distribution/DistributionBaseIT.java | 152 
 .../queue/impl/resource/ResourceIteratorTest.java  | 166 
 .../queue/impl/resource/ResourceQueueIT.java   | 237 
 .../impl/resource/ResourceQueueUtilsTest.java  | 100 +
 14 files changed, 1870 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6bd547f..8f62adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,10 @@
   HEAD
   
 
+
+4.11.0
+
+
 
 
 
@@ -94,6 +98,9 @@
 maven-surefire-plugin
 
 true
+
+**/*IT.java
+
 
 
 
@@ -112,6 +119,35 @@
 
 
 
+
+
+org.apache.servicemix.tooling
+depends-maven-plugin
+1.4.0
+
+
+
+generate-depends-file
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+true
+
+
+bundle.filename
+
${basedir}/target/${project.build.finalName}.jar
+
+
+
+**/*IT.java
+
+
+
 
 
 
@@ -310,6 +346,45 @@
 provided
 
 
+
+
+
+org.apache.sling
+org.apache.sling.testing.paxexam
+2.0.0
+test
+
+
+org.ops4j.pax.exam
+pax-exam
+${exam.version}
+test
+
+
+org.ops4j.pax.exam
+pax-exam-cm
+${exam.version}
+test
+
+
+org.ops4j.pax.exam
+pax-exam-container-forked
+${exam.version}
+test
+
+
+org.ops4j.pax.exam
+pax-exam-junit4
+${exam.version}
+test
+
+
+org.ops4j.pax.exam
+pax-exam-link-mvn
+${exam.version}
+test
+
+
 
 
 
diff --git 
a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
 
b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
index 7f3c507..3d0ad64 100644
--- 
a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
+++ 
b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
@@ -46,9 +46,10 @@ import 
org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
 import 
org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
 import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
 import 
org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
+import 
org.apache.sling.distribution.queue.impl.DistributionQueueProviderFactory;
 import 
org.apache.sling.distribution.queue.impl.PriorityQueueDispatchingStrategy;
 import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
-import 
org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.resource.ResourceQueueProvider;
 import org.apache.sling.distribution.trigger.DistributionTrigger;
 import

[sling-org-apache-sling-distribution-core] branch master updated: [maven-release-plugin] prepare for next development iteration

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 490bfa4  [maven-release-plugin] prepare for next development iteration
490bfa4 is described below

commit 490bfa4d8b7719d0153ce837fcbb30b02f1a5d10
Author: Marius Petria 
AuthorDate: Tue Aug 21 14:59:00 2018 +0300

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0adee18..722e04d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.3.0
+0.3.1-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core
@@ -45,7 +45,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-distribution-core.git
-  org.apache.sling.distribution.core-0.3.0
+  HEAD
   
 
 

[sling-org-apache-sling-distribution-core] branch master updated: [maven-release-plugin] prepare release org.apache.sling.distribution.core-0.3.0

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 60719c2  [maven-release-plugin] prepare release 
org.apache.sling.distribution.core-0.3.0
60719c2 is described below

commit 60719c24b64ffed88cd9b5ac22821db03d70633c
Author: Marius Petria 
AuthorDate: Tue Aug 21 14:58:16 2018 +0300

[maven-release-plugin] prepare release 
org.apache.sling.distribution.core-0.3.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d78b59..0adee18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.2.11-SNAPSHOT
+0.3.0
 bundle
 
 Apache Sling Distribution Core
@@ -45,7 +45,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
 
https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-distribution-core.git
-  HEAD
+  org.apache.sling.distribution.core-0.3.0
   
 
 

[sling-org-apache-sling-distribution-core] annotated tag org.apache.sling.distribution.core-0.3.0 created (now 6f8f5e8)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to annotated tag 
org.apache.sling.distribution.core-0.3.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


  at 6f8f5e8  (tag)
 tagging 60719c24b64ffed88cd9b5ac22821db03d70633c (commit)
 replaces org.apache.sling.distribution.core-0.2.10
  by Marius Petria
  on Tue Aug 21 14:58:55 2018 +0300

- Log -
[maven-release-plugin] copy for tag org.apache.sling.distribution.core-0.3.0
---

No new revisions were added by this update.

[sling-org-apache-sling-distribution-core] branch master updated: disable javadoc doclint errors

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 4f64c43  disable javadoc doclint errors
4f64c43 is described below

commit 4f64c43a965241a9d5672fb3dc1e635fcbf7f6a1
Author: Marius Petria 
AuthorDate: Tue Aug 21 14:03:51 2018 +0300

disable javadoc doclint errors
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4636865..7d78b59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,9 @@
 
 org.apache.maven.plugins
 maven-javadoc-plugin
+
+-Xdoclint:none
+
 
 
 org.apache.rat

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7168: expose spi for agent+queue+packaging

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 3d51ac0  SLING-7168: expose spi for agent+queue+packaging
3d51ac0 is described below

commit 3d51ac0b09c9a057b590349727392eaedba26aea
Author: Marius Petria 
AuthorDate: Wed Jun 27 12:10:33 2018 +0300

SLING-7168: expose spi for agent+queue+packaging
---
 pom.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8e19597..123393b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,13 @@
 
 org.apache.sling.distribution.util,
 org.apache.sling.distribution.common,
-org.apache.sling.distribution.serialization
+org.apache.sling.distribution.serialization,
+org.apache.sling.distribution.queue.spi,
+org.apache.sling.distribution.queue,
+org.apache.sling.distribution.log.spi,
+org.apache.sling.distribution.agent,
+org.apache.sling.distribution.agent.spi,
+org.apache.sling.distribution.packaging
 
 
 org.apache.http.nio.*;resolution:=optional,

[sling-org-apache-sling-distribution-core] branch 44af0d3 created (now 173ac8d)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to branch 44af0d3
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


  at 173ac8d  SLING-7753 - Support for building Content Packages in memory

No new revisions were added by this update.

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7747: send http response error code when package cannot be opened - more logging

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 4981256  SLING-7747: send http response error code when package cannot 
be opened - more logging
4981256 is described below

commit 49812566c89093f06b0d32c46ae267ee53d8f95c
Author: Marius Petria 
AuthorDate: Tue Jun 19 14:31:32 2018 +0300

SLING-7747: send http response error code when package cannot be opened - 
more logging
---
 .../distribution/packaging/impl/FileDistributionPackageBuilder.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
index 3248e88..5175aa8 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
@@ -166,6 +166,7 @@ public class FileDistributionPackageBuilder extends 
AbstractDistributionPackageB
 protected DistributionPackage getPackageInternal(@Nonnull ResourceResolver 
resourceResolver, @Nonnull String id) {
 File file = new File(tempDirectory, id);
 if (!file.exists()) {
+log.warn("file package does not exist", file.getAbsolutePath());
 return null;
 }
 return new FileDistributionPackage(file, getType(), null, null);

[sling-org-apache-sling-distribution-core] branch master updated (bf1a829 -> 07a4c30)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


from bf1a829  SLING-7168: expose spi for agent+queue+packaging
 new d5b443f  Revert "SLING-7168: expose spi for agent+queue+packaging"
 new 07a4c30  SLING-7747: send http response error code when package cannot 
be opened

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml   | 8 +---
 .../packaging/impl/FileDistributionPackageBuilder.java| 6 +-
 .../packaging/impl/exporter/AgentDistributionPackageExporter.java | 2 --
 .../distribution/servlet/DistributionPackageExporterServlet.java  | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

[sling-org-apache-sling-distribution-core] 02/02: SLING-7747: send http response error code when package cannot be opened

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit 07a4c30adb053e8b4181736cd61ce28acf23e6e6
Author: Marius Petria 
AuthorDate: Tue Jun 19 14:28:33 2018 +0300

SLING-7747: send http response error code when package cannot be opened
---
 .../distribution/packaging/impl/FileDistributionPackageBuilder.java | 6 +-
 .../packaging/impl/exporter/AgentDistributionPackageExporter.java   | 2 --
 .../distribution/servlet/DistributionPackageExporterServlet.java| 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
index 66fd0b3..3248e88 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
@@ -164,6 +164,10 @@ public class FileDistributionPackageBuilder extends 
AbstractDistributionPackageB
 
 @Override
 protected DistributionPackage getPackageInternal(@Nonnull ResourceResolver 
resourceResolver, @Nonnull String id) {
-return new FileDistributionPackage(new File(tempDirectory, id), 
getType(), null, null);
+File file = new File(tempDirectory, id);
+if (!file.exists()) {
+return null;
+}
+return new FileDistributionPackage(file, getType(), null, null);
 }
 }
diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index 6662b13..272227e 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -113,8 +113,6 @@ public class AgentDistributionPackageExporter implements 
DistributionPackageExpo
 }
 }
 
-} catch (Exception ex) {
-log.error("Error exporting package", ex);
 } finally {
 DistributionPackageUtils.closeSafely(distributionPackage);
 }
diff --git 
a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
 
b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
index c7ba4de..9c98878 100644
--- 
a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
+++ 
b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
@@ -107,7 +107,7 @@ public class DistributionPackageExporterServlet extends 
SlingAllMethodsServlet {
 
 bytesCopied = IOUtils.copy(inputStream, 
response.getOutputStream());
 } catch (IOException e) {
-log.error("cannot process package", e);
+throw new RuntimeException("cannot process package", 
e);
 } finally {
 IOUtils.closeQuietly(inputStream);
 }

[sling-org-apache-sling-distribution-core] 01/02: Revert "SLING-7168: expose spi for agent+queue+packaging"

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit d5b443f37c04940b51ea692ae5596dfa0c7cd5f8
Author: Marius Petria 
AuthorDate: Tue Jun 19 14:09:51 2018 +0300

Revert "SLING-7168: expose spi for agent+queue+packaging"

This reverts commit bf1a8294229a60b74acb44d026f816739c8c5e0a.
---
 pom.xml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 123393b..8e19597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,13 +71,7 @@
 
 org.apache.sling.distribution.util,
 org.apache.sling.distribution.common,
-org.apache.sling.distribution.serialization,
-org.apache.sling.distribution.queue.spi,
-org.apache.sling.distribution.queue,
-org.apache.sling.distribution.log.spi,
-org.apache.sling.distribution.agent,
-org.apache.sling.distribution.agent.spi,
-org.apache.sling.distribution.packaging
+org.apache.sling.distribution.serialization
 
 
 org.apache.http.nio.*;resolution:=optional,

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7168: expose spi for agent+queue+packaging

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new bf1a829  SLING-7168: expose spi for agent+queue+packaging
bf1a829 is described below

commit bf1a8294229a60b74acb44d026f816739c8c5e0a
Author: Marius Petria 
AuthorDate: Mon Jun 18 17:30:51 2018 +0300

SLING-7168: expose spi for agent+queue+packaging
---
 pom.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8e19597..123393b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,13 @@
 
 org.apache.sling.distribution.util,
 org.apache.sling.distribution.common,
-org.apache.sling.distribution.serialization
+org.apache.sling.distribution.serialization,
+org.apache.sling.distribution.queue.spi,
+org.apache.sling.distribution.queue,
+org.apache.sling.distribution.log.spi,
+org.apache.sling.distribution.agent,
+org.apache.sling.distribution.agent.spi,
+org.apache.sling.distribution.packaging
 
 
 org.apache.http.nio.*;resolution:=optional,

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7733: do not rewrite distributionrequests in the packagebuilder

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new ff2dd3a  SLING-7733: do not rewrite distributionrequests in the 
packagebuilder
ff2dd3a is described below

commit ff2dd3a6287dbaae424690db771b16922d2f6e87
Author: Marius Petria 
AuthorDate: Thu Jun 14 15:41:31 2018 +0300

SLING-7733: do not rewrite distributionrequests in the packagebuilder
---
 .../packaging/impl/AbstractDistributionPackageBuilder.java |  4 +++-
 .../serialization/impl/vlt/FileVaultContentSerializer.java |  5 -
 .../distribution/serialization/impl/vlt/VltUtils.java  | 14 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
index 37e28ca..c9d9ad3 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
@@ -64,7 +64,9 @@ public abstract class AbstractDistributionPackageBuilder 
implements Distribution
 throws DistributionException {
 DistributionPackage distributionPackage;
 
-request = VltUtils.sanitizeRequest(request);
+if (!VltUtils.isSupported(request)) {
+throw new DistributionException("unsupported request " + request);
+}
 
 if (DistributionRequestType.ADD.equals(request.getRequestType())) {
 distributionPackage = createPackageForAdd(resourceResolver, 
request);
diff --git 
a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
 
b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
index 5547185..c759c36 100644
--- 
a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
+++ 
b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
@@ -43,6 +43,7 @@ import org.apache.jackrabbit.vault.packaging.ExportOptions;
 import org.apache.jackrabbit.vault.packaging.PackageException;
 import org.apache.jackrabbit.vault.packaging.Packaging;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.distribution.DistributionRequest;
 import org.apache.sling.distribution.common.DistributionException;
 import 
org.apache.sling.distribution.serialization.DistributionContentSerializer;
 import org.apache.sling.distribution.serialization.DistributionExportOptions;
@@ -100,11 +101,13 @@ public class FileVaultContentSerializer implements 
DistributionContentSerializer
 public void exportToStream(ResourceResolver resourceResolver, 
DistributionExportOptions exportOptions, OutputStream outputStream) throws 
DistributionException {
 Session session = null;
 try {
+DistributionRequest request = 
VltUtils.sanitizeRequest(exportOptions.getRequest());
+
 session = getSession(resourceResolver);
 String packageGroup = PACKAGE_GROUP;
 String packageName = TYPE + "_" + System.currentTimeMillis() + "_" 
+ UUID.randomUUID();
 
-WorkspaceFilter filter = 
VltUtils.createFilter(exportOptions.getRequest(), nodeFilters, propertyFilters);
+WorkspaceFilter filter = VltUtils.createFilter(request, 
nodeFilters, propertyFilters);
 ExportOptions opts = VltUtils.getExportOptions(filter, 
packageRoots, packageGroup, packageName, VERSION, useBinaryReferences, 
exportPathMapping);
 
 log.debug("assembling package {} user {}", packageGroup + '/' + 
packageName + "-" + VERSION, resourceResolver.getUserID());
diff --git 
a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
 
b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
index e883860..4c0bc30 100644
--- 
a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
+++ 
b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
@@ -378,6 +378,20 @@ public class VltUtils {
 return result;
 }
 
+public static boolean isSupported(DistributionRequest request) {
+DistributionRequestType requestType = request.getRequestType();
+
+if (DistributionRequestType.DELETE.equals(requestType)) {
+for (String path : request.getPaths()) {
+// vlt cannot properly install delete of rep:policy subnodes
+if (VltUtils.findParent(path, "rep:policy") != null) {
+retu

[sling-org-apache-sling-distribution-core] branch master updated: do not fail in case of mbean registration failure

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 2105b24  do not fail in case of mbean registration failure
2105b24 is described below

commit 2105b2481495049fb80259b8a3de975bfaed2aff
Author: Marius Petria 
AuthorDate: Wed Jun 13 22:53:34 2018 +0300

do not fail in case of mbean registration failure
---
 .../impl/MonitoringDistributionQueueProvider.java  | 22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
 
b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
index b5eed1f..3679138 100644
--- 
a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
+++ 
b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
@@ -33,11 +33,14 @@ import 
org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
 import org.apache.sling.distribution.queue.DistributionQueueType;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link DistributionQueueProvider} that supports monitoring via JMX.
  */
 public class MonitoringDistributionQueueProvider implements 
DistributionQueueProvider {
+Logger log = 
LoggerFactory.getLogger(MonitoringDistributionQueueProvider.class);
 
 private final Set monitoredQueues = new HashSet();
 
@@ -86,16 +89,21 @@ public class MonitoringDistributionQueueProvider implements 
DistributionQueuePro
 }
 
 private void monitorQueue(DistributionQueue distributionQueue) {
-if (monitoredQueues.add(distributionQueue.getName())) {
-DistributionQueueMBean mBean = new 
DistributionQueueMBeanImpl(distributionQueue);
+try {
+if (monitoredQueues.add(distributionQueue.getName())) {
+DistributionQueueMBean mBean = new 
DistributionQueueMBeanImpl(distributionQueue);
 
-Dictionary mBeanProps = new Hashtable();
-mBeanProps.put("jmx.objectname", 
"org.apache.sling.distribution:type=queue,id="
-+ ObjectName.quote(distributionQueue.getName()));
+Dictionary mBeanProps = new Hashtable();
+mBeanProps.put("jmx.objectname", 
"org.apache.sling.distribution:type=queue,id="
++ ObjectName.quote(distributionQueue.getName()));
 
-ServiceRegistration mBeanRegistration = 
context.registerService(DistributionQueueMBean.class.getName(), mBean, 
mBeanProps);
-mBeans.add(mBeanRegistration);
+ServiceRegistration mBeanRegistration = 
context.registerService(DistributionQueueMBean.class.getName(), mBean, 
mBeanProps);
+mBeans.add(mBeanRegistration);
+}
+} catch (Throwable e) {
+log.error("cannot register queue mbean", e);
 }
+
 }
 
 }

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] branch master updated: SLING-7714: packages created with root filter remove ACEs

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 9c56ed8  SLING-7714: packages created with root filter remove ACEs
9c56ed8 is described below

commit 9c56ed87be8e97b155938858b3d089d4f8b5e43f
Author: Marius Petria 
AuthorDate: Wed Jun 13 19:05:09 2018 +0300

SLING-7714: packages created with root filter remove ACEs
---
 .../org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java  | 2 +-
 .../apache/sling/distribution/serialization/impl/vlt/VltUtilsTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
 
b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
index a0be36e..e883860 100644
--- 
a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
+++ 
b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
@@ -94,7 +94,7 @@ public class VltUtils {
 initFilterSet(nodeFilterSet, nodeFilters, patterns);
 
 // Set property path filters
-PathFilterSet propertyFilterSet = new PathFilterSet("/");
+PathFilterSet propertyFilterSet = new PathFilterSet(path);
 initFilterSet(propertyFilterSet, propertyFilters, new 
ArrayList());
 
 filter.add(nodeFilterSet, propertyFilterSet);
diff --git 
a/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtilsTest.java
 
b/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtilsTest.java
index e2913c8..210a80e 100644
--- 
a/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtilsTest.java
+++ 
b/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtilsTest.java
@@ -52,7 +52,7 @@ public class VltUtilsTest {
 assertEquals(1, propFilterSet.size());
 PathFilterSet propFilter = propFilterSet.get(0);
 assertTrue(propFilter.getEntries().isEmpty());
-assertEquals("/", propFilter.getRoot());
+assertEquals("/foo", propFilter.getRoot());
 
 assertNotNull(filter.getFilterSets());
 List nodeFilterSet = filter.getFilterSets();

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] branch SLING-7555-R1797988 created (now c0827cd)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to branch SLING-7555-R1797988
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


  at c0827cd  SLING-7555: option to drop ghost packages from and agent 
exporter

This branch includes the following new commits:

 new c0827cd  SLING-7555: option to drop ghost packages from and agent 
exporter

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] 01/01: SLING-7555: option to drop ghost packages from and agent exporter

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch SLING-7555-R1797988
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit c0827cd63c0404bf4f9fa4f7b696ca31e23b1668
Author: Marius Petria 
AuthorDate: Fri Apr 27 14:25:22 2018 +0300

SLING-7555: option to drop ghost packages from and agent exporter
---
 .../impl/exporter/AgentDistributionPackageExporter.java   | 11 +--
 .../exporter/AgentDistributionPackageExporterFactory.java | 11 ++-
 .../queue/impl/jobhandling/JobHandlingDistributionQueue.java  |  7 +--
 .../impl/exporter/AgentDistributionPackageExporterTest.java   |  2 +-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index 160d0ee..92e3fe1 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -50,15 +50,17 @@ public class AgentDistributionPackageExporter implements 
DistributionPackageExpo
 private final Logger log = LoggerFactory.getLogger(getClass());
 private final DistributionPackageBuilderProvider packageBuilderProvider;
 private final String name;
+private boolean dropInvalidItems;
 
 private final static String PACKAGE_TYPE = "agentexporter";
 
 private DistributionAgent agent;
 private String queueName;
 
-public AgentDistributionPackageExporter(String queueName, 
DistributionAgent agent, DistributionPackageBuilderProvider 
packageBuilderProvider, String name) {
+public AgentDistributionPackageExporter(String queueName, 
DistributionAgent agent, DistributionPackageBuilderProvider 
packageBuilderProvider, String name, boolean dropInvalidItems) {
 this.packageBuilderProvider = packageBuilderProvider;
 this.name = name;
+this.dropInvalidItems = dropInvalidItems;
 
 if (agent == null || packageBuilderProvider == null) {
 throw new IllegalArgumentException("Agent and package builder are 
required");
@@ -99,7 +101,12 @@ public class AgentDistributionPackageExporter implements 
DistributionPackageExpo
 
 packageProcessor.process(new 
AgentDistributionPackage(distributionPackage, queue, entry.getId()));
 } else {
-log.warn("cannot get package {}", info);
+if (dropInvalidItems) {
+queue.remove(entry.getId());
+log.warn("ghost package: cannot get package {} 
dropping from queue", info);
+} else {
+log.warn("ghost package: cannot get package {} 
keeping in queue", info);
+}
 }
 } else {
 log.warn("cannot find package builder with type {}", 
info.getType());
diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
index 73b9b1f..5368e92 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
@@ -34,6 +34,7 @@ import org.apache.sling.distribution.DistributionRequest;
 import org.apache.sling.distribution.agent.DistributionAgent;
 import org.apache.sling.distribution.common.DistributionException;
 import 
org.apache.sling.distribution.component.impl.DistributionComponentConstants;
+import org.apache.sling.distribution.component.impl.SettingsUtils;
 import org.apache.sling.distribution.packaging.DistributionPackage;
 import 
org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
@@ -61,10 +62,14 @@ public class AgentDistributionPackageExporterFactory 
implements DistributionPack
 @Property(label = "Queue", description = "The name of the queue from which 
the packages should be exported.")
 private static final String QUEUE_NAME = "queue";
 
+@Property(label = "Drop invalid queue items", description = "Remove 
invalid items from the queue.", boolValue = false)
+private static final String DROP_INVALID_QUEUE_ITEMS = 
"drop.invalid.items";
+
 @Property(name = "agent.target", label = "The target refe

[sling-org-apache-sling-distribution-core] 02/03: Revert "Merge pull request #2 from Buuhuu/feature/SLING-7357"

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit 4a8b9ace5859f9f79ee674a8887010e092746e84
Author: Marius Petria 
AuthorDate: Fri May 25 09:44:34 2018 +0300

Revert "Merge pull request #2 from Buuhuu/feature/SLING-7357"

This reverts commit 959ea056d5cd0b58245ba4e7d66a0bf3d6c4baae, reversing
changes made to 36c7bf864e90438859cee40ed12d26d1daf62477.
---
 .../agent/impl/ForwardDistributionAgentFactory.java  |  5 +
 .../impl/MonitoringDistributionPackageBuilder.java   |  5 -
 .../packaging/DistributionPackageBuilder.java|  6 --
 .../impl/AbstractDistributionPackageBuilder.java |  8 +---
 .../impl/FileDistributionPackageBuilder.java |  2 +-
 .../impl/ResourceDistributionPackageBuilder.java |  2 +-
 .../serialization/DistributionContentSerializer.java |  6 --
 .../impl/DistributionPackageBuilderFactory.java  |  4 
 .../impl/vlt/FileVaultContentSerializer.java |  5 -
 .../vlt/VaultDistributionPackageBuilderFactory.java  |  4 
 .../distribution/serialization/package-info.java |  2 +-
 .../transport/impl/HttpConfiguration.java| 20 ++--
 .../impl/SimpleHttpDistributionTransport.java|  4 
 13 files changed, 7 insertions(+), 66 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 
b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
index 757fb83..5473ed7 100644
--- 
a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
+++ 
b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
@@ -34,7 +34,6 @@ import org.apache.felix.scr.annotations.PropertyOption;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.http.HttpHeaders;
 import org.apache.jackrabbit.vault.packaging.Packaging;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.commons.osgi.PropertiesUtil;
@@ -247,10 +246,8 @@ public class ForwardDistributionAgentFactory extends 
AbstractDistributionAgentFa
 Map priorityQueues = 
PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
 priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
 
-Map headers = new HashMap(1);
-headers.put(HttpHeaders.CONTENT_TYPE, packageBuilder.getContentType());
 Integer timeout = PropertiesUtil.toInteger(HTTP, 10) * 1000;
-HttpConfiguration httpConfiguration = new HttpConfiguration(timeout, 
headers);
+HttpConfiguration httpConfiguration = new HttpConfiguration(timeout);
 
 DistributionPackageExporter packageExporter = new 
LocalDistributionPackageExporter(packageBuilder);
 
diff --git 
a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
index d6e22c5..32066c9 100644
--- 
a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
@@ -59,11 +59,6 @@ public final class MonitoringDistributionPackageBuilder 
implements DistributionP
 return wrapped.getType();
 }
 
-@Override
-public String getContentType() {
-return wrapped.getContentType();
-}
-
 @Nonnull
 @Override
 public DistributionPackage createPackage(@Nonnull ResourceResolver 
resourceResolver, @Nonnull DistributionRequest request) throws 
DistributionException {
diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
index d6c65b4..6713072 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
@@ -40,12 +40,6 @@ public interface DistributionPackageBuilder {
 String getType();
 
 /**
- * returns the content type of packages created and consumed by the 
package builder.
- * @return the content type of the package
- */
-String getContentType();
-
-/**
  * creates a {@link DistributionPackage} for a specific {@link 
org.apache.sling.distribution.DistributionRequest}
  *
  * @param resourceResolver the resource resolver used to access the 
resources to be packaged
diff --git 
a/src/main/java/org/apache/sling/distribution/pack

[sling-org-apache-sling-distribution-core] 03/03: Fix build after previous reverts

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit a4da85cf8e8fa4538b6a8e93380d3c03182bb9e0
Author: Marius Petria 
AuthorDate: Fri May 25 09:47:47 2018 +0300

Fix build after previous reverts
---
 .../packaging/impl/InMemoryDistributionPackageBuilder.java |  2 +-
 .../packaging/impl/FileDistributionPackageBuilderTest.java |  4 
 .../packaging/impl/InMemoryDistributionPackageBuilderTest.java | 10 --
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
index 72b733c..3870c2a 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
@@ -60,7 +60,7 @@ public class InMemoryDistributionPackageBuilder extends 
AbstractDistributionPack
   @Nonnull 
DistributionContentSerializer serializer,
   @Nullable String[] nodeFilters,
   @Nullable String[] 
propertyFilters) {
-super(type, serializer.getContentType(), 
serializer.isDeletionSupported());
+super(type);
 this.serializer = serializer;
 this.nodeFilters = VltUtils.parseFilters(nodeFilters);
 this.propertyFilters = VltUtils.parseFilters(propertyFilters);
diff --git 
a/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java
 
b/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java
index 33fc0c2..ea6072c 100644
--- 
a/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java
+++ 
b/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java
@@ -62,10 +62,6 @@ public class FileDistributionPackageBuilderTest {
 }
 }
 
-@Override public String getContentType() {
-return "text/plain";
-}
-
 @Override public void importFromStream(ResourceResolver 
resourceResolver, InputStream inputStream) throws DistributionException {
 throw new DistributionException("unsupported");
 }
diff --git 
a/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
 
b/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
index 8d385f0..f20dc66 100644
--- 
a/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
+++ 
b/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
@@ -71,19 +71,9 @@ public class InMemoryDistributionPackageBuilderTest {
 }
 
 @Override
-public String getContentType() {
-return "text/plain";
-}
-
-@Override
 public boolean isRequestFiltering() {
 return false;
 }
-
-@Override
-public boolean isDeletionSupported() {
-return false;
-}
 }
 
 }
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] 01/03: Revert "Merge pull request #4 from Buuhuu/feature/SLING-7360"

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit 3b959a72a555af2da29363a1e3cde2ae3b157fae
Author: Marius Petria 
AuthorDate: Fri May 25 09:44:10 2018 +0300

Revert "Merge pull request #4 from Buuhuu/feature/SLING-7360"
---
 .../impl/AbstractDistributionPackageBuilder.java   | 18 +++---
 .../packaging/impl/FileDistributionPackageBuilder.java |  2 +-
 .../impl/ResourceDistributionPackageBuilder.java   |  2 +-
 .../serialization/DistributionContentSerializer.java   |  6 --
 .../impl/vlt/FileVaultContentSerializer.java   |  4 
 .../impl/FileDistributionPackageBuilderTest.java   |  4 
 6 files changed, 5 insertions(+), 31 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
index 373c9ec..0a32868 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
@@ -51,12 +51,10 @@ public abstract class AbstractDistributionPackageBuilder 
implements Distribution
 
 private final String type;
 private final String contentType;
-private final boolean serializerSupportsDeletion;
 
-AbstractDistributionPackageBuilder(String type, String contentType, 
boolean serializerSupportsDeletion) {
+AbstractDistributionPackageBuilder(String type, String contentType) {
 this.type = type;
 this.contentType = contentType;
-this.serializerSupportsDeletion = serializerSupportsDeletion;
 }
 
 public String getType() {
@@ -77,11 +75,7 @@ public abstract class AbstractDistributionPackageBuilder 
implements Distribution
 if (DistributionRequestType.ADD.equals(request.getRequestType())) {
 distributionPackage = createPackageForAdd(resourceResolver, 
request);
 } else if 
(DistributionRequestType.DELETE.equals(request.getRequestType())) {
-if (this.serializerSupportsDeletion) {
-distributionPackage = createPackageForDelete(resourceResolver, 
request);
-} else {
-distributionPackage = new SimpleDistributionPackage(request, 
type);
-}
+distributionPackage = new SimpleDistributionPackage(request, type);
 } else if 
(DistributionRequestType.PULL.equals(request.getRequestType())) {
 distributionPackage = new SimpleDistributionPackage(request, type);
 } else if 
(DistributionRequestType.TEST.equals(request.getRequestType())) {
@@ -251,18 +245,12 @@ public abstract class AbstractDistributionPackageBuilder 
implements Distribution
 }
 }
 
+
 @CheckForNull
 protected abstract DistributionPackage createPackageForAdd(@Nonnull 
ResourceResolver resourceResolver, @Nonnull DistributionRequest request)
 throws DistributionException;
 
 @CheckForNull
-protected DistributionPackage createPackageForDelete(@Nonnull 
ResourceResolver resourceResolver, @Nonnull DistributionRequest request)
-throws DistributionException {
-// normally this will work the same way as for add
-return this.createPackageForAdd(resourceResolver, request);
-}
-
-@CheckForNull
 protected abstract DistributionPackage readPackageInternal(@Nonnull 
ResourceResolver resourceResolver, @Nonnull InputStream stream)
 throws DistributionException;
 
diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
index 3e72aa3..8e8e264 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
@@ -66,7 +66,7 @@ public class FileDistributionPackageBuilder extends 
AbstractDistributionPackageB
   String tempFilesFolder,
   String digestAlgorithm, String[] 
nodeFilters,
   String[] propertyFilters) {
-super(type, distributionContentSerializer.getContentType(), 
distributionContentSerializer.isDeletionSupported());
+super(type, distributionContentSerializer.getContentType());
 this.distributionContentSerializer = distributionContentSerializer;
 this.nodeFilters = VltUtils.parseFilters(nodeFilters);
 this.propertyFilters = VltUtils.parseFilters(propertyFilters);
diff --git 
a/src/main/java/org/apache/sling/distribution/pack

[sling-org-apache-sling-distribution-core] branch master updated (16d8bea -> a4da85c)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


from 16d8bea  Merge pull request #8 from mpetria/issue/SLING-7555-3
 new 3b959a7  Revert "Merge pull request #4 from Buuhuu/feature/SLING-7360"
 new 4a8b9ac  Revert "Merge pull request #2 from Buuhuu/feature/SLING-7357"
 new a4da85c  Fix build after previous reverts

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../impl/ForwardDistributionAgentFactory.java  |  5 +
 .../impl/MonitoringDistributionPackageBuilder.java |  5 -
 .../packaging/DistributionPackageBuilder.java  |  6 --
 .../impl/AbstractDistributionPackageBuilder.java   | 24 +++---
 .../impl/FileDistributionPackageBuilder.java   |  2 +-
 .../impl/InMemoryDistributionPackageBuilder.java   |  2 +-
 .../impl/ResourceDistributionPackageBuilder.java   |  2 +-
 .../DistributionContentSerializer.java | 12 ---
 .../impl/DistributionPackageBuilderFactory.java|  4 
 .../impl/vlt/FileVaultContentSerializer.java   |  9 
 .../VaultDistributionPackageBuilderFactory.java|  4 
 .../distribution/serialization/package-info.java   |  2 +-
 .../transport/impl/HttpConfiguration.java  | 20 ++
 .../impl/SimpleHttpDistributionTransport.java  |  4 
 .../impl/FileDistributionPackageBuilderTest.java   |  8 
 .../InMemoryDistributionPackageBuilderTest.java| 10 -
 16 files changed, 10 insertions(+), 109 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] branch master updated (8add861 -> 16d8bea)

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.


from 8add861  SLING-7541 - Allow to build Vault packages in memory
 add 3535067  revert exported API until official release
 add ee2c3dd  SLING-7555: option to drop ghost packages from and agent 
exporter
 new 16d8bea  Merge pull request #8 from mpetria/issue/SLING-7555-3

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml   |  8 +---
 .../impl/exporter/AgentDistributionPackageExporter.java   | 11 +--
 .../exporter/AgentDistributionPackageExporterFactory.java | 11 ++-
 .../queue/impl/jobhandling/JobHandlingDistributionQueue.java  |  7 +--
 .../impl/exporter/AgentDistributionPackageExporterTest.java   |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

[sling-org-apache-sling-distribution-core] 01/01: Merge pull request #8 from mpetria/issue/SLING-7555-3

[mpetria]

This is an automated email from the ASF dual-hosted git repository.

mpetria pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git

commit 16d8bea2523aeacbefa6960c44f4d86acb2669d2
Merge: 8add861 ee2c3dd
Author: mpetria 
AuthorDate: Thu May 24 15:48:31 2018 +0300

Merge pull request #8 from mpetria/issue/SLING-7555-3

 SLING-7555: option to drop ghost packages from and agent exporter

 pom.xml   |  8 +---
 .../impl/exporter/AgentDistributionPackageExporter.java   | 11 +--
 .../exporter/AgentDistributionPackageExporterFactory.java | 11 ++-
 .../queue/impl/jobhandling/JobHandlingDistributionQueue.java  |  7 +--
 .../impl/exporter/AgentDistributionPackageExporterTest.java   |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mpet...@apache.org.

svn commit: r1748558 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/component/impl/ core/src/main/java/org/apache/sling/distribution/resources/impl

[mpetria]

Author: mpetria
Date: Wed Jun 15 11:20:25 2016
New Revision: 1748558

URL: http://svn.apache.org/viewvc?rev=1748558&view=rev
Log:
SLING-5785: allow to store some distribution properties in content

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/ResourceConfigurationManager.java

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/etc/

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/etc/distribution.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/org.apache.sling.distribution.component.impl.DistributionConfigurationManager.json
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionConfigurationManager.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java
sling/trunk/contrib/extensions/distribution/sample/pom.xml

sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java?rev=1748558&r1=1748557&r2=1748558&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java
 Wed Jun 15 11:20:25 2016
@@ -19,23 +19,19 @@
 package org.apache.sling.distribution.component.impl;
 
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
+import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.resources.impl.OsgiUtils;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,213 +44,198 @@ import org.slf4j.LoggerFactory;
 @Component
 @Service(DistributionConfigurationManager.class)
 public class DefaultDistributionConfigurationManager implements 
DistributionConfigurationManager {
+
 private final Logger log = LoggerFactory.getLogger(getClass());
 
+@Property(label = "Resource Config Enabled", description = "If storing 
config in resource tree is enabled.", boolValue = false)
+public static final String CONFIG_ENABLED = "resource.config.enabled";
+
+@Property(label = "Resource Config Prefix", description = "The prefix of 
properties to be stored in content", value = "etc.")
+public static final String CONFIG_PREFIX = "resource.config.prefix";
+
+@Property(label = "Resource Config Root", description = "The resource 
config root", value = "/etc/distribution")
+public static final St

svn commit: r1746692 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/resources/impl/common/ it/src/test/java/org/apache/sling/distribution/it/

[mpetria]

Author: mpetria
Date: Fri Jun  3 09:05:19 2016
New Revision: 1746692

URL: http://svn.apache.org/viewvc?rev=1746692&view=rev
Log:
SLING-5759: fix creation and deletion of distribution resources

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java?rev=1746692&r1=1746691&r2=1746692&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java
 Fri Jun  3 09:05:19 2016
@@ -85,8 +85,7 @@ public abstract class AbstractModifyingR
 }
 
 public void revert(ResourceResolver resolver) {
-changedResources.clear();
-deletedResources.clear();
+reset();
 }
 
 public void commit(ResourceResolver resolver) throws PersistenceException {
@@ -96,7 +95,7 @@ public abstract class AbstractModifyingR
 
 save(resolver, changedResources, deletedResources);
 
-revert(resolver);
+reset();
 }
 
 public boolean hasChanges(ResourceResolver resolver) {
@@ -121,7 +120,8 @@ public abstract class AbstractModifyingR
 
 private boolean addToChangedResources(String resourceName, Map newProperties, boolean failIfAlreadyExists) {
 final boolean deleted = this.deletedResources.remove(resourceName);
-Map existingResource = 
getMainResourceProperties(resourceName);
+SimplePathInfo pathInfo = SimplePathInfo.parsePathInfo(resourceRoot, 
resourceRoot + "/" + resourceName);
+Map existingResource = 
getMainResourceProperties(pathInfo);
 if (failIfAlreadyExists && !deleted && existingResource != null) {
 return false;
 }
@@ -140,8 +140,10 @@ public abstract class AbstractModifyingR
 return true;
 }
 
-private Map getMainResourceProperties(String resourceName) 
{
+@Override
+protected Map getMainResourceProperties(SimplePathInfo 
pathInfo) {
 
+String resourceName = pathInfo.getMainResourceName();
 if (deletedResources.contains(resourceName)) {
 return null;
 }
@@ -150,8 +152,6 @@ public abstract class AbstractModifyingR
 return changedResources.get(resourceName);
 }
 
-SimplePathInfo pathInfo = SimplePathInfo.parsePathInfo(resourceRoot, 
resourceRoot + "/" + resourceName);
-
 return getResourceProperties(pathInfo);
 }
 
@@ -162,6 +162,11 @@ public abstract class AbstractModifyingR
 return new SimpleModifiableResource(resourceResolver, this, 
pathInfo.getResourcePath(), properties);
 }
 
+private void reset() {
+changedResources.clear();
+deletedResources.clear();
+}
+
 
 protected abstract void save(ResourceResolver resourceResolver,
  Map> 
changedResources,

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java?rev=1746692&r1=1746691&r2=1746692&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
 Fri Jun  3 09:05:19 2016
@@ -76,7 +76,7 @@ public abstract class AbstractReadableRe
 
 Resource resource = null;
 
-Map properties = getResourceProperties(pathInfo);
+Map properties = getMainResourceProperties(pathInfo);
 
 if (properties != null) {
 Object adaptable = properties.r

svn commit: r1744018 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

[mpetria]

Author: mpetria
Date: Mon May 16 10:33:02 2016
New Revision: 1744018

URL: http://svn.apache.org/viewvc?rev=1744018&view=rev
Log:
SLING-5711: fix wrong commit of unfinished work

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1744018&r1=1744017&r2=1744018&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 Mon May 16 10:33:02 2016
@@ -36,7 +36,6 @@ import org.apache.felix.scr.annotations.
 import org.apache.jackrabbit.vault.packaging.Packaging;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.commons.scheduler.Scheduler;
 import org.apache.sling.distribution.DistributionRequestType;
 import 
org.apache.sling.distribution.component.impl.DistributionComponentConstants;
 import org.apache.sling.distribution.component.impl.SettingsUtils;
@@ -44,7 +43,6 @@ import org.apache.sling.distribution.eve
 import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import 
org.apache.sling.distribution.packaging.impl.exporter.AsyncTransportDistributionPackageExporter;
 import 
org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
 import 
org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporter;
 import org.apache.sling.distribution.queue.DistributionQueueProvider;
@@ -64,9 +62,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * An OSGi service factory for "forward agents" that push resources from the 
local instance to remote instances.
- *
- * @see {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * An OSGi service factory for {@link 
org.apache.sling.distribution.agent.DistributionAgent}s which references 
already existing OSGi services.
  */
 @Component(metatype = true,
 label = "Apache Sling Distribution Agent - Forward Agents Factory",
@@ -115,9 +111,6 @@ public class ForwardDistributionAgentFac
 @Property(boolValue = true, label = "Queue Processing Enabled", 
description = "Whether or not the distribution agent should process packages in 
the queues.")
 private static final String QUEUE_PROCESSING_ENABLED = 
"queue.processing.enabled";
 
-@Property(boolValue = true, label = "Asynchronous Transport Enabled", 
description = "Whether or not the distribution agent should deliver the package 
immediately after creation.")
-private static final String ASYNC_TRANSPORT = "transport.async";
-
 
 /**
  * endpoints property
@@ -186,8 +179,6 @@ public class ForwardDistributionAgentFac
 @Reference
 private SlingRepository slingRepository;
 
-@Reference
-private Scheduler scheduler;
 
 @Activate
 protected void activate(BundleContext context, Map config) 
{
@@ -223,13 +214,13 @@ public class ForwardDistributionAgentFac
 priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
 
 
-
+DistributionPackageExporter packageExporter = new 
LocalDistributionPackageExporter(packageBuilder);
 DistributionQueueProvider queueProvider = new 
JobHandlingDistributionQueueProvider(agentName, jobManager, context);
 
 DistributionQueueDispatchingStrategy exportQueueStrategy;
 DistributionQueueDispatchingStrategy errorQueueStrategy = null;
 
-RemoteDistributionPackageImporter packageImporter = null;
+DistributionPackageImporter packageImporter = null;
 Map importerEndpointsMap = 
SettingsUtils.toUriMap(config.get(IMPORTER_ENDPOINTS));
 Set processingQueues = new HashSet();
 
@@ -252,14 +243,6 @@ public class ForwardDistributionAgentFac
 
 packageImporter = new 
RemoteDistributionPackageImporter(distributionLog, transportSecretProvider, 
importerEndpointsMap);
 
-boolean asyncTransport = 
PropertiesUtil.toBoolean(config.get(ASYNC_TRANSPORT), false);
-DistributionPackageExporter packageExporter;
-if (asyncTransport) {
-packageExporter = new 
AsyncTr

svn commit: r1740843 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/packaging/impl/ main/java/org/apache/sling/distribution/packaging/impl/exporter

[mpetria]

Author: mpetria
Date: Mon Apr 25 14:20:12 2016
New Revision: 1740843

URL: http://svn.apache.org/viewvc?rev=1740843&view=rev
Log:
SLING-5686: pass remote.package.id through package info

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultRemoteDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/RemoteDistributionPackage.java
Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionPackageProxy.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java?rev=1740843&r1=1740842&r2=1740843&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
 Mon Apr 25 14:20:12 2016
@@ -27,6 +27,7 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.distribution.DistributionRequest;
+import org.apache.sling.distribution.DistributionRequestType;
 import org.apache.sling.distribution.queue.DistributionQueueEntry;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.serialization.DistributionPackageInfo;
@@ -48,8 +49,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InvalidClassException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
 import java.io.OutputStream;
 import java.io.SequenceInputStream;
 import java.util.ArrayList;
@@ -72,6 +75,9 @@ public class DistributionPackageUtils {
 private static Object filelock = new Object();
 
 
+public final static String PROPERTY_REMOTE_PACKAGE_ID = 
"remote.package.id";
+
+
 
 
 /**
@@ -217,6 +223,7 @@ public class DistributionPackageUtils {
 Map headerInfo = new HashMap();
 headerInfo.put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, 
packageInfo.getRequestType());
 headerInfo.put(DistributionPackageInfo.PROPERTY_REQUEST_PATHS, 
packageInfo.getPaths());
+headerInfo.put(PROPERTY_REMOTE_PACKAGE_ID, 
distributionPackage.getId());
 writeInfo(outputStream, headerInfo);
 
 InputStream headerStream = new 
ByteArrayInputStream(outputStream.toByteArray());
@@ -235,7 +242,8 @@ public class DistributionPackageUtils {
 String s = new String(buffer, "UTF-8");
 
 if (bytesRead > 0 && buffer[0] > 0 && META_START.equals(s)) {
-ObjectInputStream stream = new ObjectInputStream(inputStream);
+ObjectInputStream stream = 
getSafeObjectInputStream(inputStream);
+
 HashMap map = (HashMap) 
stream.readObject();
 info.putAll(map);
 } else {
@@ -351,7 +359,7 @@ public class DistributionPackageUtils {
 HashSet set = new HashSet();
 
 if (file.exists()) {
-ObjectInputStream inputStream = new ObjectInputStream(new 
File

svn commit: r1739242 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Fri Apr 15 07:45:53 2016
New Revision: 1739242

URL: http://svn.apache.org/viewvc?rev=1739242&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.distribution.core-0.1.18

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1739242&r1=1739241&r2=1739242&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Fri Apr 15 
07:45:53 2016
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.17-SNAPSHOT
+0.1.18
 bundle
 
 Apache Sling Distribution Core
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.18
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.18
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.core-0.1.18
 
 
 

svn commit: r1739243 - /sling/tags/org.apache.sling.distribution.core-0.1.18/

[mpetria]

Author: mpetria
Date: Fri Apr 15 07:46:07 2016
New Revision: 1739243

URL: http://svn.apache.org/viewvc?rev=1739243&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.distribution.core-0.1.18

Added:
sling/tags/org.apache.sling.distribution.core-0.1.18/
  - copied from r1739242, sling/trunk/contrib/extensions/distribution/core/

svn commit: r1739244 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Fri Apr 15 07:46:10 2016
New Revision: 1739244

URL: http://svn.apache.org/viewvc?rev=1739244&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1739244&r1=1739243&r2=1739244&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Fri Apr 15 
07:46:10 2016
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.18
+0.1.19-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.18
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.18
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.core-0.1.18
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core
 
 
 

svn commit: r1738924 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/queue/impl/ core/s

[mpetria]

Author: mpetria
Date: Wed Apr 13 11:42:52 2016
New Revision: 1738924

URL: http://svn.apache.org/viewvc?rev=1738924&view=rev
Log:
SLING-5576: optimizations for distribution queue items listings

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResourceIterator.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1738924&r1=1738923&r2=1738924&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Wed Apr 13 11:42:52 2016
@@ -58,6 +58,7 @@ import org.apache.sling.distribution.log
 import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
 import org.apache.sling.distribution.queue.DistributionQueueStatus;
 import org.apache.sling.distribution.queue.impl.DistributionQueueWrapper;
+import org.apache.sling.distribution.queue.impl.SimpleAgentDistributionQueue;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
@@ -305,18 +306,8 @@ public class SimpleDistributionAgent imp
 }
 
 if (queue != null) {
-queue = new DistributionQueueWrapper(queue) {
-@Nonnull
-@Override
-public DistributionQueueStatus getStatus() {
-DistributionQueueStatus status = super.getStatus();
-if (!queueProcessingEnabled && (processingQueues != null 
&& processingQueues.contains(queueName))) {
-return new 
DistributionQueueStatus(status.getItemsCount(), DistributionQueueState.PAUSED);
-} else {
-return status;
-}
-}
-};
+boolean isPausedQueue = !queueProcessingEnabled && 
(processingQueues != null && processingQueues.contains(queueName));
+queue = new SimpleAgentDistributionQueue(queue, isPausedQueue, 
name);
 }
 
 return queue;

Added: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java?rev=1738924&view=auto
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
 (added)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
 Wed Apr 13 11:42:52 2016
@@ -0,0 +1,87 @@
+/*
+ * 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
+ * regard

svn commit: r1738599 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: packaging/impl/importer/ serialization/ serialization/impl/ serialization/impl/

[mpetria]

Author: mpetria
Date: Mon Apr 11 16:18:57 2016
New Revision: 1738599

URL: http://svn.apache.org/viewvc?rev=1738599&view=rev
Log:
SLING-5577: the local importer should install streams  without persistening them

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/FileDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java?rev=1738599&r1=1738598&r2=1738599&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
 Mon Apr 11 16:18:57 2016
@@ -62,20 +62,9 @@ public class LocalDistributionPackageImp
 
 @Nonnull
 public DistributionPackageInfo importStream(@Nonnull ResourceResolver 
resourceResolver, @Nonnull InputStream stream) throws DistributionException {
-DistributionPackage distributionPackage = null;
-try {
-distributionPackage = packageBuilder.readPackage(resourceResolver, 
stream);
+DistributionPackageInfo packageInfo = 
packageBuilder.installPackage(resourceResolver, stream);
 
-boolean success = packageBuilder.installPackage(resourceResolver, 
distributionPackage);
-
-if (!success) {
-log.warn("could not install distribution package {}", 
distributionPackage.getId());
-}
-
-return distributionPackage.getInfo();
-} finally {
-DistributionPackageUtils.deleteSafely(distributionPackage);
-}
+return packageInfo;
 }
 
 }

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageBuilder.java?rev=1738599&r1=1738598&r2=1738599&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageBuilder.java
 Mon Apr 11 16:18:57 2016
@@ -82,4 +82,16 @@ public interface DistributionPackageBuil
  */
 boolean installPackage(@Nonnull ResourceResolver resourceResolver, 
@Nonnull DistributionPackage distributionPackage) throws DistributionException;
 
+
+/**
+ * install a stream and returns the associated to a {@link 
DistributionPackageInfo} this provider can read and install
+ *
+ * @param resourceResolver resource resolver used to store the eventually 
created package
+ * @param stream   the {@link InputStream} of the package to read
+ * @return a {@link DistributionPackage} if it can read it from the stream
+ * @throws DistributionException when the stream cannot be read as a 
{@link DistributionPackage}
+ */
+@Nonnull
+DistributionPackageInfo installPackage(@Nonnull ResourceResolver 
resourceResolver, @Nonnull InputStream stream) throws DistributionException;
+
 }

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
URL: 
http://svn

svn commit: r1738560 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/monitor/ core/src/

[mpetria]

Author: mpetria
Date: Mon Apr 11 09:40:03 2016
New Revision: 1738560

URL: http://svn.apache.org/viewvc?rev=1738560&view=rev
Log:
SLING-5657: refactor shared packages to enable file storage

Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/FileDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/si

svn commit: r1738558 [1/2] - in /sling/trunk/contrib/extensions/distribution: core/ core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/packag

[mpetria]

Author: mpetria
Date: Mon Apr 11 09:17:33 2016
New Revision: 1738558

URL: http://svn.apache.org/viewvc?rev=1738558&view=rev
Log:
SLING-5577: refactor content serialization to be independent of persistence

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/FileDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/FileDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtilsTest.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionContentSerializerFactory.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoDistributionContentSerializerFactory.java
Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/FileDistributionPackage.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoDistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoResourceDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/extensions/src/test/java/
Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/

svn commit: r1738558 [2/2] - in /sling/trunk/contrib/extensions/distribution: core/ core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/packag

[mpetria]

Added: 
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=1738558&view=auto
==
--- 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
 (added)
+++ 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
 Mon Apr 11 09:17:33 2016
@@ -0,0 +1,241 @@
+/*
+ * 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.
+ */
+package org.apache.sling.distribution.serialization.impl.kryo;
+
+import javax.annotation.Nonnull;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.sling.api.resource.PersistenceException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.SyntheticResource;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.ValueMapDecorator;
+import org.apache.sling.distribution.DistributionRequest;
+import org.apache.sling.distribution.common.DistributionException;
+import 
org.apache.sling.distribution.serialization.DistributionContentSerializer;
+import org.objenesis.strategy.StdInstantiatorStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Kryo based {@link DistributionContentSerializer}
+ */
+public class KryoContentSerializer implements DistributionContentSerializer {
+
+private final Logger log = LoggerFactory.getLogger(getClass());
+
+private final String name;
+private final Kryo kryo = new Kryo();
+private final Set ignoredProperties;
+private final Set ignoredNodeNames;
+
+public KryoContentSerializer(String name) {
+this.name = name;
+kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new 
StdInstantiatorStrategy()));
+kryo.addDefaultSerializer(Resource.class, new ResourceSerializer());
+kryo.addDefaultSerializer(InputStream.class, new 
InputStreamSerializer());
+Set iProps = new HashSet();
+iProps.add(JcrConstants.JCR_FROZENMIXINTYPES);
+iProps.add(JcrConstants.JCR_FROZENPRIMARYTYPE);
+iProps.add(JcrConstants.JCR_FROZENUUID);
+iProps.add(JcrConstants.JCR_VERSIONHISTORY);
+iProps.add(JcrConstants.JCR_BASEVERSION);
+iProps.add(JcrConstants.JCR_PREDECESSORS);
+iProps.add(JcrConstants.JCR_SUCCESSORS);
+iProps.add(JcrConstants.JCR_ISCHECKEDOUT);
+iProps.add(JcrConstants.JCR_UUID);
+ignoredProperties = Collections.unmodifiableSet(iProps);
+
+Set iNames = new HashSet();
+iNames.add("rep:policy");
+ignoredNodeNames = Collections.unmodifiableSet(iNames);
+}
+
+@Override
+public void exportToStream(ResourceResolver resourceResolver, 
DistributionRequest request, OutputStream outputStream) throws 
DistributionException {
+
+String[] paths = request.getPaths();
+Output output = new Output(outputStream);
+LinkedList resources = new LinkedList();
+for (String p : paths) {
+Resource resource = resourceResolver.getResource(p);
+if (resource != null) {
+addResource(request.isDeep(p), resources, resource);
+}
+}
+kryo.writeObject(output, resources);
+output.flush();
+

svn commit: r1737243 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/serialization/impl/vlt/ test/java/org/apache/sling/distribution/serialization/i

[mpetria]

Author: mpetria
Date: Thu Mar 31 14:05:34 2016
New Revision: 1737243

URL: http://svn.apache.org/viewvc?rev=1737243&view=rev
Log:
SLING-5633: allow configuration of autosave threshold

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java?rev=1737243&r1=1737242&r2=1737243&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
 Thu Mar 31 14:05:34 2016
@@ -63,16 +63,19 @@ public class FileVaultDistributionPackag
 private final AccessControlHandling aclHandling;
 
 private final String[] packageRoots;
+private final int autosaveThreshold;
 private final File tempDirectory;
 private final TreeMap> filters;
 private final boolean useBinaryReferences;
 
-public FileVaultDistributionPackageBuilder(String type, Packaging 
packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] 
packageRoots, String[] filterRules, String tempFilesFolder, boolean 
useBinaryReferences) {
+public FileVaultDistributionPackageBuilder(String type, Packaging 
packaging, ImportMode importMode, AccessControlHandling aclHandling,
+   String[] packageRoots, String[] 
filterRules, String tempFilesFolder, boolean useBinaryReferences, int 
autosaveThreshold) {
 super(type);
 this.packaging = packaging;
 this.importMode = importMode;
 this.aclHandling = aclHandling;
 this.packageRoots = packageRoots;
+this.autosaveThreshold = autosaveThreshold;
 
 this.tempDirectory = VltUtils.getTempFolder(tempFilesFolder);
 this.filters = VltUtils.parseFilters(filterRules);
@@ -148,7 +151,7 @@ public class FileVaultDistributionPackag
 File file = new File(distributionPackage.getId());
 if (file.exists()) {
 VaultPackage pkg = packaging.getPackageManager().open(file);
-ImportOptions opts = VltUtils.getImportOptions(aclHandling, 
importMode);
+ImportOptions opts = VltUtils.getImportOptions(aclHandling, 
importMode, autosaveThreshold);
 
 log.debug("using import mode {} and acl {}", 
opts.getImportMode(), opts.getAccessControlHandling());
 pkg.extract(session, opts);

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1737243&r1=1737242&r2=1737243&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 Thu Mar 31 14:05:34 2016
@@ -73,6 +73,7 @@ public class JcrVaultDistributionPackage
 private final ImportMode importMode;
 private final AccessControlHandling aclHandling;
 private final String[] packageRoots;
+private final int autosaveThreshold;
 private final String tempPackagesNode;
 private final File tempDirectory;
 private final TreeMap> filters;
@@ -80,7 +81,8 @@ public class JcrVaultDistributionPackage
 
   

svn commit: r1737238 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

[mpetria]

Author: mpetria
Date: Thu Mar 31 13:33:51 2016
New Revision: 1737238

URL: http://svn.apache.org/viewvc?rev=1737238&view=rev
Log:
SLING-5633: install jcr packages from file

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1737238&r1=1737237&r2=1737238&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 Thu Mar 31 13:33:51 2016
@@ -151,18 +151,21 @@ public class JcrVaultDistributionPackage
 @Override
 protected boolean installPackageInternal(@Nonnull ResourceResolver 
resourceResolver, @Nonnull DistributionPackage distributionPackage) throws 
DistributionException {
 Session session = null;
+VaultPackage vaultPackage = null;
 try {
 session = getSession(resourceResolver);
 
-JcrPackage jcrPackage = ((JcrVaultDistributionPackage) 
distributionPackage).getJcrPackage();
+InputStream stream = distributionPackage.createInputStream();
+vaultPackage = VltUtils.readPackage(packaging.getPackageManager(), 
stream, tempDirectory);
 
 ImportOptions importOptions = 
VltUtils.getImportOptions(aclHandling, importMode);
-jcrPackage.extract(importOptions);
+vaultPackage.extract(session, importOptions);
 
 return true;
 } catch (Exception e) {
 throw new DistributionException(e);
 } finally {
+VltUtils.deletePackage(vaultPackage);
 ungetSession(session);
 }
 }

svn commit: r1737221 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Thu Mar 31 11:02:21 2016
New Revision: 1737221

URL: http://svn.apache.org/viewvc?rev=1737221&view=rev
Log:
SLING-5633: tweak imports to allow core to install with jcr.api 2.2.0

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1737221&r1=1737220&r2=1737221&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Thu Mar 31 
11:02:21 2016
@@ -71,7 +71,7 @@
 org.apache.sling.distribution.util
 
 
-
org.apache.sling.event.jobs;version="[1.5.0,3.0)",org.apache.sling.event.jobs.consumer;version="[1.1,2)",*
+
org.apache.sling.event.jobs;version="[1.5.0,3.0)",org.apache.sling.event.jobs.consumer;version="[1.1,2)",org.apache.sling.jcr.api;version="[2.2.0,2.4.0)",*
 
 httpasyncclient
 

svn commit: r1736880 - in /sling/trunk/contrib/extensions/distribution/it: pom.xml src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java

[mpetria]

Author: mpetria
Date: Mon Mar 28 12:32:28 2016
New Revision: 1736880

URL: http://svn.apache.org/viewvc?rev=1736880&view=rev
Log:
SLING-5630: update distribution its to use latest vault release

Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1736880&r1=1736879&r2=1736880&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Mon Mar 28 12:32:28 
2016
@@ -363,7 +363,7 @@
 
 org.apache.jackrabbit.vault
 org.apache.jackrabbit.vault
-3.1.0
+3.1.24
 provided
 
 
@@ -456,7 +456,7 @@
 
 org.apache.sling
 org.apache.sling.distribution.core
-0.1.15-SNAPSHOT
+0.1.17-SNAPSHOT
 
 
 org.apache.sling

Modified: 
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java?rev=1736880&r1=1736879&r2=1736880&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java
 Mon Mar 28 12:32:28 2016
@@ -20,6 +20,7 @@ package org.apache.sling.distribution.it
 
 import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
 import static org.apache.sling.distribution.it.DistributionUtils.distribute;
+import static 
org.apache.sling.distribution.it.DistributionUtils.distributeDeep;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -58,7 +59,7 @@ public class ForwardBinaryDistributionTe
authorClient.upload(nodePath, data, -1, true);
 
assertExists(authorClient, nodePath);
-distribute(author, "publish", DistributionRequestType.ADD, nodePath);
+distributeDeep(author, "publish", DistributionRequestType.ADD, 
nodePath);
 assertExists(publishClient, nodePath);
 //TODO: also inspect the package size in binaryless case
}

svn commit: r1735543 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: agent/impl/ queue/impl/ resources/impl/ resources/impl/common/

[mpetria]

Author: mpetria
Date: Fri Mar 18 07:51:31 2016
New Revision: 1735543

URL: http://svn.apache.org/viewvc?rev=1735543&view=rev
Log:
SLING-5619: revert changes for SLING-5576

Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResourceIterator.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1735543&r1=1735542&r2=1735543&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Fri Mar 18 07:51:31 2016
@@ -58,7 +58,6 @@ import org.apache.sling.distribution.log
 import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
 import org.apache.sling.distribution.queue.DistributionQueueStatus;
 import org.apache.sling.distribution.queue.impl.DistributionQueueWrapper;
-import org.apache.sling.distribution.queue.impl.SimpleAgentDistributionQueue;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
@@ -306,8 +305,18 @@ public class SimpleDistributionAgent imp
 }
 
 if (queue != null) {
-boolean isPausedQueue = !queueProcessingEnabled && 
(processingQueues != null && processingQueues.contains(queueName));
-queue = new SimpleAgentDistributionQueue(queue, isPausedQueue, 
name);
+queue = new DistributionQueueWrapper(queue) {
+@Nonnull
+@Override
+public DistributionQueueStatus getStatus() {
+DistributionQueueStatus status = super.getStatus();
+if (!queueProcessingEnabled && (processingQueues != null 
&& processingQueues.contains(queueName))) {
+return new 
DistributionQueueStatus(status.getItemsCount(), DistributionQueueState.PAUSED);
+} else {
+return status;
+}
+}
+};
 }
 
 return queue;

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java?rev=1735543&r1=1735542&r2=1735543&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
 Fri Mar 18 07:51:31 2016
@@ -26,7 +26,7 @@ import org.apache.sling.distribution.que
 import javax.annotation.Nonnull;
 
 public abstract class DistributionQueueWrapper implements DistributionQueue {
-protected final DistributionQueue wrappedQueue;
+private final DistributionQueue wrappedQueue;
 
 public DistributionQueueWrapper(DistributionQueue wrappedQueue) {
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResou

svn commit: r1733486 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: agent/impl/ queue/impl/ resources/impl/ resources/impl/common/

[mpetria]

Author: mpetria
Date: Thu Mar  3 15:47:44 2016
New Revision: 1733486

URL: http://svn.apache.org/viewvc?rev=1733486&view=rev
Log:
SLING-5576: improve queue items listing performance by using iterators

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResourceIterator.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1733486&r1=1733485&r2=1733486&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Thu Mar  3 15:47:44 2016
@@ -58,6 +58,7 @@ import org.apache.sling.distribution.log
 import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
 import org.apache.sling.distribution.queue.DistributionQueueStatus;
 import org.apache.sling.distribution.queue.impl.DistributionQueueWrapper;
+import org.apache.sling.distribution.queue.impl.SimpleAgentDistributionQueue;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
@@ -305,18 +306,8 @@ public class SimpleDistributionAgent imp
 }
 
 if (queue != null) {
-queue = new DistributionQueueWrapper(queue) {
-@Nonnull
-@Override
-public DistributionQueueStatus getStatus() {
-DistributionQueueStatus status = super.getStatus();
-if (!queueProcessingEnabled && (processingQueues != null 
&& processingQueues.contains(queueName))) {
-return new 
DistributionQueueStatus(status.getItemsCount(), DistributionQueueState.PAUSED);
-} else {
-return status;
-}
-}
-};
+boolean isPausedQueue = !queueProcessingEnabled && 
(processingQueues != null && processingQueues.contains(queueName));
+queue = new SimpleAgentDistributionQueue(queue, isPausedQueue, 
name);
 }
 
 return queue;

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java?rev=1733486&r1=1733485&r2=1733486&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
 Thu Mar  3 15:47:44 2016
@@ -26,7 +26,7 @@ import org.apache.sling.distribution.que
 import javax.annotation.Nonnull;
 
 public abstract class DistributionQueueWrapper implements DistributionQueue {
-private final DistributionQueue wrappedQueue;
+protected final DistributionQueue wrappedQueue;
 
 public DistributionQueueWrapper(DistributionQueue wrappedQueue) {
 

Added: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java?rev=1733486&view=auto
==

svn commit: r1731829 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: agent/impl/ packaging/impl/ packaging/impl/importer/ queue/impl/ serialization/

[mpetria]

Author: mpetria
Date: Tue Feb 23 10:14:06 2016
New Revision: 1731829

URL: http://svn.apache.org/viewvc?rev=1731829&view=rev
Log:
SLING-5550: optimize acquiring of distribution packages

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SharedDistributionPackage.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1731829&r1=1731828&r2=1731829&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Tue Feb 23 10:14:06 2016
@@ -276,8 +276,6 @@ public class SimpleDistributionAgent imp
 distributionResponses.add(new 
SimpleDistributionResponse(DistributionRequestState.DROPPED, e.toString()));
 }
 
-log.debug("PACKAGE-QUEUED {}: packageId={}, info={}", requestId, 
distributionPackage.getId(), distributionPackage.getInfo());
-
 return distributionResponses;
 }
 
@@ -616,7 +614,7 @@ public class SimpleDistributionAgent imp
 final long endTime = System.currentTimeMillis();
 
 
-log.debug("[{}] ITEM-PROCESSED item={}, status={}, 
processingTime={}", queueName, queueItem, success, endTime - startTime);
+log.debug("[{}] ITEM-PROCESSED item={}, status={}, 
processingTime={}ms", queueName, queueItem, success, endTime - startTime);
 
 return success;
 
@@ -635,7 +633,7 @@ public class SimpleDistributionAgent imp
 
 private final String callingUser;
 private final String requestId;
-private final long startTime;
+private final long requestStartTime;
 private final AtomicInteger packagesCount = new AtomicInteger();
 private final AtomicLong packagesSize = new AtomicLong();
 private final List allResponses = new 
ArrayList();
@@ -652,19 +650,25 @@ public class SimpleDistributionAgent imp
 return packagesSize.get();
 }
 
-PackageExporterProcessor(String callingUser, String requestId, long 
startTime) {
+PackageExporterProcessor(String callingUser, String requestId, long 
requestStartTime) {
 this.callingUser = callingUser;
 this.requestId = requestId;
-this.startTime = startTime;
+this.requestStartTime = requestStartTime;
 }
 
 @Override
 public void process(DistributionPackage distributionPackage) {
+final long startTime = System.currentTimeMillis();
+
 Collection responses = 
scheduleImportPackage(distributionPackage, callingUser,
-requestId, startTime);
+requestId, requestStartTime);
 packagesCount.incrementAndGet();
 packagesSize.addAndGet(distributionPackage.getSize());
 allResponses.addAll(responses);
+
+final long endTime = System.currentTimeMillis();
+
+log.debug("PACKAGE-QUEUED {}: packageId={}, queueTime={}ms, 
responses={}", requestId, distributionPackage.getId(), endTime - startTime, 
responses.size());
 }
 }
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java?rev=1731829&r1=1731828&r2=1731829&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packa

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

[mpetria]

Author: mpetria
Date: Mon Feb 22 09:17:37 2016
New Revision: 1731606

URL: http://svn.apache.org/viewvc?rev=1731606&view=rev
Log:
SLING-5530: integration test for binaryless distribution

Added:
sling/trunk/contrib/extensions/distribution/it/src/main/resources/install/

sling/trunk/contrib/extensions/distribution/it/src/main/resources/install/org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg

sling/trunk/contrib/extensions/distribution/it/src/main/resources/install/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardBinaryDistributionTest.java

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.notshared/

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.shared/

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
Removed:

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json
Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1731606&r1=1731605&r2=1731606&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Mon Feb 22 09:17:37 
2016
@@ -75,13 +75,22 @@

${project.build.directory}/author
 
--p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=author
+-p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=author,notshared
 


${project.build.directory}/publish
--p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=publish
+-p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=publish,notshared
 
-
+   
+   
${project.build.directory}/author-shared
+-p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=author,shared -Dsling.fileinstall.dir=sling/install
+
+   
+   
+   
${project.build.directory}/publish-shared
+-p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=publish,shared -Dsling.fileinstall.dir=sling/install
+
+
 
 **/**Test.java
 
@@ -124,7 +133,8 @@
 
 
 derby.log
-
src/main/resources/SLING-CONTENT/libs/test/install.author/*.json
+src/main/resources/**/*.*
+src/test/resources/**/*.*
 
 
 
@@ -143,6 +153,24 @@
 
 
 
+
+
+
+
+
+
+ 
+   
+   

+   
+   
+   
+   
+   
+   
+   

+   
+   
 
 
 
@@ -204,6 +232,9 @@
 
 author.http.port
 publish.http.port
+
+author-shared.http.port
+   

svn commit: r1731078 - /sling/site/trunk/content/documentation/bundles/content-distribution.mdtext

[mpetria]

Author: mpetria
Date: Thu Feb 18 14:25:18 2016
New Revision: 1731078

URL: http://svn.apache.org/viewvc?rev=1731078&view=rev
Log:
SLING-4540: content distribution documentation page - adding configuration 
samples

Modified:
sling/site/trunk/content/documentation/bundles/content-distribution.mdtext

Modified: 
sling/site/trunk/content/documentation/bundles/content-distribution.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/content-distribution.mdtext?rev=1731078&r1=1731077&r2=1731078&view=diff
==
--- sling/site/trunk/content/documentation/bundles/content-distribution.mdtext 
(original)
+++ sling/site/trunk/content/documentation/bundles/content-distribution.mdtext 
Thu Feb 18 14:25:18 2016
@@ -8,32 +8,61 @@ The Sling Content Distribution (SCD) mod
 
 ## Distribution usecases
 
+Some of the usecases have sample configuration in [Distribution Sample 
Module](https://github.com/apache/sling/tree/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution)
 and are tested in [Distribution ITs 
Module](https://github.com/apache/sling/tree/trunk/contrib/extensions/distribution/it).
+
 ### Forward distribution
 A forward distribution setup allows one to transfer content from a source 
instance to a farm of target instances. That is done by pushing the content 
from source to target.
 
- Setup overview:
+ Setup overview
+
 * one source instance
-** one distribution agent connected to importer endpoints for all target 
instances.   
+* one distribution agent connected to importer endpoints for all target 
instances.   
 * N target instances
-** one distribution importer on each target instance used to import packages 
into the local instance.
+* one distribution importer on each target instance used to import 
packages into the local instance.
+
+ Sample configuration
+
+* on source instance: one forward agent
+
+
org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json

+name="publish"
+
packageImporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/importers/default";]
 
- Sample configuration:
+* on target instance: one local importer
+
+
org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default
+name="default"
 
 
 ### Reverse distribution
 
 A reverse distribution setup allows one to transfer content from a farm of 
source instances to a target instance. That is done by pulling the content from 
source instances into the target instance.
 
- Setup overview:
+ Setup overview
 * one target instance
-** one distribution agent connected to exporter endpoints for all target 
instances.   
+* one distribution agent connected to exporter endpoints for all target 
instances.   
 * N source instances
-** one distribution (queue) agent on each source instance; changes from the 
source instances are placed in the queues of these agents.
-** one distribution exporter on each source instance that exports packages 
from the queue agent.
+* one distribution (queue) agent on each source instance; changes from the 
source instances are placed in the queues of these agents.
+* one distribution exporter on each source instance that exports packages 
from the queue agent.
 
- Sample configuration:
+ Sample configuration
 
+* on target instance: one reverse agent
 
+
org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-reverse.json

+name="reverse"
+
packageExporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/exporters/reverse";]
+
+* on source instance: one queue agent and one exporter for that agent
+
+
org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json

+name="reverse"
+
+
org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse
+name="reverse"
+agent.target="(name=reverse)"
+
+
 
 ### Sync distribution
 
@@ -41,39 +70,102 @@ A sync distribution setup allows one to
 
  Setup overview:
 * one coordinator instance
-** one distribution agent connected to exporter/importer endpoints for all 
farm instances.   
+* one distribution agent connected to exporter/importer endpoints for all 
farm instances.   
 * N farm instances
-** one distribution (queue) agent on each farm instance; changes from these 
instances are placed in the queues of the queue agents.
-** one distribution exporter on each farm instance that exports packages from 
the queue agent.
-** one distribution importer on each farm 

svn commit: r1731067 - /sling/site/trunk/content/documentation/bundles/content-distribution.mdtext

[mpetria]

Author: mpetria
Date: Thu Feb 18 13:15:46 2016
New Revision: 1731067

URL: http://svn.apache.org/viewvc?rev=1731067&view=rev
Log:
SLING-4540: content distribution documentation page

Modified:
sling/site/trunk/content/documentation/bundles/content-distribution.mdtext

Modified: 
sling/site/trunk/content/documentation/bundles/content-distribution.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/content-distribution.mdtext?rev=1731067&r1=1731066&r2=1731067&view=diff
==
--- sling/site/trunk/content/documentation/bundles/content-distribution.mdtext 
(original)
+++ sling/site/trunk/content/documentation/bundles/content-distribution.mdtext 
Thu Feb 18 13:15:46 2016
@@ -4,25 +4,70 @@ Title: Content Distribution (org.apache.
 
 ## Introduction
 
-The Sling Content Distribution (SCD) module allows one to distributw Sling 
resources between different Sling instances. The API works at path level and 
the distribution agents basically enable distribution of specific paths between 
instances. There are several main usecases in which SCD can help.
+The Sling Content Distribution (SCD) module allows one to distribute Sling 
resources between different Sling instances. The API works at path level and 
the distribution agents basically enable distribution of specific paths between 
instances. There are several main usecases in which SCD can help. Typically the 
distribution is done from one or more source instances to one or more target 
instances.
 
 ## Distribution usecases
 
 ### Forward distribution
-A "forward" distribution setup allows one to transfer content from an author 
instance to a farm of publish instances.
+A forward distribution setup allows one to transfer content from a source 
instance to a farm of target instances. That is done by pushing the content 
from source to target.
+
+ Setup overview:
+* one source instance
+** one distribution agent connected to importer endpoints for all target 
instances.   
+* N target instances
+** one distribution importer on each target instance used to import packages 
into the local instance.
+
+ Sample configuration:
+
 
 ### Reverse distribution
 
-A "reverse" distribution setup allows one to transfer content from a farm of 
publish instances to an author instance.
+A reverse distribution setup allows one to transfer content from a farm of 
source instances to a target instance. That is done by pulling the content from 
source instances into the target instance.
+
+ Setup overview:
+* one target instance
+** one distribution agent connected to exporter endpoints for all target 
instances.   
+* N source instances
+** one distribution (queue) agent on each source instance; changes from the 
source instances are placed in the queues of these agents.
+** one distribution exporter on each source instance that exports packages 
from the queue agent.
+
+ Sample configuration:
+
+
 
 ### Sync distribution
 
-A "sync" distribution setup allows one to synchornize content in a farm of 
publish instances.
+A sync distribution setup allows one to synchronize content in a farm of 
instances. That is done by using a coordinator instance (typically an author 
instance) that pulls content from all instances in a farm and pushes it back to 
all.
+
+ Setup overview:
+* one coordinator instance
+** one distribution agent connected to exporter/importer endpoints for all 
farm instances.   
+* N farm instances
+** one distribution (queue) agent on each farm instance; changes from these 
instances are placed in the queues of the queue agents.
+** one distribution exporter on each farm instance that exports packages from 
the queue agent.
+** one distribution importer on each farm instance used to import packages 
into the local instance.
+
+ Sample configuration:
 
 
 ### Multidatacenter sync distribution
 
-A "multidatacenter sync" distribution setup allows one to synchornize content 
in a farm of publish instances across datacenters.
+A multidatacenter sync distribution setup allows one to synchronize content in 
a farm of publish instances across datacenters. This a variation of sync 
distribution but using a coordinator in each datacenter.
+
+ Setup overview:
+
+* one coordinator instance in each datacenter
+** one distribution agent for intra-datacenter synchronization. Like a regular 
sync agent it connects to all farm instances in its datacenter and syncronizes 
them. In addition to a regular sync agent it keeps the packages also in 
dedicated queues for the other DCs, so that the coordinators from the other DCs 
can pull the updates.
+** one distribution exporter for each queue dedicated for the remote DCs. The 
inter-dc coordinators from the other DCs will connect to these exporter 
endpoints.
+** one distribution agent for inter-datacenter synchronization; it conntects 
to th

svn commit: r1731053 - /sling/site/trunk/content/documentation/bundles/content-distribution.mdtext

[mpetria]

Author: mpetria
Date: Thu Feb 18 12:07:33 2016
New Revision: 1731053

URL: http://svn.apache.org/viewvc?rev=1731053&view=rev
Log:
SLING-4540: first draft of content distribution documentation page

Added:
sling/site/trunk/content/documentation/bundles/content-distribution.mdtext

Added: 
sling/site/trunk/content/documentation/bundles/content-distribution.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/content-distribution.mdtext?rev=1731053&view=auto
==
--- sling/site/trunk/content/documentation/bundles/content-distribution.mdtext 
(added)
+++ sling/site/trunk/content/documentation/bundles/content-distribution.mdtext 
Thu Feb 18 12:07:33 2016
@@ -0,0 +1,34 @@
+Title: Content Distribution (org.apache.sling.distribution)
+[TOC]
+
+
+## Introduction
+
+The Sling Content Distribution (SCD) module allows one to distributw Sling 
resources between different Sling instances. The API works at path level and 
the distribution agents basically enable distribution of specific paths between 
instances. There are several main usecases in which SCD can help.
+
+## Distribution usecases
+
+### Forward distribution
+A "forward" distribution setup allows one to transfer content from an author 
instance to a farm of publish instances.
+
+### Reverse distribution
+
+A "reverse" distribution setup allows one to transfer content from a farm of 
publish instances to an author instance.
+
+### Sync distribution
+
+A "sync" distribution setup allows one to synchornize content in a farm of 
publish instances.
+
+
+### Multidatacenter sync distribution
+
+A "multidatacenter sync" distribution setup allows one to synchornize content 
in a farm of publish instances across datacenters.
+
+
+## Additional options
+
+### How to configure binary-less distribution?
+
+### How to configure priority paths?
+
+### How to configure error queues?
\ No newline at end of file

svn commit: r1728476 - /sling/trunk/contrib/extensions/distribution/it/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:28:06 2016
New Revision: 1728476

URL: http://svn.apache.org/viewvc?rev=1728476&view=rev
Log:
Update distribution its to snapshot versions

Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1728476&r1=1728475&r2=1728476&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Thu Feb  4 13:28:06 
2016
@@ -415,12 +415,12 @@
 
 org.apache.sling
 org.apache.sling.distribution.core
-0.1.14
+0.1.15-SNAPSHOT
 
 
 org.apache.sling
 org.apache.sling.distribution.sample
-0.1.6
+0.1.7-SNAPSHOT
 
 
 

svn commit: r1728473 - /sling/trunk/contrib/extensions/distribution/it/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:20:59 2016
New Revision: 1728473

URL: http://svn.apache.org/viewvc?rev=1728473&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1728473&r1=1728472&r2=1728473&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Thu Feb  4 13:20:59 
2016
@@ -28,7 +28,7 @@
 
 
 org.apache.sling.distribution.it
-0.1.2
+0.1.3-SNAPSHOT
 bundle
 
 Apache Sling Distribution Integration Tests
@@ -87,9 +87,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.it-0.1.2
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.it-0.1.2
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.it-0.1.2
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/it
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/it
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it
 
 
 

svn commit: r1728472 - /sling/tags/org.apache.sling.distribution.it-0.1.2/

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:20:55 2016
New Revision: 1728472

URL: http://svn.apache.org/viewvc?rev=1728472&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.distribution.it-0.1.2

Added:
sling/tags/org.apache.sling.distribution.it-0.1.2/
  - copied from r1728470, sling/trunk/contrib/extensions/distribution/it/

svn commit: r1728470 - /sling/trunk/contrib/extensions/distribution/it/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:20:40 2016
New Revision: 1728470

URL: http://svn.apache.org/viewvc?rev=1728470&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.distribution.it-0.1.2

Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1728470&r1=1728469&r2=1728470&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Thu Feb  4 13:20:40 
2016
@@ -24,11 +24,11 @@
 org.apache.sling
 sling
 26
-
+
 
 
 org.apache.sling.distribution.it
-0.1.1-SNAPSHOT
+0.1.2
 bundle
 
 Apache Sling Distribution Integration Tests
@@ -87,9 +87,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/it
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/it
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.it-0.1.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.it-0.1.2
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.it-0.1.2
 
 
 
@@ -141,8 +141,8 @@
 process-resources
 
 
-
-
+
+
 
 
 

svn commit: r1728465 - /sling/trunk/contrib/extensions/distribution/it/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:04:55 2016
New Revision: 1728465

URL: http://svn.apache.org/viewvc?rev=1728465&view=rev
Log:
Preparing distribution its for release

Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1728465&r1=1728464&r2=1728465&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Thu Feb  4 13:04:55 
2016
@@ -415,12 +415,12 @@
 
 org.apache.sling
 org.apache.sling.distribution.core
-0.1.13-SNAPSHOT
+0.1.14
 
 
 org.apache.sling
 org.apache.sling.distribution.sample
-0.1.5-SNAPSHOT
+0.1.6
 
 
 

svn commit: r1728461 - /sling/tags/org.apache.sling.distribution.sample-0.1.6/

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:01:09 2016
New Revision: 1728461

URL: http://svn.apache.org/viewvc?rev=1728461&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.distribution.sample-0.1.6

Added:
sling/tags/org.apache.sling.distribution.sample-0.1.6/
  - copied from r1728460, 
sling/trunk/contrib/extensions/distribution/sample/

svn commit: r1728462 - /sling/trunk/contrib/extensions/distribution/sample/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:01:13 2016
New Revision: 1728462

URL: http://svn.apache.org/viewvc?rev=1728462&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/contrib/extensions/distribution/sample/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/sample/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/pom.xml?rev=1728462&r1=1728461&r2=1728462&view=diff
==
--- sling/trunk/contrib/extensions/distribution/sample/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/sample/pom.xml Thu Feb  4 
13:01:13 2016
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.distribution.sample
-0.1.6
+0.1.7-SNAPSHOT
 bundle
 
 Apache Sling Distribution Sample
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.6
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.6
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.sample-0.1.6
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample
 
 
 

svn commit: r1728460 - /sling/trunk/contrib/extensions/distribution/sample/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 13:00:53 2016
New Revision: 1728460

URL: http://svn.apache.org/viewvc?rev=1728460&view=rev
Log:
[maven-release-plugin] prepare release 
org.apache.sling.distribution.sample-0.1.6

Modified:
sling/trunk/contrib/extensions/distribution/sample/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/sample/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/pom.xml?rev=1728460&r1=1728459&r2=1728460&view=diff
==
--- sling/trunk/contrib/extensions/distribution/sample/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/sample/pom.xml Thu Feb  4 
13:00:53 2016
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.distribution.sample
-0.1.5-SNAPSHOT
+0.1.6
 bundle
 
 Apache Sling Distribution Sample
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.6
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.6
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.sample-0.1.6
 
 
 

svn commit: r1728457 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 12:57:54 2016
New Revision: 1728457

URL: http://svn.apache.org/viewvc?rev=1728457&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1728457&r1=1728456&r2=1728457&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Thu Feb  4 
12:57:54 2016
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.14
+0.1.15-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.14
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.14
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.core-0.1.14
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core
 
 
 

svn commit: r1728456 - /sling/tags/org.apache.sling.distribution.core-0.1.14/

[mpetria]

Author: mpetria
Date: Thu Feb  4 12:57:51 2016
New Revision: 1728456

URL: http://svn.apache.org/viewvc?rev=1728456&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.distribution.core-0.1.14

Added:
sling/tags/org.apache.sling.distribution.core-0.1.14/
  - copied from r1728455, sling/trunk/contrib/extensions/distribution/core/

svn commit: r1728455 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Thu Feb  4 12:57:34 2016
New Revision: 1728455

URL: http://svn.apache.org/viewvc?rev=1728455&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.distribution.core-0.1.14

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1728455&r1=1728454&r2=1728455&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Thu Feb  4 
12:57:34 2016
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.13-SNAPSHOT
+0.1.14
 bundle
 
 Apache Sling Distribution Core
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.14
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.14
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.core-0.1.14
 
 
 

svn commit: r1728301 - in /sling/trunk/contrib/extensions/distribution: it/pom.xml sample/src/main/java/org/apache/sling/distribution/test/Init.java

[mpetria]

Author: mpetria
Date: Wed Feb  3 12:21:10 2016
New Revision: 1728301

URL: http://svn.apache.org/viewvc?rev=1728301&view=rev
Log:
SLING-5479: running distribution its with launchapad 8 (Oak)

Modified:
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/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1728301&r1=1728300&r2=1728301&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Wed Feb  3 12:21:10 
2016
@@ -72,18 +72,16 @@
 
 
1.0
 
-
-
-
+   
${project.build.directory}/author
 
--p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=author -Dsling.home=sling/author
+-p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=author
 
+   
+   
${project.build.directory}/publish
 -p $JAREXEC_SERVER_PORT$ 
-Dsling.run.modes=publish
--Dsling.home=sling/publish
 
 
-
 
 **/**Test.java
 
@@ -126,7 +124,6 @@
 
 
 derby.log
-sling/**
 
src/main/resources/SLING-CONTENT/libs/test/install.author/*.json
 
 
@@ -135,21 +132,26 @@
 org.apache.maven.plugins
 maven-javadoc-plugin
 
-
 
-maven-clean-plugin
-
-
-
-${basedir}
-
-
-sling/**
-
-
-
-
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+createFolders
+process-resources
+
+
+
+
+
+
+
+run
+
+
+
 
+
 
 org.apache.maven.plugins
 maven-dependency-plugin
@@ -255,8 +257,10 @@
 
 
${publish.jar.executor.jar.options}
 
-
-
+
+   
${author.jar.executor.work.folder}
+   
${publish.jar.executor.work.folder}
+
 
 
${project.build.directory},${project.build.directory}/sling/additional-bundles
 
@@ -280,11 +284,6 @@
 
 
httpcore-osgi
 
httpclient-osgi
-
org.apache.sling.jcr.resource
-
org.apache.sling.discovery.impl
-
org.apache.sling.serviceusermapper
-
org.apache.sling.jcr.api
-
org.apache.sling.jcr.base
 
org.apache.sling.event
 
org.apache.sling.hc.core
 
org.apache.jackrabbit.vault
@@ -319,28 +318,6 @@
 2.2.0
 provided
 
-
-org.apache.sling
-org.apache.sling.discovery.impl
-1.0.12
-provided
-
-
-org.apache.sling
-org.apache.sling.jcr.resource
-2.3.12
-provided
-
-
-org.apache.sling
-org.apache.sling.jcr.api
-2.3.0
-
-
-org.apache.sling
-org.apache.sling.jcr.base
-2.3.0
-
 
 
 org.apache.jackrabbit.vault
@@ -376,8 +353,7 @@
 
 org.apache.sling
 org.apache.sling.launchpad
-standalone
-7
+8
 
 
 org.slf4j

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=1728301&r1=1728300&r2=1728301&view=diff
==
--- 
sling/trunk/contrib/ex

svn commit: r1727953 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: agent/impl/ serialization/impl/ serialization/impl/vlt/ servlet/

[mpetria]

Author: mpetria
Date: Mon Feb  1 15:36:33 2016
New Revision: 1727953

URL: http://svn.apache.org/viewvc?rev=1727953&view=rev
Log:
SLING-5473: reduce locking for shared distribution packages

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1727953&r1=1727952&r2=1727953&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Mon Feb  1 15:36:33 2016
@@ -435,6 +435,8 @@ public class SimpleDistributionAgent imp
 distributionPackage = 
distributionPackageExporter.getPackage(agentResourceResolver, 
queueItem.getId());
 
 if (distributionPackage != null) {
+final long getTime = System.currentTimeMillis();
+
 final DistributionRequestType requestType = 
distributionPackage.getInfo().getRequestType();
 final long packageSize = distributionPackage.getSize();
 final String[] paths = 
distributionPackage.getInfo().getPaths();
@@ -447,10 +449,10 @@ public class SimpleDistributionAgent imp
 removeItemFromQueue = true;
 final long endTime = System.currentTimeMillis();
 
-log.info("[{}] PACKAGE-DELIVERED {}: {} paths={}, 
time={}ms, importTime={}ms, size={}B", new Object[] {
+log.info("[{}] PACKAGE-DELIVERED {}: {} paths={}, 
importTime={}ms, execTime={}ms, size={}B", new Object[] {
 queueName, requestId,
 requestType, paths,
-endTime - globalStartTime, endTime - startTime,
+endTime - startTime, endTime - globalStartTime,
 packageSize
 });
 } catch (RecoverableDistributionException e) {
@@ -525,7 +527,9 @@ public class SimpleDistributionAgent imp
 
 if (resourceResolver != null) {
 try {
-resourceResolver.commit();
+if (resourceResolver.hasChanges()) {
+resourceResolver.commit();
+}
 } catch (PersistenceException e) {
 log.error("cannot commit changes to resource resolver", e);
 } finally {
@@ -603,11 +607,16 @@ public class SimpleDistributionAgent imp
 DistributionQueueItem queueItem = queueEntry.getItem();
 
 try {
+final long startTime = System.currentTimeMillis();
+
 log.debug("[{}] ITEM-PROCESS processing item={}", queueName, 
queueItem);
 
 boolean success = processQueueItem(queueName, queueEntry);
 
-log.debug("[{}] ITEM-PROCESSED item={}, status={}", queueName, 
queueItem, success);
+final long endTime = System.currentTimeMillis();
+
+
+log.debug("[{}] ITEM-PROCESSED item={}, status={}, 
processingTime={}", queueName, queueItem, success, endTime - startTime);
 
 return success;
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java?rev=1727953&r1=1727952&r2=1727953&view=diff
=

svn commit: r1727938 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java it/src/test/java/org/apache/sling/distr

[mpetria]

Author: mpetria
Date: Mon Feb  1 14:09:26 2016
New Revision: 1727938

URL: http://svn.apache.org/viewvc?rev=1727938&view=rev
Log:
SLING-5472: fix distribution package leak

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1727938&r1=1727937&r2=1727938&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Mon Feb  1 14:09:26 2016
@@ -469,9 +469,10 @@ public class SimpleDistributionAgent imp
 log.error("distribution package with id {} does not exist. the 
package will be skipped.", queueItem.getId());
 }
 } finally {
-DistributionPackageUtils.closeSafely(distributionPackage);
 if (removeItemFromQueue) {
 DistributionPackageUtils.releaseOrDelete(distributionPackage, 
queueName);
+} else {
+DistributionPackageUtils.closeSafely(distributionPackage);
 }
 ungetAgentResourceResolver(agentResourceResolver);
 }

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=1727938&r1=1727937&r2=1727938&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  1 14:09:26 2016
@@ -107,12 +107,12 @@ public abstract class DistributionIntegr
 public static void checkNoPackagesLeft() throws IOException, JSONException 
{
 
 
-assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/vlt/shared");
-assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/vlt/data");
+assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/default/shared");
+assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/default/data");
 assertEmptyFolder(author, authorClient, 
"/etc/packages/sling/distribution");
 
-assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/vlt/shared");
-assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/vlt/data");
+assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/default/shared");
+assertEmptyFolder(author, authorClient, 
"/var/sling/distribution/packages/default/data");
 assertEmptyFolder(publish, publishClient, 
"/etc/packages/sling/distribution");
 }
 

svn commit: r1727381 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/serialization/impl/vlt/ test/java/org/apache/sling/distribution/serialization/i

[mpetria]

Author: mpetria
Date: Thu Jan 28 15:19:15 2016
New Revision: 1727381

URL: http://svn.apache.org/viewvc?rev=1727381&view=rev
Log:
SLING-5432: expose configuration option for binaryless distribution

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java?rev=1727381&r1=1727380&r2=1727381&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
 Thu Jan 28 15:19:15 2016
@@ -65,8 +65,9 @@ public class FileVaultDistributionPackag
 private final String[] packageRoots;
 private final File tempDirectory;
 private final TreeMap> filters;
+private final boolean useBinaryReferences;
 
-public FileVaultDistributionPackageBuilder(String type, Packaging 
packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] 
packageRoots, String[] filterRules, String tempFilesFolder) {
+public FileVaultDistributionPackageBuilder(String type, Packaging 
packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] 
packageRoots, String[] filterRules, String tempFilesFolder, boolean 
useBinaryReferences) {
 super(type);
 this.packaging = packaging;
 this.importMode = importMode;
@@ -75,7 +76,7 @@ public class FileVaultDistributionPackag
 
 this.tempDirectory = VltUtils.getTempFolder(tempFilesFolder);
 this.filters = VltUtils.parseFilters(filterRules);
-
+this.useBinaryReferences = useBinaryReferences;
 
 log.info("using temp directory {}", tempDirectory == null ? 
tempDirectory : tempDirectory.getPath());
 }
@@ -92,7 +93,7 @@ public class FileVaultDistributionPackag
 String packageName = getType() + "_" + System.currentTimeMillis() 
+ "_" + UUID.randomUUID();
 
 WorkspaceFilter filter = VltUtils.createFilter(request, filters);
-ExportOptions opts = VltUtils.getExportOptions(filter, 
packageRoots, packageGroup, packageName, VERSION);
+ExportOptions opts = VltUtils.getExportOptions(filter, 
packageRoots, packageGroup, packageName, VERSION, useBinaryReferences);
 
 log.debug("assembling package {}", packageGroup + '/' + 
packageName + "-" + VERSION);
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1727381&r1=1727380&r2=1727381&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 Thu Jan 28 15:19:15 2016
@@ -76,8 +76,9 @@ public class JcrVaultDistributionPackage
 private final String tempPackagesNode;
 private final File tempDirectory;
 private final TreeMap> filters;
+private final boolean useBinaryReferences;
 
-public JcrVaultDistributionPackageBuilder(String type, Packaging 
packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] 
packageRoots, String[] filterRules, String tempFilesFolder) {
+publ

svn commit: r1725880 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: agent/impl/ packaging/impl/exporter/ packaging/impl/importer/ resources/impl/ s

[mpetria]

Author: mpetria
Date: Thu Jan 21 08:13:15 2016
New Revision: 1725880

URL: http://svn.apache.org/viewvc?rev=1725880&view=rev
Log:
SLING-5444: display namehints in webconsole for distribution factories

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProviderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProviderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1725880&r1=1725879&r2=1725880&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 Thu Jan 21 08:13:15 2016
@@ -74,6 +74,7 @@ import org.slf4j.LoggerFactory;
 @Reference(name = "triggers", referenceInterface = DistributionTrigger.class,
 policy = ReferencePolicy.DYNAMIC, cardinality = 
ReferenceCardinality.OPTIONAL_MULTIPLE,
 bind = "bindDistributionTrigger", unbind = "unbindDistributionTrigger")
+@Property(name="webconsole.configurationFactory.nameHint", value="Agent name: 
{name}")
 public class Forward

svn commit: r1725287 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: agent/impl/ packaging/impl/ servlet/ transport/impl/

[mpetria]

Author: mpetria
Date: Mon Jan 18 15:21:08 2016
New Revision: 1725287

URL: http://svn.apache.org/viewvc?rev=1725287&view=rev
Log:
SLING-5436: do not move distribution packages to error queues on connection 
errors

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1725287&r1=1725286&r2=1725287&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Mon Jan 18 15:21:08 2016
@@ -45,38 +45,40 @@ import org.apache.sling.distribution.Dis
 import org.apache.sling.distribution.DistributionResponse;
 import org.apache.sling.distribution.agent.DistributionAgent;
 import org.apache.sling.distribution.agent.DistributionAgentState;
-import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.common.RecoverableDistributionException;
 import org.apache.sling.distribution.component.impl.DistributionComponentKind;
 import org.apache.sling.distribution.component.impl.SettingsUtils;
 import org.apache.sling.distribution.event.DistributionEventTopics;
 import org.apache.sling.distribution.event.impl.DistributionEventFactory;
 import org.apache.sling.distribution.impl.CompositeDistributionResponse;
+import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.impl.SimpleDistributionResponse;
 import org.apache.sling.distribution.log.DistributionLog;
 import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
+import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.queue.DistributionQueueStatus;
+import org.apache.sling.distribution.queue.impl.DistributionQueueWrapper;
+import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
 import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
 import org.apache.sling.distribution.queue.DistributionQueue;
 import org.apache.sling.distribution.queue.DistributionQueueEntry;
+
 import org.apache.sling.distribution.queue.DistributionQueueItem;
 import org.apache.sling.distribution.queue.DistributionQueueItemState;
 import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
 import org.apache.sling.distribution.queue.DistributionQueueProcessor;
 import org.apache.sling.distribution.queue.DistributionQueueProvider;
 import org.apache.sling.distribution.queue.DistributionQueueState;
-import org.apache.sling.distribution.queue.DistributionQueueStatus;
 import 
org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
-import org.apache.sling.distribution.queue.impl.DistributionQueueWrapper;
-import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.trigger.DistributionRequestHandler;
 import org.apache.sling.distribution.trigger.DistributionTrigger;
 import org.apache.sling.distribution.util.impl.DistributionUtils;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.resource.JcrResourceConstants;
 
+
 /**
  * Basic implementation of a {@link 
org.apache.sling.distribution.agent.DistributionAgent}
  */
@@ -176,7 +178,7 @@ public class SimpleDistributionAgent imp
 
 ResourceResolver agentResourceResolver = null;
 
-final String requestId = "DSTRQ" + nextRequestId.incrementAndGet();
+final String requestId = "DSTRQ"+ nextRequestId.incrementAndGet();
 String callingUser = resourceResolver.getUserID();
 
 try {
@@ -194,7 +196,7 @@ public class SimpleDistributionAgent imp
 
 boolean silent = 
DistributionRequestType.PULL.equal

svn commit: r1724744 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: queue/impl/ resources/impl/ servlet/

[mpetria]

Author: mpetria
Date: Fri Jan 15 09:02:27 2016
New Revision: 1724744

URL: http://svn.apache.org/viewvc?rev=1724744&view=rev
Log:
SLING-5430: allow move between distribution queues

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java?rev=1724744&r1=1724743&r2=1724744&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
 Fri Jan 15 09:02:27 2016
@@ -47,7 +47,7 @@ public class ErrorQueueDispatchingStrate
 private final Logger log = LoggerFactory.getLogger(getClass());
 
 
-private final static String ERROR_PREFIX = "error-";
+public final static String ERROR_PREFIX = "error-";
 private final Set queueNames = new TreeSet();
 
 public ErrorQueueDispatchingStrategy(String[] queueNames) {

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java?rev=1724744&r1=1724743&r2=1724744&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
 Fri Jan 15 09:02:27 2016
@@ -30,6 +30,7 @@ import org.apache.sling.distribution.com
 import org.apache.sling.distribution.component.impl.DistributionComponentKind;
 import 
org.apache.sling.distribution.component.impl.DistributionComponentProvider;
 import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
 import org.apache.sling.distribution.serialization.DistributionPackageInfo;
 import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
 import org.apache.sling.distribution.queue.DistributionQueue;
@@ -138,6 +139,11 @@ public class ExtendedDistributionService
 result.put("empty", queueStatus.isEmpty());
 result.put("itemsCount", queueStatus.getItemsCount());
 
+if 
(queueName.startsWith(ErrorQueueDispatchingStrategy.ERROR_PREFIX)) {
+String retryQueue = 
queueName.replace(ErrorQueueDispatchingStrategy.ERROR_PREFIX, "");
+result.put("retryQueue", retryQueue);
+}
+
 List nameList = new ArrayList();
 Map> propertiesMap = new 
HashMap>();
 for (DistributionQueueEntry entry : queue.getItems(0, 
MAX_QUEUE_DEPTH)) {

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java?rev=1724744&r1=1724743&r2=1724744&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
 Fri Jan 15 09:02:27 2016
@@ -90,6 +90,17 @@ public class DistributionAgentQueueServl
 
 addItems(resourceResolver, queue, sourceQueue, idParam);
 }
+} else if ("move".equals(operation)) {
+String from = request.getPar

svn commit: r1724625 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

[mpetria]

Author: mpetria
Date: Thu Jan 14 14:42:19 2016
New Revision: 1724625

URL: http://svn.apache.org/viewvc?rev=1724625&view=rev
Log:
SLING-5429: do not require root access for storing jcr packages

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1724625&r1=1724624&r2=1724625&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 Thu Jan 14 14:42:19 2016
@@ -86,7 +86,7 @@ public class JcrVaultDistributionPackage
 this.importMode = importMode;
 this.aclHandling = aclHandling;
 this.packageRoots = packageRoots;
-this.tempPackagesNode = AbstractDistributionPackage.PACKAGES_ROOT + 
"/" + type + "/data";
+this.tempPackagesNode = type + "/data";
 
 this.tempDirectory = VltUtils.getTempFolder(tempFilesFolder);
 this.filters = VltUtils.parseFilters(filterRules);
@@ -193,24 +193,20 @@ public class JcrVaultDistributionPackage
 
 
 try {
-if (packageRoot != null) {
-String packageName = packageId.getDownloadName();
-if (packageRoot.hasNode(packageName)) {
-packageRoot.getNode(packageName).remove();
-}
-
-JcrPackage jcrPackage = packageManager.create(packageRoot, 
packageName);
-Property data = jcrPackage.getData();
-data.setValue(in);
-JcrPackageDefinition def = jcrPackage.getDefinition();
-def.unwrap(pack, true, false);
-
-log.debug("package uploaded to {}", 
jcrPackage.getNode().getPath());
-
-return jcrPackage;
-} else {
-return packageManager.upload(in, true);
+String packageName = packageId.getDownloadName();
+if (packageRoot.hasNode(packageName)) {
+packageRoot.getNode(packageName).remove();
 }
+
+JcrPackage jcrPackage = packageManager.create(packageRoot, 
packageName);
+Property data = jcrPackage.getData();
+data.setValue(in);
+JcrPackageDefinition def = jcrPackage.getDefinition();
+def.unwrap(pack, true, false);
+
+log.debug("package uploaded to {}", 
jcrPackage.getNode().getPath());
+
+return jcrPackage;
 } finally {
 IOUtils.closeQuietly(in);
 }
@@ -223,12 +219,8 @@ public class JcrVaultDistributionPackage
 Node packageRoot = getPackageRoot(session);
 PackageId packageId = new PackageId(PACKAGE_GROUP, packageName, 
VERSION);
 
-if (packageRoot != null) {
-Node packageNode = 
packageRoot.getNode(packageId.getDownloadName());
-return packageManager.open(packageNode);
-} else {
-return packageManager.open(packageId);
-}
+Node packageNode = packageRoot.getNode(packageId.getDownloadName());
+return packageManager.open(packageNode);
 }
 
 private PackageId getPackageId(VaultPackage vaultPackage) {
@@ -242,10 +234,11 @@ public class JcrVaultDistributionPackage
 }
 
 private Node getPackageRoot(Session session) throws RepositoryException {
-Node packageRoot = null;
-if (tempPackagesNode != null) {
-packageRoot = JcrUtils.getOrCreateByPath(tempPackagesNode, 
"sling:Folder", "sling:Folder", session, true);
+Node tempRoot = 
JcrUtils.getNodeIfExists(AbstractDistributionPackage.PACKAGES_ROOT, session);
+if (tempPackagesNode != null && tempRoot != null) {
+return JcrUtils.getOrCreateByPath(tempRoot, tempPackagesNode, 
false, "sling:Folder", "sling:Folder", true);
 }
-return packageRoot;
+
+throw new RepositoryException("Cannot read "+ 
AbstractDistributionPackage.PACKAGES_ROOT);
 }
 }

svn commit: r1724235 - in /sling/trunk/contrib/extensions/distribution: core/ core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/impl/ core/s

[mpetria]

Author: mpetria
Date: Tue Jan 12 13:50:03 2016
New Revision: 1724235

URL: http://svn.apache.org/viewvc?rev=1724235&view=rev
Log:
SLING-5426: expose size for distribution packages

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/CompositeDistributionResponse.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageWrapper.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
sling/trunk/contrib/extensions/distribution/extensions/pom.xml

sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/FileDistributionPackage.java

sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilderTest.java

sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/kryo/KryoResourceDistributionPackageBuilderTest.java
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1724235&r1=1724234&r2=1724235&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Tue Jan 12 
13:50:03 2016
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.13-r1723031
+0.1.13-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core
@@ -202,7 +202,7 @@
 
 org.apache.jackrabbit.vault
 org.apache.jackrabbit.vault
-3.0.0
+3.1.24
 
 
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1724235&r1=1724234&r2=1724235&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Tue Jan 12 13:50:03 2016
@@ -33,6 +33,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
@@ -204,11 +205,13 @@ public class SimpleDistributionAgent imp
 CompositeDistributionResponse distributionResponse = 
exportPackages(agentResourceResolver, distributionRequest, callingUser, 
requestId);
 
 
-log.debug("STARTED {} {} paths={}, success={}, state={}, 
exportTime={}ms, noPackages={}, noQueues={}", new Object[]{
+log.debug("STARTED {} {} paths={}, success={}, state={}, 
exportTime={}ms, noPackages={}, size={}B, noQueues={}", new Object[]{
 requestId,
 distributionRequest.getRequestType(), 
distributionRequest.getPaths(),
 distributionResponse.isSuccessful(), 
distributionResponse.getState(),
-distributionResponse.getExpo

svn commit: r1721501 - in /sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author: i-publish-reverse/ i-publish/ impersonate-publish

[mpetria]

Author: mpetria
Date: Wed Dec 23 07:14:21 2015
New Revision: 1721501

URL: http://svn.apache.org/viewvc?rev=1721501&view=rev
Log:
SLING-5400: shortten long paths to work on windows

Added:

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish/

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-i-publish-reverse.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-i-publish-reverse-scheduled.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json
Removed:

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish/

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish-reverse/

Added: 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-i-publish-reverse.json
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-i-publish-reverse.json?rev=1721501&view=auto
==
--- 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-i-publish-reverse.json
 (added)
+++ 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-i-publish-reverse.json
 Wed Dec 23 07:14:21 2015
@@ -0,0 +1,11 @@
+{
+"jcr:primaryType": "sling:OsgiConfig",
+
+"name": "impersonate-publish-reverse",
+
+"packageExporter.endpoints": [
+
"http://localhost:4503/libs/sling/distribution/services/exporters/impersonate-reverse";
+],
+
+"triggers.target": "(name=impersonate-publish-reverse-scheduled)"
+}
\ No newline at end of file

Added: 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-i-publish-reverse-scheduled.json
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-i-publish-reverse-scheduled.json?rev=1721501&view=auto
==
--- 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-i-publish-reverse-scheduled.json
 (added)
+++ 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-i-publish-reverse-scheduled.json
 Wed Dec 23 07:14:21 2015
@@ -0,0 +1,9 @@
+{
+"jcr:primaryType": "sling:OsgiConfig",
+
+"name": "impersonate-publish-reverse-scheduled",
+"action": "pull",
+"seconds": "30",
+
+"serviceName" : "distributionService"
+}
\ No newline at end of file

Added: 
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/i-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/

svn commit: r1721363 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/packaging/impl/exporter/ main/java/org/apache/sling/distribution/packaging/impl

[mpetria]

Author: mpetria
Date: Tue Dec 22 11:30:22 2015
New Revision: 1721363

URL: http://svn.apache.org/viewvc?rev=1721363&view=rev
Log:
SLING-5396: use single transport context per exporter/importer

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransportContext.java
Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionContext.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java?rev=1721363&r1=1721362&r2=1721363&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
 Tue Dec 22 11:30:22 2015
@@ -33,7 +33,7 @@ import org.apache.sling.distribution.ser
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
 import 
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.apache.sling.distribution.transport.core.DistributionContext;
+import 
org.apache.sling.distribution.transport.core.DistributionTransportContext;
 import org.apache.sling.distribution.transport.core.DistributionTransport;
 import org.apache.sling.distribution.transport.impl.DistributionEndpoint;
 import org.apache.sling.distribution.transport.core.DistributionPackageProxy;
@@ -49,6 +49,8 @@ public class RemoteDistributionPackageEx
 private final DistributionTransportSecretProvider secretProvider;
 private final DefaultDistributionLog log;
 private final int maxPullItems;
+private final DistributionTransportContext distributionContext = new 
DistributionTransportContext();
+
 
 private List transportHandlers = new 
ArrayList();
 
@@ -83,7 +85,6 @@ public class RemoteDistributionPackageEx
 for (DistributionTransport distributionTransport : transportHandlers) {
 int noPackages = 0;
 
-DistributionContext distributionContext = new 
DistributionContext();
 DistributionPackageProxy retrievedPackage;
 while (noPackages < maxNumberOfPackages && ((retrievedPackage = 
distributionTransport.retrievePackage(resourceResolver, distributionRequest, 
distributionContext)) != null)) {
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java?rev=1721363&r1=1721362&r2=1721363&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
 Tue Dec 22 11:30:22 2015
@@ -31,7 +31,7 @@ import org.apache.sling.distribution.ser
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
 import org.apache.sling.distribution.serialization.DistributionPackageInfo;
 import 
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.apache.sling.distribution.transport.core.DistributionContext;
+import 
org.apache.sling.distribution.transport.cor

svn commit: r1721358 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/queue/impl/ test/java/org/apache/sling/distribution/queue/impl/

[mpetria]

Author: mpetria
Date: Tue Dec 22 11:25:53 2015
New Revision: 1721358

URL: http://svn.apache.org/viewvc?rev=1721358&view=rev
Log:
SLING-5397: adding missing files

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java
Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SelectiveQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SelectiveQueueDispatchingStrategyTest.java

Added: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java?rev=1721358&view=auto
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java
 (added)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java
 Tue Dec 22 11:25:53 2015
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+package org.apache.sling.distribution.queue.impl;
+
+import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.serialization.DistributionPackage;
+import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
+import org.apache.sling.distribution.queue.DistributionQueueProvider;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+
+public class PriorityQueueDispatchingStrategy implements 
DistributionQueueDispatchingStrategy {
+
+private final Map selectors;
+private final List mainQueues;
+private final Map selectorQueues;
+private final List allQueues = new ArrayList();
+
+public PriorityQueueDispatchingStrategy(Map selectors, 
String[] queueNames) {
+
+this.selectors = selectors;
+this.mainQueues = Arrays.asList(queueNames);
+this.selectorQueues = getMatchingQueues(null);
+this.allQueues.addAll(mainQueues);
+this.allQueues.addAll(selectorQueues.keySet());
+}
+
+@Override
+public Iterable add(@Nonnull 
DistributionPackage distributionPackage, @Nonnull DistributionQueueProvider 
queueProvider) throws DistributionException {
+String[] paths = distributionPackage.getInfo().getPaths();
+Map matchingQueues = paths != null ?  
getMatchingQueues(paths) : new HashMap();
+
+DistributionQueueDispatchingStrategy dispatchingStrategy = null;
+if (matchingQueues.size() > 0) {
+dispatchingStrategy = new 
MultipleQueueDispatchingStrategy(matchingQueues.keySet().toArray(new 
String[0]));
+} else {
+dispatchingStrategy = new 
MultipleQueueDispatchingStrategy(mainQueues.toArray(new String[0]));
+}
+
+return dispatchingStrategy.add(distributionPackage, queueProvider);
+}
+
+@Nonnull
+@Override
+public List getQueueNames() {
+return allQueues;
+}
+
+
+public Map getMatchingQueues(String[] paths) {
+
+Map result = new TreeMap();
+
+if (paths == null) {
+paths = new String[] { null };
+}
+
+for (String queueSelector : selectors.keySet()) {
+String pathMatcher = selectors.get(queueSelector);
+int idx =  queueSelector.indexOf('|');
+
+String queuePrefix = queueSelector;
+String queueMatcher = null;
+if (idx >=0) {
+queuePrefix = queueSelector.subs

svn commit: r1721343 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/ins

[mpetria]

Author: mpetria
Date: Tue Dec 22 11:02:26 2015
New Revision: 1721343

URL: http://svn.apache.org/viewvc?rev=1721343&view=rev
Log:
SLING-5397: change selectiveQueues to priorityQueues

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1721343&r1=1721342&r2=1721343&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 Tue Dec 22 11:02:26 2015
@@ -49,8 +49,7 @@ import org.apache.sling.distribution.que
 import 
org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
 import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
 import 
org.apache.sling.distribution.queue.impl.MultipleQueueDispatchingStrategy;
-import 
org.apache.sling.distribution.queue.impl.SelectiveQueueDispatchingStrategy;
-import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
+import 
org.apache.sling.distribution.queue.impl.PriorityQueueDispatchingStrategy;
 import 
org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
 import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
 import 
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
@@ -124,9 +123,9 @@ public class ForwardDistributionAgentFac
 "These queues will gather all the packages until they are removed 
explicitly.")
 public static final String PASSIVE_QUEUES = "passiveQueues";
 
-@Property(cardinality = 100, label = "Selective queues", description = 
"List of selective queues that should used for specific paths." +
-"The selector format is  
{queuePrefix}|{mainQueueMatcher}={pathMatcher}, e.g. 
french|publish.*=/content/fr.*")
-public static final String SELECTIVE_QUEUES = "selectiveQueues";
+@Property(cardinality = 100, label = "Priority queues", description = 
"List of priority queues that should used for specific paths." +
+"The selector format is  
{queuePrefix}[|{mainQueueMatcher}]={pathMatcher}, e.g. french=/content/fr.*")
+public static final String PRIORITY_QUEUES = "priorityQueues";
 
 @Property(options = {
 @PropertyOption(name = "none", value = "none"), 
@PropertyOption(name = "errorQueue", value = "errorQueue")},
@@ -209,8 +208,8 @@ public class ForwardDistributionAgentFac
 String[] passiveQueues = 
PropertiesUtil.toStringArray(config.get(PASSIVE_QUEUES), new String[0]);
 passiveQueues = SettingsUtils.removeEmptyEntries(passiveQueues, new 
String[0]);
 
-Map selectiveQueues = 
PropertiesUtil.toMap(config.get(SELECTIVE_QUEUES), new String[0]);
-selectiveQueues = SettingsUtils.removeEmptyEntries(selectiveQueues);
+Map priorityQueues = 
PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
+priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
 
 
 DistributionPackageExporter packageExporter = new 
LocalDistributionPackageExporter(packageBuilder);
@@ -228,8 +227,8 @@ public class ForwardDistributionAgentFac
 queuesMap.addAll(Arrays.asList(passiveQueues));
 String[] queueNames = queuesMap.toArray(new String[queuesMap.size()]);
 
-if (selectiveQueues != null) {
-Sele

svn commit: r1721316 [2/2] - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/packaging/ c

[mpetria]

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java?rev=1721316&r1=1721315&r2=1721316&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
 Tue Dec 22 08:40:03 2015
@@ -22,6 +22,7 @@ import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.felix.scr.annotations.sling.SlingServlet;
@@ -32,6 +33,7 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.distribution.DistributionRequest;
 import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.resources.DistributionResourceTypes;
@@ -75,7 +77,7 @@ public class DistributionPackageExporter
 }
 }
 
-protected void exportOnePackage(SlingHttpServletRequest request, 
SlingHttpServletResponse response, boolean delete)
+protected void exportOnePackage(final SlingHttpServletRequest request, 
final SlingHttpServletResponse response, final boolean delete)
 throws ServletException, IOException {
 
 DistributionPackageExporter distributionPackageExporter = request
@@ -89,48 +91,44 @@ public class DistributionPackageExporter
 DistributionRequest distributionRequest = 
RequestUtils.fromServletRequest(request);
 ResourceResolver resourceResolver = request.getResourceResolver();
 
-int consumed = 0;
-int fetched = 0;
+final AtomicInteger fetched = new AtomicInteger(0);
 try {
 // get all items
-List distributionPackages = 
distributionPackageExporter.exportPackages(resourceResolver, 
distributionRequest);
-fetched = distributionPackages.size();
-
-if (distributionPackages.size() > 0) {
-log.info("{} package(s) available for fetching", 
distributionPackages.size());
+distributionPackageExporter.exportPackages(resourceResolver, 
distributionRequest, new DistributionPackageProcessor() {
+@Override
+public void process(DistributionPackage distributionPackage) {
+fetched.incrementAndGet();
+
+InputStream inputStream = null;
+int bytesCopied = -1;
+try {
+
response.addHeader(HttpTransportUtils.HEADER_DISTRIBUTION_ORIGINAL_ID, 
distributionPackage.getId());
+
+inputStream = distributionPackage.createInputStream();
+
+bytesCopied = IOUtils.copy(inputStream, 
response.getOutputStream());
+} catch (IOException e) {
+log.error("cannot process package", e);
+} finally {
+IOUtils.closeQuietly(inputStream);
+}
 
-for (DistributionPackage distributionPackage : 
distributionPackages) {
-if (distributionPackage != null) {
-consumed++;
-InputStream inputStream = null;
-int bytesCopied = -1;
-try {
-
response.addHeader(HttpTransportUtils.HEADER_DISTRIBUTION_ORIGINAL_ID, 
distributionPackage.getId());
-
-inputStream = 
distributionPackage.createInputStream();
-
-bytesCopied = IOUtils.copy(inputStream, 
response.getOutputStream());
-} finally {
-IOUtils.closeQuietly(inputStream);
-}
-
-String packageId = distributionPackage.getId();
-if (delete) {
-// delete the package permanently
-distributionPackage.delete();
-}
-
-
-// everything ok
-response.setStatus(200);
-log.info("exported package {} was sent (and 
deleted={}), bytes written {}", new Obje

svn commit: r1721316 [1/2] - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/packaging/ c

[mpetria]

Author: mpetria
Date: Tue Dec 22 08:40:03 2015
New Revision: 1721316

URL: http://svn.apache.org/viewvc?rev=1721316&view=rev
Log:
SLING-5396: delete remote package after it is enqueued

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionContext.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionPackageProxy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java
Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/SharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/TransportEndpointStrategyType.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java

sling/trunk/con

svn commit: r1720134 - /sling/tags/org.apache.sling.distribution.core-0.1.12/

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:57:52 2015
New Revision: 1720134

URL: http://svn.apache.org/viewvc?rev=1720134&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.distribution.core-0.1.12

Added:
sling/tags/org.apache.sling.distribution.core-0.1.12/
  - copied from r1720133, sling/trunk/contrib/extensions/distribution/core/

svn commit: r1720133 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:57:38 2015
New Revision: 1720133

URL: http://svn.apache.org/viewvc?rev=1720133&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.distribution.core-0.1.12

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1720133&r1=1720132&r2=1720133&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Tue Dec 15 
11:57:38 2015
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.11-SNAPSHOT
+0.1.12
 bundle
 
 Apache Sling Distribution Core
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.12
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.12
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.core-0.1.12
 
 
 

svn commit: r1720135 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:57:56 2015
New Revision: 1720135

URL: http://svn.apache.org/viewvc?rev=1720135&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1720135&r1=1720134&r2=1720135&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Tue Dec 15 
11:57:56 2015
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.12
+0.1.13-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.12
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.core-0.1.12
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.core-0.1.12
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/core
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core
 
 
 

svn commit: r1720132 - in /sling/trunk/contrib/extensions/distribution: core/pom.xml it/pom.xml

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:56:12 2015
New Revision: 1720132

URL: http://svn.apache.org/viewvc?rev=1720132&view=rev
Log:
use released dependencies for distribution api

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1720132&r1=1720131&r2=1720132&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Tue Dec 15 
11:56:12 2015
@@ -115,7 +115,7 @@
 
 org.apache.sling
 org.apache.sling.distribution.api
-0.2.1-SNAPSHOT
+0.3.0
 
 
 org.apache.sling

Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1720132&r1=1720131&r2=1720132&view=diff
==
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Tue Dec 15 11:56:12 
2015
@@ -428,7 +428,7 @@
 
 org.apache.sling
 org.apache.sling.distribution.api
-0.2.1-SNAPSHOT
+0.3.0
 
 
 org.apache.sling

svn commit: r1720125 - /sling/tags/org.apache.sling.distribution.api-0.3.0/

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:46:26 2015
New Revision: 1720125

URL: http://svn.apache.org/viewvc?rev=1720125&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.distribution.api-0.3.0

Added:
sling/tags/org.apache.sling.distribution.api-0.3.0/
  - copied from r1720124, sling/trunk/contrib/extensions/distribution/api/

svn commit: r1720124 - /sling/trunk/contrib/extensions/distribution/api/pom.xml

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:46:11 2015
New Revision: 1720124

URL: http://svn.apache.org/viewvc?rev=1720124&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.distribution.api-0.3.0

Modified:
sling/trunk/contrib/extensions/distribution/api/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/pom.xml?rev=1720124&r1=1720123&r2=1720124&view=diff
==
--- sling/trunk/contrib/extensions/distribution/api/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/api/pom.xml Tue Dec 15 11:46:11 
2015
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.distribution.api
-0.2.1-SNAPSHOT
+0.3.0
 bundle
 
 Apache Sling Distribution API
@@ -42,10 +42,10 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/api
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/api
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.api-0.3.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.api-0.3.0
 
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.api-0.3.0
 
 
 

svn commit: r1720126 - /sling/trunk/contrib/extensions/distribution/api/pom.xml

[mpetria]

Author: mpetria
Date: Tue Dec 15 11:46:30 2015
New Revision: 1720126

URL: http://svn.apache.org/viewvc?rev=1720126&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/contrib/extensions/distribution/api/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/pom.xml?rev=1720126&r1=1720125&r2=1720126&view=diff
==
--- sling/trunk/contrib/extensions/distribution/api/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/api/pom.xml Tue Dec 15 11:46:30 
2015
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.distribution.api
-0.3.0
+0.3.1-SNAPSHOT
 bundle
 
 Apache Sling Distribution API
@@ -42,10 +42,10 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.api-0.3.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.api-0.3.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/api
 
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.api-0.3.0
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api
 
 
 

svn commit: r1719086 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/agent/impl/ main/java/org/apache/sling/distribution/common/ main/java/org/apach

[mpetria]

Author: mpetria
Date: Thu Dec 10 14:23:47 2015
New Revision: 1719086

URL: http://svn.apache.org/viewvc?rev=1719086&view=rev
Log:
SLING-5346: return passive state for queues that do not process items

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/common/RecoverableDistributionException.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueState.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1719086&r1=1719085&r2=1719086&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Thu Dec 10 14:23:47 2015
@@ -42,6 +42,7 @@ import org.apache.sling.distribution.Dis
 import org.apache.sling.distribution.DistributionResponse;
 import org.apache.sling.distribution.agent.DistributionAgent;
 import org.apache.sling.distribution.agent.DistributionAgentState;
+import org.apache.sling.distribution.common.RecoverableDistributionException;
 import org.apache.sling.distribution.component.impl.DistributionComponentKind;
 import org.apache.sling.distribution.component.impl.SettingsUtils;
 import org.apache.sling.distribution.event.DistributionEventTopics;
@@ -51,6 +52,8 @@ import org.apache.sling.distribution.com
 import org.apache.sling.distribution.impl.SimpleDistributionResponse;
 import org.apache.sling.distribution.log.DistributionLog;
 import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
+import org.apache.sling.distribution.queue.DistributionQueueStatus;
+import org.apache.sling.distribution.queue.impl.DistributionQueueWrapper;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
@@ -213,7 +216,7 @@ public class SimpleDistributionAgent imp
 }
 
 private List exportPackages(ResourceResolver 
agentResourceResolver, DistributionRequest distributionRequest) throws 
DistributionException {
-log.info("exporting packages with user {}", agentResourceResolver != 
null ?  agentResourceResolver.getUserID() : "dummy");
+log.debug("exporting packages with user {}", agentResourceResolver != 
null ? agentResourceResolver.getUserID() : "dummy");
 
 List distributionPackages = 
distributionPackageExporter.exportPackages(agentResourceResolver, 
distributionRequest);
 
@@ -270,8 +273,7 @@ public class SimpleDistributionAgent imp
 return queueNames;
 }
 
-public DistributionQueue getQueue(@Nonnull String queueName) {
-queueName = queueName.length() > 0 ? queueName : 
DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME;
+public DistributionQueue getQueue(@Nonnull final String queueName) {
 Set queues = getQueueNames();
 if (!queues.contains(queueName)) {
 return null;
@@ -285,6 +287,22 @@ public class SimpleDistributionAgent imp
 log.error("cannot get queue", e);
 }
 
+if (queue != null) {
+queue = new DistributionQueueWrapper(queue) {
+@Nonnull
+@Override
+public DistributionQueueStatus getStatus() {
+DistributionQueueStatus status = super.getStatus();
+if (!queueProcessingEnabled && (processingQueues!= null && 
processingQueues.contains(queueName))

svn commit: r1719030 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Thu Dec 10 08:46:44 2015
New Revision: 1719030

URL: http://svn.apache.org/viewvc?rev=1719030&view=rev
Log:
SLING-5368: make distribution.core work with Sling Event 4.0.0

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1719030&r1=1719029&r2=1719030&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Thu Dec 10 
08:46:44 2015
@@ -70,6 +70,9 @@
 
 org.apache.sling.distribution.util
 
+
+
org.apache.sling.event.jobs;version="[1.5.0,3.0)",org.apache.sling.event.jobs.consumer;version="[1.1,2)",*
+
 httpasyncclient
 
 
@@ -132,7 +135,7 @@
 
 org.apache.sling
 org.apache.sling.event
-3.3.0
+4.0.0
 provided
 
 

svn commit: r1718890 - in /sling/trunk/contrib/extensions/distribution: api/src/main/java/org/apache/sling/distribution/ core/ core/src/main/java/org/apache/sling/distribution/serialization/ core/src/

[mpetria]

Author: mpetria
Date: Wed Dec  9 15:47:02 2015
New Revision: 1718890

URL: http://svn.apache.org/viewvc?rev=1718890&view=rev
Log:
SLING-5367: allow distribution request filters

Modified:

sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/DistributionRequest.java

sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: 
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/DistributionRequest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/DistributionRequest.java?rev=1718890&r1=1718889&r2=1718890&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/DistributionRequest.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/DistributionRequest.java
 Wed Dec  9 15:47:02 2015
@@ -23,6 +23,7 @@ import aQute.bnd.annotation.ProviderType
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.util.Arrays;
+import java.util.Set;
 
 /**
  * A {@link org.apache.sling.distribution.DistributionRequest} represents the 
need from the caller to have
@@ -33,7 +34,7 @@ public interface DistributionRequest {
 
 
 /**
- * get the {@link DistributionRequestType} associated with this request
+ * Get the {@link DistributionRequestType} associated with this request
  *
  * @return the type of the request as a {@link DistributionRequestType}
  */
@@ -41,14 +42,13 @@ public interface DistributionRequest {
 public DistributionRequestType getRequestType();
 
 /**
- * get the paths for this distribution request
+ * Get the root paths for this distribution request
  *
  * @return an array of paths
  */
-@CheckForNull
+@Nonnull
 public String[] getPaths();
 
-
 /**
  * Returns whether the paths are covering the entire subtree (deep) or 
just the specified nodes (shallow)
  *
@@ -58,4 +58,16 @@ public interface DistributionRequest {
 public boolean isDeep(@Nonnull String path);
 
 
+
+/**
+ * Get the filters applicable for a specific path
+ * +/foo/.* - include all content under /foo
+ * -/foo - exclude /foo node
+ *
+ * filters are checked in order and the last matched filter determines 
inclusion/exclusion
+ *
+ * @return an array of filters
+ */
+@Nonnull
+public String[] getFilters(String path);
 }

Modified: 
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java?rev=1718890&r1=1718889&r2=1718890&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
 Wed Dec  9 15:47:02 2015
@@ -22,7 +22,9 @@ import aQute.bnd.annotation.ProviderType
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -34,6 +36,7 @@ public final class SimpleDistributionReq
 
 private final DistributionRequestType requestType;
 private final Set deepPaths;
+private final Map pathFilters;
 private final String[] paths;
 
 /**
@@ -57,15 +60,28 @@ public final class SimpleDistributionReq
 
 
 /**
- * Creates a distribution request with "shallow" paths.
+ * Creates a distribution request with additional "deep" paths.
  * @param requestType th

svn commit: r1716885 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl: ErrorQueueDispatchingStrategy.java MultipleQueueDispatchingStrategy.

[mpetria]

Author: mpetria
Date: Fri Nov 27 15:21:03 2015
New Revision: 1716885

URL: http://svn.apache.org/viewvc?rev=1716885&view=rev
Log:
SLING-5336: log an error if a distribution item cannot be added to queue

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java?rev=1716885&r1=1716884&r2=1716885&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
 Fri Nov 27 15:21:03 2015
@@ -35,6 +35,8 @@ import org.apache.sling.distribution.que
 import org.apache.sling.distribution.queue.DistributionQueueItemState;
 import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
 import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -42,6 +44,8 @@ import org.apache.sling.distribution.que
  * where the queueName is the name of the original queue the package was in.
  */
 public class ErrorQueueDispatchingStrategy implements 
DistributionQueueDispatchingStrategy {
+private final Logger log = LoggerFactory.getLogger(getClass());
+
 
 private final static String ERROR_PREFIX = "error-";
 private final Set queueNames = new TreeSet();
@@ -67,13 +71,14 @@ public class ErrorQueueDispatchingStrate
 DistributionQueueItemStatus status = new 
DistributionQueueItemStatus(DistributionQueueItemState.ERROR, errorQueueName);
 
 DistributionQueueItem queueItem = 
DistributionPackageUtils.toQueueItem(distributionPackage);
+DistributionPackageUtils.acquire(distributionPackage, errorQueueName);
 DistributionQueueEntry queueEntry = errorQueue.add(queueItem);
 
 if (queueEntry != null) {
-DistributionPackageUtils.acquire(distributionPackage, 
errorQueueName);
-
-DistributionQueueEntry entry = 
errorQueue.getItem(queueItem.getId());
-status = entry.getStatus();
+status = queueEntry.getStatus();
+} else {
+DistributionPackageUtils.releaseOrDelete(distributionPackage, 
errorQueueName);
+log.error("cannot add package {} to queue {}", 
distributionPackage.getId(), errorQueueName);
 }
 
 result.add(status);

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java?rev=1716885&r1=1716884&r2=1716885&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
 Fri Nov 27 15:21:03 2015
@@ -76,6 +76,7 @@ public class MultipleQueueDispatchingStr
 status = queueEntry.getStatus();
 } else {
 
DistributionPackageUtils.releaseOrDelete(distributionPackage, queueName);
+log.error("cannot add package {} to queue {}", 
distributionPackage.getId(), queueName);
 }
 
 result.add(status);

svn commit: r1716880 - /sling/trunk/contrib/extensions/distribution/core/pom.xml

[mpetria]

Author: mpetria
Date: Fri Nov 27 14:38:24 2015
New Revision: 1716880

URL: http://svn.apache.org/viewvc?rev=1716880&view=rev
Log:
SLING-5336: always return the created distribution queue entry

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1716880&r1=1716879&r2=1716880&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Fri Nov 27 
14:38:24 2015
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.11-r1716851
+0.1.11-SNAPSHOT
 bundle
 
 Apache Sling Distribution Core

svn commit: r1716879 - in /sling/trunk/contrib/extensions/distribution/core: ./ src/main/java/org/apache/sling/distribution/agent/impl/ src/main/java/org/apache/sling/distribution/queue/ src/main/java

[mpetria]

Author: mpetria
Date: Fri Nov 27 14:36:28 2015
New Revision: 1716879

URL: http://svn.apache.org/viewvc?rev=1716879&view=rev
Log:
SLING-5336: always return the created distribution queue entry

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1716879&r1=1716878&r2=1716879&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Fri Nov 27 
14:36:28 2015
@@ -32,7 +32,7 @@
 
 
 org.apache.sling.distribution.core
-0.1.11-SNAPSHOT
+0.1.11-r1716851
 bundle
 
 Apache Sling Distribution Core

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1716879&r1=1716878&r2=1716879&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Fri Nov 27 14:36:28 2015
@@ -579,7 +579,7 @@ public class SimpleDistributionAgent imp
 try {
 agent.execute(resourceResolver, request);
 } catch (Throwable t) {
-log.error("Error executing handler", t);
+log.error("Error executing handler {}", request, t);
 }
 } else {
 ResourceResolver agentResourceResolver = null;
@@ -589,7 +589,7 @@ public class SimpleDistributionAgent imp
 
 agent.execute(agentResourceResolver, request);
 } catch (Throwable e) {
-log.error("Error executing handler", e);
+log.error("Error executing handler {}", request, e);
 } finally {
 ungetAgentResourceResolver(agentResourceResolver);
 }

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java?rev=1716879&r1=1716878&r2=1716879&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java
 Fri Nov 27 14:36:28 2015
@@ -50,10 +50,9 @@ public interface DistributionQueue {
  *
  * @param item a distribution item, typically representing a {@link 
DistributionPackage}
  * to distribute
- * @return {@code true} if the item was added correctly to th

svn commit: r1716851 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java

[mpetria]

Author: mpetria
Date: Fri Nov 27 11:51:41 2015
New Revision: 1716851

URL: http://svn.apache.org/viewvc?rev=1716851&view=rev
Log:
SLING-5336: improve logging for shared packages

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java?rev=1716851&r1=1716850&r2=1716851&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
 Fri Nov 27 11:51:41 2015
@@ -109,7 +109,10 @@ public class ResourceSharedDistributionP
 
 String packagePath = getPathFromName(packageName);
 
-return new ResourceSharedDistributionPackage(repolock, 
resourceResolver, packageName, packagePath, distributionPackage);
+DistributionPackage sharedDistributionPackage = new 
ResourceSharedDistributionPackage(repolock, resourceResolver, packageName, 
packagePath, distributionPackage);
+
+log.info("created shared package {} for {}", 
sharedDistributionPackage.getId(), distributionPackage.getId());
+return sharedDistributionPackage;
 }
 
 @CheckForNull

svn commit: r1716813 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: queue/impl/jobhandling/JobHandlingDistributionQueue.java serialization/impl/Res

[mpetria]

Author: mpetria
Date: Fri Nov 27 09:52:50 2015
New Revision: 1716813

URL: http://svn.apache.org/viewvc?rev=1716813&view=rev
Log:
SLING-5336: improve shared distribution packages concurrency

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java?rev=1716813&r1=1716812&r2=1716813&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
 Fri Nov 27 09:52:50 2015
@@ -72,7 +72,7 @@ public class JobHandlingDistributionQueu
 Map properties = 
JobHandlingUtils.createFullProperties(item);
 
 Job job = jobManager.createJob(topic).properties(properties).add();
-log.info("job {} added", job.getId());
+log.info("job {} added for item {}", job.getId(), item.getId());
 } catch (Exception e) {
 log.error("could not add an item to the queue", e);
 result = false;
@@ -99,7 +99,7 @@ public class JobHandlingDistributionQueu
 List jobs = getJobs(0, 1);
 if (jobs.size() > 0) {
 Job firstItem = jobs.get(0);
-log.info("first item in the queue is {}, retried {} times", 
firstItem.getId(), firstItem.getRetryCount());
+log.debug("first item in the queue is {}, retried {} times", 
firstItem.getId(), firstItem.getRetryCount());
 return firstItem;
 }
 return null;

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java?rev=1716813&r1=1716812&r2=1716813&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
 Fri Nov 27 09:52:50 2015
@@ -37,8 +37,12 @@ import org.apache.sling.distribution.com
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
 import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ResourceSharedDistributionPackageBuilder implements 
DistributionPackageBuilder {
+private final Logger log = LoggerFactory.getLogger(getClass());
+
 
 private static final String PN_ORIGINAL_ID = "original.package.id";
 private static final String PN_ORIGINAL_REQUEST_TYPE = 
"original.package.request.type";
@@ -78,7 +82,10 @@ public class ResourceSharedDistributionP
 }
 
 String packagePath = getPathFromName(packageName);
-return new ResourceSharedDistributionPackage(repolock, 
resourceResolver, packageName, packagePath, distributionPackage);
+DistributionPackage sharedDistributionPackage = new 
ResourceSharedDistributionPackage(repolock, resourceResolver, packageName, 
packagePath, distributionPackage);
+
+log.info("created shared package {} for {}", 
sharedDistributionPackage.getId(), distributionPackage.getId());
+return sharedDistributionPackage;
 
 }
 
@@ -130,9 +137,9 @@ public class ResourceSharedDistributionP
 return false;
 }
 
-ResourceSharedDistributionPackage shareddistributionPackage = 
(ResourceSharedDistributionPackage) distributionPackage;
+ResourceSharedDistributionPackage sharedistributionPackage = 
(ResourceSharedDistributionPackage) distributionPackage;
 
-DistributionPackage originalPackage = 
shareddistributionPackage.getPa

svn commit: r1715339 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/resources/impl/ core/src/main/java/org/apache/sling/distribution/servlet/ it/sr

[mpetria]

Author: mpetria
Date: Fri Nov 20 11:33:10 2015
New Revision: 1715339

URL: http://svn.apache.org/viewvc?rev=1715339&view=rev
Log:
SLING-5316: expose userid in distribution queues

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java

sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/MultipleQueueDistributionTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java?rev=1715339&r1=1715338&r2=1715339&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
 Fri Nov 20 11:33:10 2015
@@ -187,7 +187,7 @@ public class ExtendedDistributionService
 result.put("id", item.getId());
 result.put("paths", packageInfo.getPaths());
 result.put("action", packageInfo.getRequestType());
-result.put("type", packageInfo.getType());
+result.put("userid", 
packageInfo.get(DistributionPackageUtils.PACKAGE_INFO_PROPERTY_REQUEST_USER, 
String.class));
 
 DistributionQueueItemStatus status = entry.getStatus();
 result.put("attempts", status.getAttempts());

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java?rev=1715339&r1=1715338&r2=1715339&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
 Fri Nov 20 11:33:10 2015
@@ -28,6 +28,7 @@ import org.apache.sling.api.SlingHttpSer
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+import org.apache.sling.distribution.agent.DistributionAgent;
 import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.serialization.DistributionPackageInfo;
@@ -80,25 +81,23 @@ public class DistributionAgentQueueServl
 deleteItems(resourceResolver, queue, limit);
 }
 } else if ("copy".equals(operation)) {
-String sourceQueue = request.getParameter("queuePath");
+String from = request.getParameter("from");
 String[] idParam = request.getParameterValues("id");
 
-if (idParam != null) {
+if (idParam != null && from != null) {
+DistributionAgent agent = 
request.getResource().getParent().getParent().adaptTo(DistributionAgent.class);
+DistributionQueue sourceQueue = agent.getQueue(from);
+
 addItems(resourceResolver, queue, sourceQueue, idParam);
 }
 }
 }
 
-private void addItems(ResourceResolver resourceResolver, DistributionQueue 
targetQueue, String queuePath, String[] ids) {
-DistributionQueue sourceQueue = null;
-Resource resource = resourceResolver.getResource(queuePath);
+private void addItems(ResourceResolver resourceResolver, DistributionQueue 
targetQueue, DistributionQueue sourceQueue, String[] ids) {
 
-if (resource != null) {
-sourceQueue = resource.adaptTo(DistributionQueue.class);
-}
 
 if (sourceQueue == null) {
-log.warn("cannot find source queue {}", queuePath);
+log.warn("cannot find source queue {}"

svn commit: r1714995 - in /sling/trunk/contrib/extensions/distribution/core: ./ src/main/java/org/apache/sling/distribution/agent/impl/ src/main/java/org/apache/sling/distribution/packaging/impl/ src/

[mpetria]

Author: mpetria
Date: Wed Nov 18 14:04:13 2015
New Revision: 1714995

URL: http://svn.apache.org/viewvc?rev=1714995&view=rev
Log:
SLING-5179: fix some logging and exports

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1714995&r1=1714994&r2=1714995&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Wed Nov 18 
14:04:13 2015
@@ -68,7 +68,7 @@
 
 
org.apache.sling.distribution.core
 
-
org.apache.sling.distribution.util,org.apache.sling.distribution.serialization,org.apache.sling.distribution.common
+org.apache.sling.distribution.util
 
 httpasyncclient
 

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1714995&r1=1714994&r2=1714995&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Wed Nov 18 14:04:13 2015
@@ -43,6 +43,7 @@ import org.apache.sling.distribution.Dis
 import org.apache.sling.distribution.agent.DistributionAgent;
 import org.apache.sling.distribution.agent.DistributionAgentState;
 import org.apache.sling.distribution.component.impl.DistributionComponentKind;
+import org.apache.sling.distribution.component.impl.SettingsUtils;
 import org.apache.sling.distribution.event.DistributionEventTopics;
 import org.apache.sling.distribution.event.impl.DistributionEventFactory;
 import org.apache.sling.distribution.impl.CompositeDistributionResponse;
@@ -123,10 +124,8 @@ public class SimpleDistributionAgent imp
 this.slingRepository = slingRepository;
 this.log = log;
 this.allowedRequests = allowedRequests;
-this.allowedRoots = allowedRoots;
 this.processingQueues = processingQueues;
 this.retryAttempts = retryAttempts;
-this.impersonateUser = subServiceName == null;
 
 // check configuration is valid
 if (name == null
@@ -150,10 +149,12 @@ public class SimpleDistributionAgent imp
 throw new IllegalArgumentException("all arguments are required: " 
+ errorMessage);
 }
 
-this.subServiceName = subServiceName;
+this.allowedRoots = SettingsUtils.removeEmptyEntries(allowedRoots);
+this.subServiceName = SettingsUtils.removeEmptyEntry(subServiceName);
+this.impersonateUser = this.subServiceName == null;
 this.distributionRequestAuthorizationStrategy = 
distributionRequestAuthorizationStrategy;
 this.resourceResolverFactory = resourceResolverFactory;
-this.name = name;
+this.name = SettingsUtils.removeEmptyEntry(name);
 this.queueProcessingEnabled = queueProcessingEnabled;
 this.distributionPackageImporter = distributionPackageImporter;
 this.distributionPackageExporter = distributionPackageExporter;
@@ -212,7 +213,7 @@ public class SimpleDistributionAgent imp
 }
 
 private List exportPackages(ResourceResolver 
agentResourceResolver, DistributionRequest distributionRequest) throws 
DistributionException {
-log.info("exporting packages for user {}", agentResourceResolver != 
null ?  agentResourceResolver.getUserID() : "dummy");
+log.info("exporting packages with user {}", agentResourceResolver != 
n

svn commit: r1714754 [1/2] - in /sling/trunk/contrib/extensions/distribution: core/ core/src/main/java/org/apache/sling/distribution/agent/ core/src/main/java/org/apache/sling/distribution/agent/impl/

[mpetria]

Author: mpetria
Date: Tue Nov 17 11:18:27 2015
New Revision: 1714754

URL: http://svn.apache.org/viewvc?rev=1714754&view=rev
Log:
SLING-5179: fix extension bundle by linking it to core

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/common/

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/common/DistributionException.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/common/package-info.java
Removed:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/DistributionException.java
Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/DistributionRequestAuthorizationStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SelectiveQueueDispatchingStrategy.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java

sling/trunk/contrib/extens

svn commit: r1714754 [2/2] - in /sling/trunk/contrib/extensions/distribution: core/ core/src/main/java/org/apache/sling/distribution/agent/ core/src/main/java/org/apache/sling/distribution/agent/impl/

[mpetria]

Modified: 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilderFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilderFactory.java?rev=1714754&r1=1714753&r2=1714754&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilderFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroDistributionPackageBuilderFactory.java
 Tue Nov 17 11:18:27 2015
@@ -31,8 +31,9 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.DistributionException;
 import org.apache.sling.distribution.DistributionRequest;
+
+import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
 import org.slf4j.Logger;

Modified: 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoDistributionPackageBuilderFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoDistributionPackageBuilderFactory.java?rev=1714754&r1=1714753&r2=1714754&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoDistributionPackageBuilderFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoDistributionPackageBuilderFactory.java
 Tue Nov 17 11:18:27 2015
@@ -31,8 +31,8 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.DistributionException;
 import org.apache.sling.distribution.DistributionRequest;
+import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
 import org.slf4j.Logger;

Modified: 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoResourceDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoResourceDistributionPackageBuilder.java?rev=1714754&r1=1714753&r2=1714754&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoResourceDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoResourceDistributionPackageBuilder.java
 Tue Nov 17 11:18:27 2015
@@ -45,8 +45,8 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.SyntheticResource;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
-import org.apache.sling.distribution.DistributionException;
 import org.apache.sling.distribution.DistributionRequest;
+import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.serialization.DistributionPackage;
 import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
 import 
org.apache.sling.distribution.serialization.impl.FileDistributionPackage;

svn commit: r1714609 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/component/impl/ co

[mpetria]

Author: mpetria
Date: Mon Nov 16 15:50:28 2015
New Revision: 1714609

URL: http://svn.apache.org/viewvc?rev=1714609&view=rev
Log:
SLING-5300: enable defaults for distribution components

Added:

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-default.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-default.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json
Removed:

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-privilegeRead.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-impersonate-publish-reverse.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-publish-reverse.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impersonate-reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-impersonate-reverse.json

sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/im

svn commit: r1714574 - in /sling/trunk/contrib/extensions/distribution: core/ core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/servlet/ cor

[mpetria]

Author: mpetria
Date: Mon Nov 16 12:31:41 2015
New Revision: 1714574

URL: http://svn.apache.org/viewvc?rev=1714574&view=rev
Log:
SLING-5295: use slingRepository.loginFromService to impersonate calling user

Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DistributionUtils.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
sling/trunk/contrib/extensions/distribution/it/pom.xml

Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1714574&r1=1714573&r2=1714574&view=diff
==
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Mon Nov 16 
12:31:41 2015
@@ -112,7 +112,7 @@
 
 org.apache.sling
 org.apache.sling.distribution.api
-0.2.1-SNAPSHOT
+0.2.0
 
 
 org.apache.sling
@@ -127,7 +127,7 @@
 
 org.apache.sling
 org.apache.sling.jcr.api
-2.2.0
+2.3.0
 
 
 org.apache.sling
@@ -159,6 +159,12 @@
 1.0.0
 provided
 
+
+org.apache.sling
+org.apache.sling.jcr.resource
+2.3.12
+provided
+
 
 
 org.slf4j

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1714574&r1=1714573&r2=1714574&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 Mon Nov 16 12:31:41 2015
@@ -57,6 +57,7 @@ import org.apache.sling.distribution.tra
 import 
org.apache.sling.distribution.transport.impl.TransportEndpointStrategyType;
 import org.apache.sling.distribution.trigger.DistributionTrigger;
 import org.apache.sling.event.jobs.JobManager;
+import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.settings.SlingSettingsService;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
@@ -179,6 +180,9 @@ public class ForwardDistributionAgentFac
 @Reference
 private ResourceResolverFactory resourceResolverFactory;
 
+@Reference
+private SlingRepository slingRepository;
+
 
 @Activate
 protected void activate(BundleContext context, Map config) 
{
@@ -261,7 +265,8 @@ public class ForwardDistributionAgentFac
 
 return new SimpleDistributionAgent(agentName, queueProcessingEnabled, 
processingQueues,
 serviceName, packageImporter, packageExporter, 
requestAuthorizationStrategy,
-queueProvider, exportQueueStrategy, errorQueueStrategy, 
distributionEventFactory, resourceResolverFactory, distributionLog, 
allowedRequests, allowedRoots, retryAttepts);
+queueP

svn commit: r1713973 - /sling/site/trunk/content/project-information/project-team.mdtext

[mpetria]

Author: mpetria
Date: Thu Nov 12 08:17:05 2015
New Revision: 1713973

URL: http://svn.apache.org/viewvc?rev=1713973&view=rev
Log:
Adding mpetria to project team

Modified:
sling/site/trunk/content/project-information/project-team.mdtext

Modified: sling/site/trunk/content/project-information/project-team.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/project-information/project-team.mdtext?rev=1713973&r1=1713972&r2=1713973&view=diff
==
--- sling/site/trunk/content/project-information/project-team.mdtext (original)
+++ sling/site/trunk/content/project-information/project-team.mdtext Thu Nov 12 
08:17:05 2015
@@ -45,6 +45,7 @@ Committers marked with an asterisk (*) a
 | tommaso | Tommaso Teofili | Adobe | Java Developer |
 | tomekr | Tomek Rękawek | | Java Developer |
 | vramdal | Vidar Ramdal | | Java Developer |
+| mpetria | Marius Petria | Adobe | Java Developer |
 
 ## Emeritus Committers and PMC members
 

svn commit: r1713856 - /sling/tags/org.apache.sling.serviceusermapper-1.2.2/

[mpetria]

Author: mpetria
Date: Wed Nov 11 14:41:15 2015
New Revision: 1713856

URL: http://svn.apache.org/viewvc?rev=1713856&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.serviceusermapper-1.2.2

Added:
sling/tags/org.apache.sling.serviceusermapper-1.2.2/
  - copied from r1713855, sling/trunk/bundles/extensions/serviceusermapper/