Author: tommaso
Date: Mon Jan 18 11:29:58 2016
New Revision: 1725236
URL: http://svn.apache.org/viewvc?rev=1725236&view=rev
Log:
SLING-3553 - committed findbugs fixes
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
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/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/component/impl/DefaultDistributionComponentProvider.java
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/DistributionComponentKind.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/impl/DefaultDistributor.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.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/DistributionPackageExporter.java
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/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/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/queue/DistributionQueueProcessor.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.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/PriorityQueueDispatchingStrategy.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/JobHandlingUtils.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/DistributionConfigurationResourceProvider.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/DistributionServiceResourceProvider.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/resources/impl/ExtendedDistributionServiceResourceProvider.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/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/serialization/impl/DefaultDistributionPackageBuilderProvider.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/DistributionPackageWrapper.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/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/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/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/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.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/servlet/ServletJsonUtils.java
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/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/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/AbstractJcrEventTrigger.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/JcrEventDistributionTrigger.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/PersistedJcrEventDistributionTrigger.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/RemoteEventDistributionTrigger.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/ScheduledDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.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/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.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/ScheduledDistributionQueueProcessorTaskTest.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/agent/impl/AbstractDistributionAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
Mon Jan 18 11:29:58 2016
@@ -29,7 +29,6 @@ import org.apache.sling.distribution.age
import
org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
-import org.apache.sling.distribution.log.DistributionLog;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.resources.impl.OsgiUtils;
import org.apache.sling.distribution.trigger.DistributionTrigger;
@@ -42,29 +41,29 @@ import org.slf4j.LoggerFactory;
/**
* An abstract OSGi service factory for registering {@link
org.apache.sling.distribution.agent.impl.SimpleDistributionAgent}s
*/
-public abstract class AbstractDistributionAgentFactory {
+abstract class AbstractDistributionAgentFactory {
private final Logger log = LoggerFactory.getLogger(getClass());
- public static final String NAME = DistributionComponentConstants.PN_NAME;
+ private static final String NAME = DistributionComponentConstants.PN_NAME;
private static final String ENABLED = "enabled";
- protected static final String DEFAULT_TRIGGER_TARGET = "(name=)";
+ static final String DEFAULT_TRIGGER_TARGET = "(name=)";
private static final String TRIGGERS_TARGET = "triggers.target";
- protected static final String LOG_LEVEL = "log.level";
+ static final String LOG_LEVEL = "log.level";
private ServiceRegistration componentReg;
private Map<String, Object> savedConfig;
private String agentName;
- private List<DistributionTrigger> triggers = new
CopyOnWriteArrayList<DistributionTrigger>();
+ private final List<DistributionTrigger> triggers = new
CopyOnWriteArrayList<DistributionTrigger>();
private boolean triggersEnabled = false;
private SimpleDistributionAgent agent;
- protected void activate(BundleContext context, Map<String, Object> config)
{
+ void activate(BundleContext context, Map<String, Object> config) {
log.info("activating with config {}",
OsgiUtils.osgiPropertyMapToString(config));
// inject configuration
@@ -131,7 +130,7 @@ public abstract class AbstractDistributi
}
}
- protected void bindDistributionTrigger(DistributionTrigger
distributionTrigger, Map<String, Object> config) {
+ void bindDistributionTrigger(DistributionTrigger distributionTrigger,
Map<String, Object> config) {
triggers.add(distributionTrigger);
if (agent != null && triggersEnabled) {
agent.enableTrigger(distributionTrigger);
@@ -139,7 +138,7 @@ public abstract class AbstractDistributi
}
- protected void unbindDistributionTrigger(DistributionTrigger
distributionTrigger, Map<String, Object> config) {
+ void unbindDistributionTrigger(DistributionTrigger distributionTrigger,
Map<String, Object> config) {
triggers.remove(distributionTrigger);
if (agent != null) {
@@ -148,7 +147,7 @@ public abstract class AbstractDistributi
}
- protected void deactivate(BundleContext context) {
+ void deactivate(BundleContext context) {
if (componentReg != null) {
ServiceReference reference = componentReg.getReference();
Object service = context.getService(reference);
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=1725236&r1=1725235&r2=1725236&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 Jan 18 11:29:58 2016
@@ -92,7 +92,7 @@ public class ForwardDistributionAgentFac
@Property(label = "Service Name", description = "The name of the service
used to access the repository.")
- public static final String SERVICE_NAME = "serviceName";
+ private static final String SERVICE_NAME = "serviceName";
@Property(options = {
@PropertyOption(name = "debug", value = "debug"),
@PropertyOption(name = "info", value = "info"), @PropertyOption(name = "warn",
value = "warn"),
@@ -108,7 +108,7 @@ public class ForwardDistributionAgentFac
@Property(boolValue = true, label = "Queue Processing Enabled",
description = "Whether or not the distribution agent should process packages in
the queues.")
- public static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
+ private static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
/**
@@ -116,26 +116,26 @@ public class ForwardDistributionAgentFac
*/
@Property(cardinality = 100, label = "Importer Endpoints", description =
"List of endpoints to which packages are sent (imported). " +
"The list can be given as a map in case a queue should be
configured for each endpoint, e.g. queueName=http://...";)
- public static final String IMPORTER_ENDPOINTS =
"packageImporter.endpoints";
+ private static final String IMPORTER_ENDPOINTS =
"packageImporter.endpoints";
@Property(cardinality = 100, label = "Passive queues", description = "List
of queues that should be disabled." +
"These queues will gather all the packages until they are removed
explicitly.")
- public static final String PASSIVE_QUEUES = "passiveQueues";
+ private static final String PASSIVE_QUEUES = "passiveQueues";
@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";
+ private static final String PRIORITY_QUEUES = "priorityQueues";
@Property(options = {
@PropertyOption(name = "none", value = "none"),
@PropertyOption(name = "errorQueue", value = "errorQueue")},
value = "none",
label = "Retry Strategy", description = "The strategy to apply
after a certain number of failed retries."
)
- public static final String RETRY_STRATEGY = "retry.strategy";
+ private static final String RETRY_STRATEGY = "retry.strategy";
@Property(intValue = 100, label = "Retry attempts", description = "The
number of times to retry until the retry strategy is applied.")
- public static final String RETRY_ATTEMPTS = "retry.attempts";
+ private static final String RETRY_ATTEMPTS = "retry.attempts";
@Property(name = "requestAuthorizationStrategy.target", label = "Request
Authorization Strategy", description = "The target reference for the
DistributionRequestAuthorizationStrategy used to authorize the access to
distribution process," +
@@ -147,6 +147,7 @@ public class ForwardDistributionAgentFac
@Property(name = "transportSecretProvider.target", label = "Transport
Secret Provider", description = "The target reference for the
DistributionTransportSecretProvider used to obtain the credentials used for
accessing the remote endpoints, " +
"e.g. use target=(name=...) to bind to services by name.", value =
SettingsUtils.COMPONENT_NAME_DEFAULT)
@Reference(name = "transportSecretProvider")
+ private
DistributionTransportSecretProvider transportSecretProvider;
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java
Mon Jan 18 11:29:58 2016
@@ -54,10 +54,10 @@ public class PrivilegeDistributionReques
* privilege request authorization strategy jcr privilege property
*/
@Property(label = "Jcr Privilege", description = "Jcr privilege to check
for authorizing distribution requests. The privilege is checked for the calling
user session.")
- public static final String JCR_PRIVILEGE = "jcrPrivilege";
+ private static final String JCR_PRIVILEGE = "jcrPrivilege";
- DistributionRequestAuthorizationStrategy authorizationStrategy;
+ private DistributionRequestAuthorizationStrategy authorizationStrategy;
@Activate
public void activate(BundleContext context, Map<String, Object> config) {
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
Mon Jan 18 11:29:58 2016
@@ -84,7 +84,7 @@ public class QueueDistributionAgentFacto
@Property(label = "Service Name", description = "The name of the service
used to access the repository.")
- public static final String SERVICE_NAME = "serviceName";
+ private static final String SERVICE_NAME = "serviceName";
@Property(options = {
@PropertyOption(name = "debug", value = "debug"),
@PropertyOption(name = "info", value = "info"), @PropertyOption(name = "warn",
value = "warn"),
@@ -116,7 +116,7 @@ public class QueueDistributionAgentFacto
@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";
+ private static final String PRIORITY_QUEUES = "priorityQueues";
@Reference
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=1725236&r1=1725235&r2=1725236&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
Mon Jan 18 11:29:58 2016
@@ -88,7 +88,7 @@ public class ReverseDistributionAgentFac
@Property(label = "Service Name", description = "The name of the service
used to access the repository.")
- public static final String SERVICE_NAME = "serviceName";
+ private static final String SERVICE_NAME = "serviceName";
@Property(options = {
@PropertyOption(name = "debug", value = "debug"),
@PropertyOption(name = "info", value = "info"), @PropertyOption(name = "warn",
value = "warn"),
@@ -100,19 +100,19 @@ public class ReverseDistributionAgentFac
@Property(boolValue = true, label = "Queue Processing Enabled",
description = "Whether or not the distribution agent should process packages in
the queues.")
- public static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
+ private static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
/**
* endpoints property
*/
@Property(cardinality = 100, label = "Importer Endpoints", description =
"List of endpoints from which packages are received (exported).")
- public static final String EXPORTER_ENDPOINTS =
"packageExporter.endpoints";
+ private static final String EXPORTER_ENDPOINTS =
"packageExporter.endpoints";
/**
* 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";
+ private static final String PULL_ITEMS = "pull.items";
@Property(name = "requestAuthorizationStrategy.target", label = "Request
Authorization Strategy", description = "The target reference for the
DistributionRequestAuthorizationStrategy used to authorize the access to
distribution process," +
@@ -124,6 +124,7 @@ public class ReverseDistributionAgentFac
@Property(name = "transportSecretProvider.target", label = "Transport
Secret Provider", description = "The target reference for the
DistributionTransportSecretProvider used to obtain the credentials used for
accessing the remote endpoints, " +
"e.g. use target=(name=...) to bind to services by name.", value =
SettingsUtils.COMPONENT_NAME_DEFAULT)
@Reference(name = "transportSecretProvider")
+ private
DistributionTransportSecretProvider transportSecretProvider;
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=1725236&r1=1725235&r2=1725236&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 11:29:58 2016
@@ -45,40 +45,38 @@ 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}
*/
@@ -178,16 +176,17 @@ public class SimpleDistributionAgent imp
ResourceResolver agentResourceResolver = null;
- final String requestId = "DSTRQ"+ nextRequestId.incrementAndGet();
+ final String requestId = "DSTRQ" + nextRequestId.incrementAndGet();
String callingUser = resourceResolver.getUserID();
try {
-
+ // check if the request type can be executed by this agent
if (!isAcceptedRequestType(distributionRequest)) {
log.debug("request type not accepted {}",
distributionRequest.getRequestType());
return new
SimpleDistributionResponse(DistributionRequestState.DROPPED, "Request type not
accepted");
}
+ // check if the request paths can be distributed via this agent
if (!isAcceptedRequestRoot(distributionRequest)) {
log.debug("request paths not accepted {}",
Arrays.toString(distributionRequest.getPaths()));
return new
SimpleDistributionResponse(DistributionRequestState.DROPPED, "Request paths not
accepted");
@@ -195,16 +194,17 @@ public class SimpleDistributionAgent imp
boolean silent =
DistributionRequestType.PULL.equals(distributionRequest.getRequestType());
- log.info(silent, "START {} {} paths={}, user={}", new Object[]{
requestId,
+ log.info(silent, "START {} {} paths={}, user={}", new Object[]{
requestId,
distributionRequest.getRequestType(),
distributionRequest.getPaths(), callingUser});
+ // check permissions
distributionRequestAuthorizationStrategy.checkPermission(resourceResolver,
distributionRequest);
agentResourceResolver = getAgentResourceResolver(callingUser);
+ // export packages
CompositeDistributionResponse distributionResponse =
exportPackages(agentResourceResolver, distributionRequest, callingUser,
requestId);
-
log.debug("STARTED {} {} paths={}, success={}, state={},
exportTime={}ms, noPackages={}, size={}B, noQueues={}", new Object[]{
requestId,
distributionRequest.getRequestType(),
distributionRequest.getPaths(),
@@ -225,19 +225,23 @@ public class SimpleDistributionAgent imp
}
- boolean isPassive() {
+ private boolean isPassive() {
return !queueProcessingEnabled;
}
private CompositeDistributionResponse exportPackages(ResourceResolver
agentResourceResolver, DistributionRequest distributionRequest, String
callingUser, String requestId) throws DistributionException {
final long startTime = System.currentTimeMillis();
- PackageExporterProcessor packageProcessor = new
PackageExporterProcessor(callingUser, requestId, startTime);
+ // callback function
+ PackageExporterProcessor packageProcessor = new
PackageExporterProcessor(callingUser, requestId, startTime);
+ // export packages
distributionPackageExporter.exportPackages(agentResourceResolver,
distributionRequest, packageProcessor);
final long endTime = System.currentTimeMillis();
generatePackageEvent(DistributionEventTopics.AGENT_PACKAGE_CREATED);
+
+ // create response
List<DistributionResponse> distributionResponses =
packageProcessor.getAllResponses();
int packagesCount = packageProcessor.getPackagesCount();
long packagesSize = packageProcessor.getPackagesSize();
@@ -251,12 +255,12 @@ public class SimpleDistributionAgent imp
// dispatch the distribution package to the queue distribution handler
try {
+ // add metadata to packages
distributionPackage.getInfo().put(DistributionPackageUtils.PACKAGE_INFO_PROPERTY_REQUEST_USER,
callingUser);
distributionPackage.getInfo().put(DistributionPackageUtils.PACKAGE_INFO_PROPERTY_REQUEST_ID,
requestId);
distributionPackage.getInfo().put(DistributionPackageUtils.PACKAGE_INFO_PROPERTY_REQUEST_START_TIME,
startTime);
-
-
+ // put the packages in the queue
Iterable<DistributionQueueItemStatus> states =
scheduleQueueStrategy.add(distributionPackage, queueProvider);
for (DistributionQueueItemStatus state : states) {
DistributionRequestState requestState =
getRequestStateFromQueueState(state.getItemState());
@@ -271,11 +275,9 @@ public class SimpleDistributionAgent imp
log.debug("SCHEDULED packageId={}, info={}",
distributionPackage.getId(), distributionPackage.getInfo());
-
return distributionResponses;
}
-
@Nonnull
public Set<String> getQueueNames() {
Set<String> queueNames = new TreeSet<String>();
@@ -306,7 +308,7 @@ public class SimpleDistributionAgent imp
@Override
public DistributionQueueStatus getStatus() {
DistributionQueueStatus status = super.getStatus();
- if (!queueProcessingEnabled && (processingQueues!= null &&
processingQueues.contains(queueName))) {
+ if (!queueProcessingEnabled && (processingQueues != null
&& processingQueues.contains(queueName))) {
return new
DistributionQueueStatus(status.getItemsCount(), DistributionQueueState.PAUSED);
} else {
return status;
@@ -315,7 +317,6 @@ public class SimpleDistributionAgent imp
};
}
-
return queue;
}
@@ -345,12 +346,9 @@ public class SimpleDistributionAgent imp
agentState = DistributionAgentState.RUNNING;
}
}
-
return agentState;
-
}
-
public void enable() {
log.info("enabling agent");
@@ -403,7 +401,6 @@ public class SimpleDistributionAgent imp
agentBasedRequestHandler = null;
-
if (!isPassive()) {
try {
@@ -451,7 +448,7 @@ public class SimpleDistributionAgent imp
final long endTime = System.currentTimeMillis();
- log.info("END[{}] {} {} paths={}, time={}ms, importTime={}ms,
size={}B", new Object[] {
+ log.info("END[{}] {} {} paths={}, time={}ms, importTime={}ms,
size={}B", new Object[]{
queueName, requestId,
requestType, paths,
endTime - globalStartTime, endTime - startTime,
@@ -506,7 +503,6 @@ public class SimpleDistributionAgent imp
Map<String, Object> authenticationInfo = new HashMap<String,
Object>();
if (impersonateUser && user != null) {
-
Session session =
slingRepository.impersonateFromService(DEFAULT_AGENT_SERVICE, new
SimpleCredentials(user, new char[0]), null);
authenticationInfo.put(JcrResourceConstants.AUTHENTICATION_INFO_SESSION,
session);
resourceResolver =
resourceResolverFactory.getResourceResolver(authenticationInfo);
@@ -534,7 +530,6 @@ public class SimpleDistributionAgent imp
DistributionUtils.safelyLogout(resourceResolver);
}
}
-
}
private void generatePackageEvent(String topic, DistributionPackage...
distributionPackages) {
@@ -543,7 +538,12 @@ public class SimpleDistributionAgent imp
}
}
- boolean isAcceptedRequestType(DistributionRequest request) {
+ /**
+ * check whether the given request type can be handled by the current agent
+ * @param request a distribution request
+ * @return {@code true}Â if request can be executed, {@code false}
otherwise.
+ */
+ private boolean isAcceptedRequestType(DistributionRequest request) {
if (allowedRequests == null) {
return true;
}
@@ -561,7 +561,12 @@ public class SimpleDistributionAgent imp
return false;
}
- boolean isAcceptedRequestRoot(DistributionRequest request) {
+ /**
+ * check whether a certain request paths can be distributed via this agent
+ * @param request a distribution request
+ * @return {@code true}Â if request can be executed, {@code false}
otherwise.
+ */
+ private boolean isAcceptedRequestRoot(DistributionRequest request) {
if (allowedRoots == null || allowedRoots.length == 0) {
return true;
}
@@ -587,6 +592,9 @@ public class SimpleDistributionAgent imp
return true;
}
+ /**
+ * processor for items in the queue
+ */
class PackageQueueProcessor implements DistributionQueueProcessor {
public boolean process(@Nonnull String queueName, @Nonnull
DistributionQueueEntry queueEntry) {
DistributionQueueItem queueItem = queueEntry.getItem();
@@ -607,7 +615,10 @@ public class SimpleDistributionAgent imp
}
}
-
+ /**
+ * The package exporter callback function to process the exported packages.
+ * The exported packages are scheduled for import.
+ */
class PackageExporterProcessor implements DistributionPackageProcessor {
private final String callingUser;
@@ -617,7 +628,6 @@ public class SimpleDistributionAgent imp
private final AtomicLong packagesSize = new AtomicLong();
private final List<DistributionResponse> allResponses = new
ArrayList<DistributionResponse>();
-
public List<DistributionResponse> getAllResponses() {
return allResponses;
}
@@ -626,11 +636,11 @@ public class SimpleDistributionAgent imp
return packagesCount.get();
}
- public long getPackagesSize() { return packagesSize.get(); }
-
+ public long getPackagesSize() {
+ return packagesSize.get();
+ }
PackageExporterProcessor(String callingUser, String requestId, long
startTime) {
-
this.callingUser = callingUser;
this.requestId = requestId;
this.startTime = startTime;
@@ -638,13 +648,12 @@ public class SimpleDistributionAgent imp
@Override
public void process(DistributionPackage distributionPackage) {
- Collection<SimpleDistributionResponse> responses =
scheduleImportPackage(distributionPackage, callingUser, requestId, startTime);
-
+ Collection<SimpleDistributionResponse> responses =
scheduleImportPackage(distributionPackage, callingUser,
+ requestId, startTime);
packagesCount.incrementAndGet();
packagesSize.addAndGet(distributionPackage.getSize());
allResponses.addAll(responses);
}
-
}
public class AgentBasedRequestHandler implements
DistributionRequestHandler {
@@ -661,7 +670,6 @@ public class SimpleDistributionAgent imp
return;
}
-
if (resourceResolver != null) {
try {
agent.execute(resourceResolver, request);
@@ -685,7 +693,6 @@ public class SimpleDistributionAgent imp
}
}
-
/* Convert the state of a certain item in the queue into a request state */
private DistributionRequestState
getRequestStateFromQueueState(DistributionQueueItemState itemState) {
DistributionRequestState requestState;
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
Mon Jan 18 11:29:58 2016
@@ -82,7 +82,7 @@ public class SimpleDistributionAgentFact
@Property(label = "Service Name", description = "The name of the service
used to access the repository.")
- public static final String SERVICE_NAME = "serviceName";
+ private static final String SERVICE_NAME = "serviceName";
@Property(options = {
@PropertyOption(name = "debug", value = "debug"),
@PropertyOption(name = "info", value = "info"), @PropertyOption(name = "warn",
value = "warn"),
@@ -94,7 +94,7 @@ public class SimpleDistributionAgentFact
@Property(boolValue = true, label = "Queue Processing Enabled",
description = "Whether or not the distribution agent should process packages in
the queues.")
- public static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
+ private static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
@Property(name = "packageExporter.target", label = "Exporter", description
= "The target reference for the DistributionPackageExporter used to receive
(export) the distribution packages," +
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=1725236&r1=1725235&r2=1725236&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
Mon Jan 18 11:29:58 2016
@@ -49,7 +49,6 @@ 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.SingleQueueDispatchingStrategy;
import
org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
import
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
@@ -91,7 +90,7 @@ public class SyncDistributionAgentFactor
@Property(label = "Service Name", description = "The name of the service
used to access the repository.")
- public static final String SERVICE_NAME = "serviceName";
+ private static final String SERVICE_NAME = "serviceName";
@Property(options = {
@PropertyOption(name = "debug", value = "debug"),
@PropertyOption(name = "info", value = "info"), @PropertyOption(name = "warn",
value = "warn"),
@@ -103,41 +102,41 @@ public class SyncDistributionAgentFactor
@Property(boolValue = true, label = "Queue Processing Enabled",
description = "Whether or not the distribution agent should process packages in
the queues.")
- public static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
+ private static final String QUEUE_PROCESSING_ENABLED =
"queue.processing.enabled";
@Property(cardinality = 100, label = "Passive queues", description = "List
of queues that should be disabled." +
"These queues will gather all the packages until they are removed
explicitly.")
- public static final String PASSIVE_QUEUES = "passiveQueues";
+ private static final String PASSIVE_QUEUES = "passiveQueues";
/**
* endpoints property
*/
@Property(cardinality = 100, label = "Exporter Endpoints", description =
"List of endpoints from which packages are received (exported)")
- public static final String EXPORTER_ENDPOINTS =
"packageExporter.endpoints";
+ private static final String EXPORTER_ENDPOINTS =
"packageExporter.endpoints";
/**
* endpoints property
*/
@Property(cardinality = 100, label = "Importer Endpoints", description =
"List of endpoints to which packages are sent (imported). " +
"The list can be given as a map in case a queue should be
configured for each endpoint, e.g. queueName=http://...";)
- public static final String IMPORTER_ENDPOINTS =
"packageImporter.endpoints";
+ private static final String IMPORTER_ENDPOINTS =
"packageImporter.endpoints";
@Property(options = {
@PropertyOption(name = "none", value = "none"),
@PropertyOption(name = "errorQueue", value = "errorQueue")},
value = "none",
label = "Retry Strategy", description = "The strategy to apply
after a certain number of failed retries."
)
- public static final String RETRY_STRATEGY = "retry.strategy";
+ private static final String RETRY_STRATEGY = "retry.strategy";
@Property(intValue = 100, label = "Retry attempts", description = "The
number of times to retry until the retry strategy is applied.")
- public static final String RETRY_ATTEMPTS = "retry.attempts";
+ private static final String RETRY_ATTEMPTS = "retry.attempts";
/**
* 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";
+ private static final String PULL_ITEMS = "pull.items";
@Reference
private Packaging packaging;
@@ -151,6 +150,7 @@ public class SyncDistributionAgentFactor
@Property(name = "transportSecretProvider.target", label = "Transport
Secret Provider", description = "The target reference for the
DistributionTransportSecretProvider used to obtain the credentials used for
accessing the remote endpoints, " +
"e.g. use target=(name=...) to bind to services by name.", value =
SettingsUtils.COMPONENT_NAME_DEFAULT)
@Reference(name = "transportSecretProvider")
+ private
DistributionTransportSecretProvider transportSecretProvider;
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
Mon Jan 18 11:29:58 2016
@@ -51,22 +51,22 @@ import org.slf4j.LoggerFactory;
@Reference(name = "distributionQueueProvider", referenceInterface =
DistributionQueueProvider.class, cardinality =
ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
@Reference(name = "distributionQueueDistributionStrategy",
referenceInterface = DistributionQueueDispatchingStrategy.class, cardinality =
ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
@Reference(name = "distributionTransportSecretProvider",
referenceInterface = DistributionTransportSecretProvider.class, cardinality =
ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
- @Reference(name = "distributionPackageBuilder", referenceInterface =
DistributionPackageBuilder.class, cardinality =
ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+ @Reference(name = "distributionPackageBuilder", referenceInterface =
DistributionPackageBuilder.class, cardinality =
ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
})
@Service(DistributionComponentProvider.class)
public class DefaultDistributionComponentProvider implements
DistributionComponentProvider {
- public static final String NAME = DistributionComponentConstants.PN_NAME;
+ private static final String NAME = DistributionComponentConstants.PN_NAME;
private final Logger log = LoggerFactory.getLogger(getClass());
- private Map<String, DistributionComponent<DistributionAgent>>
distributionAgentMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionAgent>>();
- private Map<String, DistributionComponent<DistributionQueueProvider>>
distributionQueueProviderMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionQueueProvider>>();
- private Map<String,
DistributionComponent<DistributionQueueDispatchingStrategy>>
distributionQueueDistributionStrategyMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionQueueDispatchingStrategy>>();
- private Map<String,
DistributionComponent<DistributionTransportSecretProvider>>
distributionTransportSecretProviderMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionTransportSecretProvider>>();
- private Map<String, DistributionComponent<DistributionPackageImporter>>
distributionPackageImporterMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionPackageImporter>>();
- private Map<String, DistributionComponent<DistributionPackageExporter>>
distributionPackageExporterMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionPackageExporter>>();
- private Map<String, DistributionComponent<DistributionPackageBuilder>>
distributionPackageBuilderMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionPackageBuilder>>();
+ private final Map<String, DistributionComponent<DistributionAgent>>
distributionAgentMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionAgent>>();
+ private final Map<String,
DistributionComponent<DistributionQueueProvider>> distributionQueueProviderMap
= new ConcurrentHashMap<String,
DistributionComponent<DistributionQueueProvider>>();
+ private final Map<String,
DistributionComponent<DistributionQueueDispatchingStrategy>>
distributionQueueDistributionStrategyMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionQueueDispatchingStrategy>>();
+ private final Map<String,
DistributionComponent<DistributionTransportSecretProvider>>
distributionTransportSecretProviderMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionTransportSecretProvider>>();
+ private final Map<String,
DistributionComponent<DistributionPackageImporter>>
distributionPackageImporterMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionPackageImporter>>();
+ private final Map<String,
DistributionComponent<DistributionPackageExporter>>
distributionPackageExporterMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionPackageExporter>>();
+ private final Map<String,
DistributionComponent<DistributionPackageBuilder>>
distributionPackageBuilderMap = new ConcurrentHashMap<String,
DistributionComponent<DistributionPackageBuilder>>();
private BundleContext bundleContext;
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=1725236&r1=1725235&r2=1725236&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
Mon Jan 18 11:29:58 2016
@@ -41,7 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * {@link
org.apache.sling.distribution.component.impl.DistributionComponentManager}
implementation based on OSGI configs.
+ * {@link
org.apache.sling.distribution.component.impl.DistributionConfigurationManager}
implementation based on OSGI configs.
* For each tree of properties a set of OSGI configs is generated and
registered in ConfigurationAdmin.
* To delete a component all configs owned by that component will be
unregistered from ConfigurationAdmin.
*/
@@ -51,6 +51,7 @@ public class DefaultDistributionConfigur
private final Logger log = LoggerFactory.getLogger(getClass());
@Reference
+ private
ConfigurationAdmin configurationAdmin;
@@ -141,7 +142,7 @@ public class DefaultDistributionConfigur
}
}
- public List<Configuration> getOsgiConfigurations(DistributionComponentKind
kind, String componentName) {
+ private List<Configuration>
getOsgiConfigurations(DistributionComponentKind kind, String componentName) {
List<String> factoryPids = kind.getFactories();
List<Configuration> allConfigurations = new ArrayList<Configuration>();
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
Mon Jan 18 11:29:58 2016
@@ -68,8 +68,8 @@ public enum DistributionComponentKind {
TRIGGER("trigger");
- private static Map<DistributionComponentKind, Class> classMap = new
HashMap<DistributionComponentKind, Class>();
- private static Map<DistributionComponentKind, Map<String, Class>>
factoryMap = new HashMap<DistributionComponentKind, Map<String, Class>>();
+ private static final Map<DistributionComponentKind, Class> classMap = new
HashMap<DistributionComponentKind, Class>();
+ private static final Map<DistributionComponentKind, Map<String, Class>>
factoryMap = new HashMap<DistributionComponentKind, Map<String, Class>>();
static {
registerKind(AGENT, DistributionAgent.class);
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
Mon Jan 18 11:29:58 2016
@@ -158,7 +158,7 @@ public class SettingsUtils {
}
- public static <AType> Map<String, AType> toMap(List<AType> aList, String
prefix) {
+ private static <AType> Map<String, AType> toMap(List<AType> aList, String
prefix) {
Map<String, AType> result = new TreeMap<String, AType>();
for (int i = 0; i < aList.size(); i++) {
result.put(prefix + i, aList.get(i));
@@ -197,7 +197,7 @@ public class SettingsUtils {
return null;
}
- return result.toArray(new String[0]);
+ return result.toArray(new String[result.size()]);
}
public static String[] removeEmptyEntries(String[] array, String[]
defaultArray) {
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java
Mon Jan 18 11:29:58 2016
@@ -46,6 +46,7 @@ public class DefaultDistributor implemen
@Reference
+ private
DistributionComponentProvider componentProvider;
@Nonnull
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java
Mon Jan 18 11:29:58 2016
@@ -40,7 +40,6 @@ public class DefaultDistributionLog impl
private final DistributionComponentKind kind;
private final String name;
- private int maxLines = 1000;
private final LinkedList<String> lines = new LinkedList<String>();
private final Logger logger;
private final LogLevel logLevel;
@@ -85,15 +84,14 @@ public class DefaultDistributionLog impl
Calendar cal = Calendar.getInstance();
- StringBuffer logLine = new StringBuffer();
- logLine.append(dateFormat.format(cal.getTime()));
- logLine.append(" - ");
- logLine.append(level.name());
- logLine.append(" - ");
- logLine.append(message);
- String log = logLine.toString();
+ String log = dateFormat.format(cal.getTime()) +
+ " - " +
+ level.name() +
+ " - " +
+ message;
synchronized (lines) {
lines.add(log);
+ int maxLines = 1000;
while (lines.size() > maxLines) {
lines.removeFirst();
}
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
Mon Jan 18 11:29:58 2016
@@ -90,7 +90,7 @@ public class DistributionQueueHealthChec
distributionAgents.clear();
}
- protected void bindDistributionAgent(final DistributionAgent
distributionAgent) {
+ void bindDistributionAgent(final DistributionAgent distributionAgent) {
distributionAgents.add(distributionAgent);
log.debug("Registering distribution agent {} ", distributionAgent);
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
Mon Jan 18 11:29:58 2016
@@ -18,11 +18,8 @@
*/
package org.apache.sling.distribution.packaging;
-
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.List;
import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
@@ -51,10 +48,9 @@ public interface DistributionPackageExpo
* location in the repository while a 'remote'
exporter will use the resolver just to
* store the binary of the remotely fetched
packages in the repository.
* @param distributionRequest - the request containing the needed
information for content to be exported
- * @return a {@link java.util.List} of {@link DistributionPackage}s
*/
- @Nonnull
- void exportPackages(@Nonnull ResourceResolver resourceResolver, @Nonnull
DistributionRequest distributionRequest, @Nonnull DistributionPackageProcessor
packageProcessor) throws DistributionException;
+ void exportPackages(@Nonnull ResourceResolver resourceResolver, @Nonnull
DistributionRequest distributionRequest,
+ @Nonnull DistributionPackageProcessor
packageProcessor) throws DistributionException;
/**
* Retrieves a {@link DistributionPackage} given its identifier, if it
already exists.
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
Mon Jan 18 11:29:58 2016
@@ -19,10 +19,16 @@
package org.apache.sling.distribution.packaging;
-
import org.apache.sling.distribution.serialization.DistributionPackage;
+/**
+ * A callback function used to process packages
+ */
public interface DistributionPackageProcessor {
+ /**
+ * process a distribution package
+ * @param distributionPackage the distribution package
+ */
void process(DistributionPackage distributionPackage);
}
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=1725236&r1=1725235&r2=1725236&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 Jan 18 11:29:58 2016
@@ -36,21 +36,21 @@ import java.util.List;
*/
public class DistributionPackageUtils {
- static Logger log =
LoggerFactory.getLogger(DistributionPackageUtils.class);
+ private static final Logger log =
LoggerFactory.getLogger(DistributionPackageUtils.class);
/**
* distribution package origin queue
*/
- public static String PACKAGE_INFO_PROPERTY_ORIGIN_QUEUE =
"internal.origin.queue";
+ private static final String PACKAGE_INFO_PROPERTY_ORIGIN_QUEUE =
"internal.origin.queue";
/**
* distribution request user
*/
- public static String PACKAGE_INFO_PROPERTY_REQUEST_USER =
"internal.request.user";
+ public static final String PACKAGE_INFO_PROPERTY_REQUEST_USER =
"internal.request.user";
- public static String PACKAGE_INFO_PROPERTY_REQUEST_ID =
"internal.request.id";
+ public static final String PACKAGE_INFO_PROPERTY_REQUEST_ID =
"internal.request.id";
- public static String PACKAGE_INFO_PROPERTY_REQUEST_START_TIME =
"internal.request.startTime";
+ public static final String PACKAGE_INFO_PROPERTY_REQUEST_START_TIME =
"internal.request.startTime";
@@ -144,7 +144,7 @@ public class DistributionPackageUtils {
info.put(DistributionPackageInfo.PROPERTY_REQUEST_DEEP_PATHS,
getDeepPaths(request));
}
- public static String[] getDeepPaths(DistributionRequest request) {
+ private static String[] getDeepPaths(DistributionRequest request) {
List<String> deepPaths = new ArrayList<String>();
for (String path : request.getPaths()) {
if (request.isDeep(path)) {
@@ -152,7 +152,7 @@ public class DistributionPackageUtils {
}
}
- return deepPaths.toArray(new String[0]);
+ return deepPaths.toArray(new String[deepPaths.size()]);
}
}
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
Mon Jan 18 11:29:58 2016
@@ -19,8 +19,6 @@
package org.apache.sling.distribution.packaging.impl.exporter;
import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
@@ -49,8 +47,7 @@ public class AgentDistributionPackageExp
private final DistributionPackageBuilderProvider packageBuilderProvider;
private final String name;
- final static String PACKAGE_TYPE = "agentexporter";
-
+ private final static String PACKAGE_TYPE = "agentexporter";
private DistributionAgent agent;
private String queueName;
@@ -66,7 +63,6 @@ public class AgentDistributionPackageExp
this.agent = agent;
}
- @Nonnull
public void exportPackages(@Nonnull ResourceResolver resourceResolver,
@Nonnull DistributionRequest distributionRequest, @Nonnull
DistributionPackageProcessor packageProcessor) throws DistributionException {
if
(DistributionRequestType.TEST.equals(distributionRequest.getRequestType())) {
@@ -145,13 +141,12 @@ public class AgentDistributionPackageExp
return null;
}
-
private class AgentDistributionPackage extends DistributionPackageWrapper {
private final DistributionPackage distributionPackage;
private final DistributionQueue queue;
- protected AgentDistributionPackage(DistributionPackage
distributionPackage, DistributionQueue queue) {
+ AgentDistributionPackage(DistributionPackage distributionPackage,
DistributionQueue queue) {
super(distributionPackage);
this.distributionPackage = distributionPackage;
this.queue = queue;
@@ -166,7 +161,6 @@ public class AgentDistributionPackageExp
}
}
-
private void agentLog(String message, Object[] values) {
DistributionLog agentLog = agent.getLog();
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
Mon Jan 18 11:29:58 2016
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.packaging.impl.exporter;
import javax.annotation.Nonnull;
-import java.util.List;
import java.util.Map;
import org.apache.felix.scr.annotations.Activate;
@@ -56,7 +55,7 @@ public class AgentDistributionPackageExp
* name of this exporter.
*/
@Property(label = "Name", description = "The name of the exporter.")
- public static final String NAME = DistributionComponentConstants.PN_NAME;
+ private static final String NAME = DistributionComponentConstants.PN_NAME;
@Property(label = "Queue", description = "The name of the queue from which
the packages should be exported.")
private static final String QUEUE_NAME = "queue";
@@ -82,7 +81,6 @@ public class AgentDistributionPackageExp
packageExporter = new AgentDistributionPackageExporter(queueName,
agent, packageBuilderProvider, name);
}
- @Nonnull
public void exportPackages(@Nonnull ResourceResolver resourceResolver,
@Nonnull DistributionRequest distributionRequest, @Nonnull
DistributionPackageProcessor packageProcessor) throws DistributionException {
packageExporter.exportPackages(resourceResolver, distributionRequest,
packageProcessor);
}
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
Mon Jan 18 11:29:58 2016
@@ -19,12 +19,9 @@
package org.apache.sling.distribution.packaging.impl.exporter;
import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
-import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
@@ -44,7 +41,6 @@ public class LocalDistributionPackageExp
this.packageBuilder = packageBuilder;
}
- @Nonnull
public void exportPackages(@Nonnull ResourceResolver resourceResolver,
@Nonnull DistributionRequest distributionRequest, @Nonnull
DistributionPackageProcessor packageProcessor) throws DistributionException {
DistributionPackage createdPackage =
packageBuilder.createPackage(resourceResolver, distributionRequest);
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
Mon Jan 18 11:29:58 2016
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.packaging.impl.exporter;
import javax.annotation.Nonnull;
-import java.util.List;
import java.util.Map;
import org.apache.felix.scr.annotations.Activate;
@@ -71,7 +70,6 @@ public class LocalDistributionPackageExp
exporter = new LocalDistributionPackageExporter(packageBuilder);
}
- @Nonnull
public void exportPackages(@Nonnull ResourceResolver resourceResolver,
@Nonnull DistributionRequest distributionRequest, @Nonnull
DistributionPackageProcessor packageProcessor) throws DistributionException {
exporter.exportPackages(resourceResolver, distributionRequest,
packageProcessor);
}
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=1725236&r1=1725235&r2=1725236&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
Mon Jan 18 11:29:58 2016
@@ -44,21 +44,17 @@ import org.apache.sling.distribution.tra
*/
public class RemoteDistributionPackageExporter implements
DistributionPackageExporter {
-
private final DistributionPackageBuilder packageBuilder;
- private final DistributionTransportSecretProvider secretProvider;
- private final DefaultDistributionLog log;
private final int maxPullItems;
private final DistributionTransportContext distributionContext = new
DistributionTransportContext();
- private List<DistributionTransport> transportHandlers = new
ArrayList<DistributionTransport>();
+ private final List<DistributionTransport> transportHandlers = new
ArrayList<DistributionTransport>();
public RemoteDistributionPackageExporter(DefaultDistributionLog log,
DistributionPackageBuilder packageBuilder,
DistributionTransportSecretProvider secretProvider,
String[] endpoints,
int maxPullItems) {
- this.log = log;
this.maxPullItems = maxPullItems;
if (packageBuilder == null) {
throw new IllegalArgumentException("packageBuilder is required");
@@ -70,7 +66,6 @@ public class RemoteDistributionPackageEx
this.packageBuilder = packageBuilder;
- this.secretProvider = secretProvider;
for (String endpoint : endpoints) {
if (endpoint != null && endpoint.length() > 0) {
@@ -79,7 +74,6 @@ public class RemoteDistributionPackageEx
}
}
- @Nonnull
public void exportPackages(@Nonnull ResourceResolver resourceResolver,
@Nonnull DistributionRequest distributionRequest, @Nonnull
DistributionPackageProcessor packageProcessor) throws DistributionException {
int maxNumberOfPackages =
DistributionRequestType.PULL.equals(distributionRequest.getRequestType()) ?
maxPullItems : 1;
for (DistributionTransport distributionTransport : transportHandlers) {
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
Mon Jan 18 11:29:58 2016
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.packaging.impl.exporter;
import javax.annotation.Nonnull;
-import java.util.List;
import java.util.Map;
import org.apache.felix.scr.annotations.Activate;
@@ -27,23 +26,21 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.PropertyOption;
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.DistributionRequest;
+import org.apache.sling.distribution.common.DistributionException;
import
org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
-import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
+import org.apache.sling.distribution.packaging.DistributionPackageExporter;
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.serialization.DistributionPackageBuilder;
import
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,19 +63,19 @@ public class RemoteDistributionPackageEx
* name of this exporter.
*/
@Property(label = "Name", description = "The name of the exporter.")
- public static final String NAME = DistributionComponentConstants.PN_NAME;
+ private static final String NAME = DistributionComponentConstants.PN_NAME;
/**
* endpoints property
*/
@Property(cardinality = 100, label = "Endpoints", description = "The list
of endpoints from which the packages will be exported.")
- public static final String ENDPOINTS = "endpoints";
+ private static final String ENDPOINTS = "endpoints";
/**
* no. of items to poll property
*/
@Property(label = "Pull Items", description = "number of subsequent pull
requests to make", intValue = 1)
- public static final String PULL_ITEMS = "pull.items";
+ private static final String PULL_ITEMS = "pull.items";
@Property(name = "packageBuilder.target", label = "Package Builder",
description = "The target reference for the DistributionPackageBuilder used to
create distribution packages, " +
"e.g. use target=(name=...) to bind to services by name.", value =
SettingsUtils.COMPONENT_NAME_DEFAULT)
@@ -89,6 +86,7 @@ public class RemoteDistributionPackageEx
@Property(name = "transportSecretProvider.target", label = "Transport
Secret Provider", description = "The target reference for the
DistributionTransportSecretProvider used to obtain the credentials used for
accessing the remote endpoints, " +
"e.g. use target=(name=...) to bind to services by name.", value =
SettingsUtils.COMPONENT_NAME_DEFAULT)
@Reference(name = "transportSecretProvider")
+ private
DistributionTransportSecretProvider transportSecretProvider;
private DistributionPackageExporter exporter;
@@ -118,7 +116,6 @@ public class RemoteDistributionPackageEx
exporter = null;
}
- @Nonnull
public void exportPackages(@Nonnull ResourceResolver resourceResolver,
@Nonnull DistributionRequest distributionRequest, @Nonnull
DistributionPackageProcessor packageProcessor) throws DistributionException {
exporter.exportPackages(resourceResolver, distributionRequest,
packageProcessor);
}
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
Mon Jan 18 11:29:58 2016
@@ -60,7 +60,7 @@ public class LocalDistributionPackageImp
* name of this importer.
*/
@Property(label = "Name", description = "The name of the importer.")
- public static final String NAME = DistributionComponentConstants.PN_NAME;
+ private static final String NAME = DistributionComponentConstants.PN_NAME;
@Property(name = "packageBuilder.target", label = "Package Builder",
description = "The target reference for the DistributionPackageBuilder used to
create distribution packages, " +
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=1725236&r1=1725235&r2=1725236&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
Mon Jan 18 11:29:58 2016
@@ -42,7 +42,7 @@ import org.apache.sling.distribution.tra
public class RemoteDistributionPackageImporter implements
DistributionPackageImporter {
- Map<String, DistributionTransport> transportHandlers = new HashMap<String,
DistributionTransport>();
+ private final Map<String, DistributionTransport> transportHandlers = new
HashMap<String, DistributionTransport>();
private final DistributionTransportContext distributionContext = new
DistributionTransportContext();
