You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2015/01/21 13:32:57 UTC
svn commit: r1653501 - in
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution:
agent/impl/ serialization/impl/vlt/ trigger/impl/
Author: mpetria
Date: Wed Jan 21 12:32:56 2015
New Revision: 1653501
URL: http://svn.apache.org/r1653501
Log:
SLING-4324: the persisted jcr triggers are not initialized correctly
Modified:
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/serialization/impl/vlt/JcrVaultDistributionPackage.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
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java?rev=1653501&r1=1653500&r2=1653501&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java Wed Jan 21 12:32:56 2015
@@ -92,7 +92,7 @@ public class ReverseDistributionAgentFac
/**
* no. of items to poll property
*/
- @Property(intValue = 1, label = "Pull Items", description = "Number of subsequent pull requests to make.")
+ @Property(intValue = 10, label = "Pull Items", description = "Number of subsequent pull requests to make.")
public static final String PULL_ITEMS = "pull.items";
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java?rev=1653501&r1=1653500&r2=1653501&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java Wed Jan 21 12:32:56 2015
@@ -44,9 +44,9 @@ public class JcrVaultDistributionPackage
try {
return jcrPackage.getPackage().getId().getName();
} catch (RepositoryException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ log.error("Cannot obtain package id", e);
} catch (IOException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ log.error("Cannot obtain package id", e);
}
return null;
@@ -62,9 +62,9 @@ public class JcrVaultDistributionPackage
try {
return jcrPackage.getData().getBinary().getStream();
} catch (RepositoryException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ log.error("Cannot create input stream", e);
+ throw new IOException();
}
- return null;
}
public void delete() {
@@ -73,7 +73,7 @@ public class JcrVaultDistributionPackage
node.remove();
session.save();
} catch (RepositoryException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ log.error("Cannot delete package", e);
}
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java?rev=1653501&r1=1653500&r2=1653501&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java Wed Jan 21 12:32:56 2015
@@ -77,6 +77,7 @@ public class JcrEventDistributionTrigger
String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null);
trigger = new JcrEventDistributionTrigger(repository, path, serviceName);
+ trigger.enable();
}
@Deactivate
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java?rev=1653501&r1=1653500&r2=1653501&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java Wed Jan 21 12:32:56 2015
@@ -86,6 +86,7 @@ public class PersistedJcrEventDistributi
String nuggetsPath = PropertiesUtil.toString(config.get(NUGGETS_PATH), null);
trigger = new PersistedJcrEventDistributionTrigger(repository, path, serviceName, nuggetsPath);
+ trigger.enable();
}
@Deactivate