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/03/25 12:55:00 UTC
svn commit: r1669098 - in /sling/trunk/contrib/extensions/distribution:
core/ core/src/main/java/org/apache/sling/distribution/agent/impl/ it/
sample/
Author: mpetria
Date: Wed Mar 25 11:55:00 2015
New Revision: 1669098
URL: http://svn.apache.org/r1669098
Log:
Adding pull items configuration to distribution sync agents + depending on snapshots until release
Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml
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/it/pom.xml
sling/trunk/contrib/extensions/distribution/sample/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=1669098&r1=1669097&r2=1669098&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Wed Mar 25 11:55:00 2015
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.api</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
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=1669098&r1=1669097&r2=1669098&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 Mar 25 11:55:00 2015
@@ -110,7 +110,7 @@ public class ReverseDistributionAgentFac
/**
* no. of items to poll property
*/
- @Property(intValue = 10, label = "Pull Items", description = "Number of subsequent pull requests to make.")
+ @Property(intValue = 100, label = "Pull Items", description = "Number of subsequent pull requests to make.")
public static final String PULL_ITEMS = "pull.items";
@@ -180,11 +180,11 @@ public class ReverseDistributionAgentFac
exporterEndpoints = SettingsUtils.removeEmptyEntries(exporterEndpoints);
- int pollItems = PropertiesUtil.toInteger(config.get(PULL_ITEMS), Integer.MAX_VALUE);
+ int pullItems = PropertiesUtil.toInteger(config.get(PULL_ITEMS), Integer.MAX_VALUE);
DistributionPackageExporter packageExporter = new RemoteDistributionPackageExporter(distributionLog, packageBuilder, transportSecretProvider, exporterEndpoints,
- TransportEndpointStrategyType.All, pollItems);
+ TransportEndpointStrategyType.All, pullItems);
DistributionPackageImporter packageImporter = new LocalDistributionPackageImporter(packageBuilder);
DistributionQueueProvider queueProvider = new JobHandlingDistributionQueueProvider(agentName, jobManager, context);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java?rev=1669098&r1=1669097&r2=1669098&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java Wed Mar 25 11:55:00 2015
@@ -120,6 +120,12 @@ public class SyncDistributionAgentFactor
"If the queue names are not specified by importer endpoints definition then they are autogenerated.")
public static final String USE_MULTIPLE_QUEUES = "useMultipleQueues";
+ /**
+ * no. of items to poll property
+ */
+ @Property(intValue = 100, label = "Pull Items", description = "Number of subsequent pull requests to make.")
+ public static final String PULL_ITEMS = "pull.items";
+
@Reference
private Packaging packaging;
@@ -193,6 +199,8 @@ public class SyncDistributionAgentFactor
Map<String, String> importerEndpointsMap = SettingsUtils.toUriMap(importerEndpointsValue);
boolean useMultipleQueues = PropertiesUtil.toBoolean(config.get(USE_MULTIPLE_QUEUES), false);
+ int pullItems = PropertiesUtil.toInteger(config.get(PULL_ITEMS), Integer.MAX_VALUE);
+
DistributionQueueDispatchingStrategy dispatchingStrategy;
DistributionPackageImporter packageImporter;
@@ -207,7 +215,7 @@ public class SyncDistributionAgentFactor
packageImporter = new RemoteDistributionPackageImporter(distributionLog, transportSecretProvider, importerEndpointsMap, TransportEndpointStrategyType.All);
}
- DistributionPackageExporter packageExporter = new RemoteDistributionPackageExporter(distributionLog, packageBuilder, transportSecretProvider, exporterEndpoints, TransportEndpointStrategyType.All, 1);
+ DistributionPackageExporter packageExporter = new RemoteDistributionPackageExporter(distributionLog, packageBuilder, transportSecretProvider, exporterEndpoints, TransportEndpointStrategyType.All, pullItems);
DistributionQueueProvider queueProvider = new JobHandlingDistributionQueueProvider(agentName, jobManager, context);
DistributionRequestType[] allowedRequests = new DistributionRequestType[] { DistributionRequestType.PULL };
Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1669098&r1=1669097&r2=1669098&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Wed Mar 25 11:55:00 2015
@@ -391,17 +391,17 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.api</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.core</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.sample</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: sling/trunk/contrib/extensions/distribution/sample/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/pom.xml?rev=1669098&r1=1669097&r2=1669098&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/sample/pom.xml Wed Mar 25 11:55:00 2015
@@ -83,14 +83,6 @@
<!-- D E P E N D E N C I E S -->
<!-- ======================================================================= -->
<dependencies>
-
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.distribution.core</artifactId>
- <version>0.1.0</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>