You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/08/11 16:35:59 UTC
svn commit: r1617297 - in
/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication:
agent/impl/ event/impl/ queue/impl/ queue/impl/jobhandling/
queue/impl/simple/ resources/ resources/impl/ resources/impl/common/ rule...
Author: tommaso
Date: Mon Aug 11 14:35:58 2014
New Revision: 1617297
URL: http://svn.apache.org/r1617297
Log:
SLING-3838 - cleaned up unneeded log.isLevelEnabled statements
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategy.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/PriorityPathDistributionStrategy.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueue.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/ReplicationConstants.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/OsgiServicePropertiesResourceProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/common/AbstractModifyingResourceProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/rule/impl/ChainReplicateReplicationRule.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/exporter/AgentReplicationPackageExporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/importer/LocalReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueEventServlet.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationPackageExporterServlet.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/NopTransportAuthenticationProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/RepositoryTransportAuthenticationProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandler.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/AdvancedRemoteReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/RemoteReplicationPackageImporter.java
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java Mon Aug 11 14:35:58 2014
@@ -190,9 +190,7 @@ public class SimpleReplicationAgent impl
public void enable() {
- if (log.isInfoEnabled()) {
- log.info("enabling agent");
- }
+ log.info("enabling agent");
// apply rules if any
if (rules.length > 0) {
ruleEngine.applyRules(this, rules);
@@ -204,9 +202,7 @@ public class SimpleReplicationAgent impl
}
public void disable() {
- if (log.isInfoEnabled()) {
- log.info("disabling agent");
- }
+ log.info("disabling agent");
if (rules != null) {
ruleEngine.unapplyRules(this, rules);
}
@@ -218,9 +214,7 @@ public class SimpleReplicationAgent impl
private boolean processTransportQueue(ReplicationQueueItem queueItem) {
boolean success = false;
- if (log.isDebugEnabled()) {
- log.debug("reading package with id {}", queueItem.getId());
- }
+ log.debug("reading package with id {}", queueItem.getId());
try {
ReplicationPackage replicationPackage = replicationPackageExporter.exportPackageById(queueItem.getId());
if (replicationPackage != null) {
@@ -229,18 +223,14 @@ public class SimpleReplicationAgent impl
success = true;
}
} catch (ReplicationPackageReadingException e) {
- if (log.isErrorEnabled()) {
- log.error("could not process transport queue", e);
- }
+ log.error("could not process transport queue", e);
}
return success;
}
class PackageQueueProcessor implements ReplicationQueueProcessor {
public boolean process(String queueName, ReplicationQueueItem packageInfo) {
- if (log.isInfoEnabled()) {
- log.info("running package queue processor");
- }
+ log.info("running package queue processor");
return processTransportQueue(packageInfo);
}
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java Mon Aug 11 14:35:58 2014
@@ -18,19 +18,9 @@
*/
package org.apache.sling.replication.agent.impl;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-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.Reference;
-import org.apache.felix.scr.annotations.ReferencePolicy;
+import java.util.*;
+
+import org.apache.felix.scr.annotations.*;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.event.ReplicationEventFactory;
@@ -161,10 +151,8 @@ public class SimpleReplicationAgentFacto
}
- if (log.isInfoEnabled()) {
- log.info("bound services for {} : {} - {} - {} - {} - {} - {}", new Object[]{name,
- packageImporter, packageExporter, queueProvider, queueDistributionStrategy});
- }
+ log.info("bound services for {} : {} - {} - {} - {} - {} - {}", new Object[]{name,
+ packageImporter, packageExporter, queueProvider, queueDistributionStrategy});
SimpleReplicationAgent agent = new SimpleReplicationAgent(name, rules, useAggregatePaths, isPassive,
packageImporter, packageExporter, queueProvider, queueDistributionStrategy, replicationEventFactory, replicationRuleEngine);
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java Mon Aug 11 14:35:58 2014
@@ -19,6 +19,7 @@
package org.apache.sling.replication.event.impl;
import java.util.Dictionary;
+
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -26,7 +27,6 @@ import org.apache.sling.replication.even
import org.apache.sling.replication.event.ReplicationEventFactory;
import org.apache.sling.replication.event.ReplicationEventType;
import org.osgi.service.event.EventAdmin;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,9 +45,7 @@ public class DefaultReplicationEventFact
public void generateEvent(ReplicationEventType replicationEventType, Dictionary<?, ?> properties) {
ReplicationEvent replicationEvent = new ReplicationEvent(replicationEventType, properties);
eventAdmin.postEvent(replicationEvent);
- if (log.isDebugEnabled()) {
- log.debug("replication event posted {}", replicationEvent);
- }
+ log.debug("replication event posted {}", replicationEvent);
}
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategy.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategy.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategy.java Mon Aug 11 14:35:58 2014
@@ -19,19 +19,11 @@
package org.apache.sling.replication.queue.impl;
import java.util.Calendar;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.PropertyOption;
-import org.apache.felix.scr.annotations.Service;
+
+import org.apache.felix.scr.annotations.*;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueDistributionStrategy;
-import org.apache.sling.replication.queue.ReplicationQueueException;
-import org.apache.sling.replication.queue.ReplicationQueueItem;
-import org.apache.sling.replication.queue.ReplicationQueueItemState;
+import org.apache.sling.replication.queue.*;
import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
-import org.apache.sling.replication.queue.ReplicationQueueProvider;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,24 +73,16 @@ public class ErrorAwareQueueDistribution
ReplicationQueueProvider queueProvider)
throws ReplicationQueueException {
try {
- if (log.isInfoEnabled()) {
- log.info("using error aware queue distribution");
- }
+ log.info("using error aware queue distribution");
ReplicationQueueItemState state = new ReplicationQueueItemState();
ReplicationQueue queue = queueProvider.getDefaultQueue(agentName);
- if (log.isInfoEnabled()) {
- log.info("obtained queue {}", queue);
- }
+ log.info("obtained queue {}", queue);
if (queue != null) {
if (queue.add(replicationPackage)) {
- if (log.isInfoEnabled()) {
- log.info("replication status: {}", state);
- }
+ log.info("replication status: {}", state);
state = queue.getStatus(replicationPackage);
} else {
- if (log.isErrorEnabled()) {
- log.error("could not add the item to the queue {}", queue);
- }
+ log.error("could not add the item to the queue {}", queue);
state.setItemState(ItemState.ERROR);
state.setSuccessful(false);
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/PriorityPathDistributionStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/PriorityPathDistributionStrategy.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/PriorityPathDistributionStrategy.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/PriorityPathDistributionStrategy.java Mon Aug 11 14:35:58 2014
@@ -26,12 +26,11 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.queue.*;
+import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
-
/**
* Distribution algorithm which keeps one specific queue to handle specific paths and another queue
* for handling all the other paths
@@ -45,7 +44,7 @@ public class PriorityPathDistributionStr
private final Logger log = LoggerFactory.getLogger(getClass());
- @Property(value = { "/content" })
+ @Property(value = {"/content"})
private static final String PRIORITYPATHS = "priority.paths";
private String[] priorityPaths;
@@ -57,27 +56,19 @@ public class PriorityPathDistributionStr
public ReplicationQueueItemState add(String agentName, ReplicationQueueItem replicationPackage,
ReplicationQueueProvider queueProvider)
- throws ReplicationQueueException {
- if (log.isInfoEnabled()) {
- log.info("using path priority based queue distribution");
- }
+ throws ReplicationQueueException {
+ log.info("using path priority based queue distribution");
ReplicationQueueItemState state = new ReplicationQueueItemState();
ReplicationQueue queue = getQueue(agentName, replicationPackage, queueProvider);
- if (log.isInfoEnabled()) {
- log.info("obtained queue {}", queue);
- }
+ log.info("obtained queue {}", queue);
if (queue != null) {
if (queue.add(replicationPackage)) {
- if (log.isInfoEnabled()) {
- log.info("replication status: {}", state);
- }
+ log.info("replication status: {}", state);
state = queue.getStatus(replicationPackage);
} else {
- if (log.isErrorEnabled()) {
- log.error("could not add the item to the queue {}", queue);
- }
+ log.error("could not add the item to the queue {}", queue);
state.setItemState(ItemState.ERROR);
state.setSuccessful(false);
}
@@ -90,12 +81,10 @@ public class PriorityPathDistributionStr
private ReplicationQueue getQueue(String agentName, ReplicationQueueItem replicationPackage,
ReplicationQueueProvider queueProvider)
- throws ReplicationQueueException {
+ throws ReplicationQueueException {
String[] paths = replicationPackage.getPaths();
- if (log.isInfoEnabled()) {
- log.info("calculating priority for paths {}", Arrays.toString(paths));
- }
+ log.info("calculating priority for paths {}", Arrays.toString(paths));
boolean usePriorityQueue = false;
String pp = null;
@@ -111,14 +100,10 @@ public class PriorityPathDistributionStr
ReplicationQueue queue;
if (usePriorityQueue) {
- if (log.isInfoEnabled()) {
- log.info("using priority queue for path {}", pp);
- }
+ log.info("using priority queue for path {}", pp);
queue = queueProvider.getQueue(agentName, pp);
} else {
- if (log.isInfoEnabled()) {
- log.info("using default queue");
- }
+ log.info("using default queue");
queue = queueProvider.getDefaultQueue(agentName);
}
return queue;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java Mon Aug 11 14:35:58 2014
@@ -18,13 +18,8 @@
*/
package org.apache.sling.replication.queue.impl.jobhandling;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
+
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.JobManager;
import org.apache.sling.event.jobs.JobManager.QueryType;
@@ -68,13 +63,9 @@ public class JobHandlingReplicationQueue
.createFullPropertiesFromPackage(replicationPackage);
Job job = jobManager.createJob(topic).properties(properties).add();
- if (log.isInfoEnabled()) {
- log.info("job {} added", job.getId());
- }
+ log.info("job {} added", job.getId());
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("could not add an item to the queue", e);
- }
+ log.error("could not add an item to the queue", e);
result = false;
}
return result;
@@ -91,9 +82,7 @@ public class JobHandlingReplicationQueue
itemStatus.setAttempts(job.getRetryCount());
itemStatus.setItemState(ItemState.valueOf(job.getJobState().toString()));
itemStatus.setEntered(job.getCreated());
- if (log.isInfoEnabled()) {
- log.info("status of job {} is {}", job.getId(), job.getJobState());
- }
+ log.info("status of job {} is {}", job.getId(), job.getJobState());
} else {
itemStatus.setItemState(ItemState.DROPPED);
}
@@ -121,9 +110,7 @@ public class JobHandlingReplicationQueue
@SuppressWarnings("unchecked")
private Job getFirstItem() {
- if (log.isInfoEnabled()) {
- log.info("getting first item in the queue");
- }
+ log.info("getting first item in the queue");
Collection<Job> jobs = jobManager.findJobs(QueryType.QUEUED, topic, -1);
jobs.addAll(jobManager.findJobs(QueryType.ACTIVE, topic, -1));
@@ -135,10 +122,8 @@ public class JobHandlingReplicationQueue
}
});
Job firstItem = list.get(0);
- if (log.isInfoEnabled()) {
- log.info("first item in the queue is {}, retried {} times", firstItem.getId(),
- firstItem.getRetryCount());
- }
+ log.info("first item in the queue is {}, retried {} times", firstItem.getId(),
+ firstItem.getRetryCount());
return firstItem;
}
return null;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java Mon Aug 11 14:35:58 2014
@@ -28,8 +28,6 @@ import org.slf4j.LoggerFactory;
public class JobHandlingUtils {
- private static final Logger log = LoggerFactory.getLogger(JobHandlingUtils.class.getName());
-
private static final String PATHS = "replication.package.paths";
public static final String ID = "replication.package.id";
@@ -95,5 +93,4 @@ public class JobHandlingUtils {
return queue.substring(idx + 1);
}
-
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueue.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueue.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueue.java Mon Aug 11 14:35:58 2014
@@ -50,9 +50,7 @@ public class SimpleReplicationQueue impl
private final Map<ReplicationQueueItem, ReplicationQueueItemState> statusMap;
public SimpleReplicationQueue(String agentName, String name) {
- if (log.isInfoEnabled()) {
- log.info("starting a simple queue for agent {}", agentName);
- }
+ log.info("starting a simple queue for agent {}", agentName);
this.name = name;
this.queue = new LinkedBlockingQueue<ReplicationQueueItem>();
this.statusMap = new WeakHashMap<ReplicationQueueItem, ReplicationQueueItemState>(10);
@@ -120,9 +118,7 @@ public class SimpleReplicationQueue impl
if (toRemove != null) {
removed = queue.remove(toRemove);
}
- if (log.isInfoEnabled()) {
- log.info("item with id {} removed from the queue: {}", id, removed);
- }
+ log.info("item with id {} removed from the queue: {}", id, removed);
}
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/ReplicationConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/ReplicationConstants.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/ReplicationConstants.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/ReplicationConstants.java Mon Aug 11 14:35:58 2014
@@ -20,6 +20,7 @@
package org.apache.sling.replication.resources;
public class ReplicationConstants {
+
public static final String SUFFIX_RESOURCE_LIST = "/list";
public static final String SUFFIX_AGENT_QUEUE = "/queue";
public static final String SUFFIX_AGENT_QUEUE_EVENT = "/queue/event";
@@ -32,5 +33,4 @@ public class ReplicationConstants {
public static final String IMPORTER_RESOURCE_TYPE = "replication/importer";
public static final String EXPORTER_RESOURCE_TYPE = "replication/exporter";
-
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/OsgiServicePropertiesResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/OsgiServicePropertiesResourceProvider.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/OsgiServicePropertiesResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/OsgiServicePropertiesResourceProvider.java Mon Aug 11 14:35:58 2014
@@ -55,7 +55,6 @@ public class OsgiServicePropertiesResour
Map<String, String> additionalResourceProperties) {
super(resourceRoot, additionalResourceProperties);
this.context = context;
- String serviceInterface1 = serviceInterface;
this.friendlyNameProperty = friendlyNameProperty;
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/common/AbstractModifyingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/common/AbstractModifyingResourceProvider.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/common/AbstractModifyingResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/resources/impl/common/AbstractModifyingResourceProvider.java Mon Aug 11 14:35:58 2014
@@ -53,7 +53,6 @@ public abstract class AbstractModifyingR
throw new PersistenceException("Not enough permissions");
}
-
String resourceName = pathInfo.getMainResourceName();
boolean added = addToChangedResources(resourceName, properties, true);
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/rule/impl/ChainReplicateReplicationRule.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/rule/impl/ChainReplicateReplicationRule.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/rule/impl/ChainReplicateReplicationRule.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/rule/impl/ChainReplicateReplicationRule.java Mon Aug 11 14:35:58 2014
@@ -110,7 +110,6 @@ public class ChainReplicateReplicationRu
}
} else {
log.warn("rule {} doesn't match signature: {}", ruleString, SIGNATURE);
-
}
}
@@ -139,7 +138,6 @@ public class ChainReplicateReplicationRu
agent.execute(new ReplicationRequest(System.currentTimeMillis(), action, paths));
} catch (AgentReplicationException e) {
log.error("triggered replication resulted in an error {}", e);
-
}
break;
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/exporter/AgentReplicationPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/exporter/AgentReplicationPackageExporter.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/exporter/AgentReplicationPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/exporter/AgentReplicationPackageExporter.java Mon Aug 11 14:35:58 2014
@@ -67,9 +67,7 @@ public class AgentReplicationPackageExpo
List<ReplicationPackage> result = new ArrayList<ReplicationPackage>();
try {
- if (log.isInfoEnabled()) {
- log.info("getting item from queue {}", queueName);
- }
+ log.info("getting item from queue {}", queueName);
ReplicationQueue queue = agent.getQueue(queueName);
ReplicationQueueItem info = queue.getHead();
@@ -83,9 +81,7 @@ public class AgentReplicationPackageExpo
}
} catch (Exception ex) {
- if (log.isErrorEnabled()) {
- log.error("Error exporting package", ex);
- }
+ log.error("Error exporting package", ex);
}
return result;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/importer/LocalReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/importer/LocalReplicationPackageImporter.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/importer/LocalReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/importer/LocalReplicationPackageImporter.java Mon Aug 11 14:35:58 2014
@@ -62,9 +62,7 @@ public class LocalReplicationPackageImpo
success = replicationPackageBuilder.installPackage(replicationPackage);
if (success) {
- if (log.isInfoEnabled()) {
- log.info("replication package read and installed for path(s) {}", Arrays.toString(replicationPackage.getPaths()));
- }
+ log.info("replication package read and installed for path(s) {}", Arrays.toString(replicationPackage.getPaths()));
Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
dictionary.put("replication.action", replicationPackage.getAction());
@@ -73,14 +71,10 @@ public class LocalReplicationPackageImpo
replicationPackage.delete();
} else {
- if (log.isWarnEnabled()) {
- log.warn("could not read a replication package");
- }
+ log.warn("could not read a replication package");
}
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("cannot import a package from the given stream of type {}", replicationPackage.getType());
- }
+ log.error("cannot import a package from the given stream of type {}", replicationPackage.getType());
}
return success;
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java Mon Aug 11 14:35:58 2014
@@ -32,7 +32,10 @@ import org.apache.jackrabbit.vault.fs.ap
import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
-import org.apache.jackrabbit.vault.packaging.*;
+import org.apache.jackrabbit.vault.packaging.ExportOptions;
+import org.apache.jackrabbit.vault.packaging.JcrPackage;
+import org.apache.jackrabbit.vault.packaging.Packaging;
+import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.replication.communication.ReplicationRequest;
@@ -78,7 +81,6 @@ public class FileVaultReplicationPackage
@Reference
private Packaging packaging;
-
private String username;
private String password;
@@ -103,9 +105,7 @@ public class FileVaultReplicationPackage
props.setProperty(VaultPackage.NAME_GROUP, packageGroup);
String packageName = String.valueOf(request.getTime());
props.setProperty(VaultPackage.NAME_NAME, packageName);
- if (log.isDebugEnabled()) {
- log.debug("assembling package {}", packageGroup + '/' + packageName);
- }
+ log.debug("assembling package {}", packageGroup + '/' + packageName);
inf.setProperties(props);
opts.setMetaInf(inf);
@@ -136,9 +136,7 @@ public class FileVaultReplicationPackage
@Override
protected ReplicationPackage readPackageInternal(final InputStream stream)
throws ReplicationPackageReadingException {
- if (log.isDebugEnabled()) {
- log.debug("reading a stream");
- }
+ log.debug("reading a stream");
ReplicationPackage pkg = null;
try {
File tmpFile = File.createTempFile("rp-vlt-read-" + System.nanoTime(), ".zip");
@@ -151,15 +149,11 @@ public class FileVaultReplicationPackage
if (vaultPackage != null) {
pkg = new FileVaultReplicationPackage(vaultPackage);
} else {
- if (log.isWarnEnabled()) {
- log.warn("stream could not be read as a vlt package");
- }
+ log.warn("stream could not be read as a vlt package");
}
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("could not read / install the package", e);
- }
+ log.error("could not read / install the package", e);
throw new ReplicationPackageReadingException(e);
}
return pkg;
@@ -180,9 +174,7 @@ public class FileVaultReplicationPackage
// replicationPackage = new FileVaultReplicationPackage(pkg);
// }
} catch (Exception e) {
- if (log.isWarnEnabled()) {
- log.warn("could not find a package with id : {}", id);
- }
+ log.warn("could not find a package with id : {}", id);
}
return replicationPackage;
}
@@ -197,9 +189,7 @@ public class FileVaultReplicationPackage
@Override
public boolean installPackageInternal(ReplicationPackage replicationPackage) throws ReplicationPackageReadingException {
- if (log.isDebugEnabled()) {
- log.debug("reading a replication package stream");
- }
+ log.debug("reading a replication package stream");
Session session = null;
try {
@@ -216,9 +206,7 @@ public class FileVaultReplicationPackage
return true;
}
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("could not read / install the package", e);
- }
+ log.error("could not read / install the package", e);
throw new ReplicationPackageReadingException(e);
} finally {
if (session != null) {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueEventServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueEventServlet.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueEventServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueEventServlet.java Mon Aug 11 14:35:58 2014
@@ -18,23 +18,15 @@
*/
package org.apache.sling.replication.servlet;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
+
+import org.apache.felix.scr.annotations.*;
import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
@@ -74,9 +66,7 @@ public class ReplicationAgentQueueEventS
Dictionary<String, Object> properties = new Hashtable<String, Object>();
properties.put(EventConstants.EVENT_TOPIC, ReplicationEvent.getTopic(ReplicationEventType.PACKAGE_QUEUED));
registration = context.registerService(EventHandler.class.getName(), new SSEListener(), properties);
- if (log.isInfoEnabled()) {
- log.info("SSE activated : {}", registration != null);
- }
+ log.info("SSE activated : {}", registration != null);
}
@Deactivate
@@ -119,9 +109,7 @@ public class ReplicationAgentQueueEventS
}
}
} catch (InterruptedException e) {
- if (log.isErrorEnabled()) {
- log.error("error during SSE", e);
- }
+ log.error("error during SSE", e);
throw new ServletException(e);
}
}
@@ -141,28 +129,20 @@ public class ReplicationAgentQueueEventS
// flush the buffers to make sure the container sends the bytes
writer.flush();
- if (log.isDebugEnabled()) {
- log.debug("SSE event {}: {}", event, message);
- }
+ log.debug("SSE event {}: {}", event, message);
}
private class SSEListener implements EventHandler {
public void handleEvent(Event event) {
- if (log.isDebugEnabled()) {
- log.debug("SSE listener running on event {}", event);
- }
+ log.debug("SSE listener running on event {}", event);
Object pathProperty = event.getProperty("replication.package.paths");
Object agentNameProperty = event.getProperty("replication.agent.name");
- if (log.isDebugEnabled()) {
- log.debug("cached events {}", cachedEvents.size());
- }
+ log.debug("cached events {}", cachedEvents.size());
if (pathProperty != null && agentNameProperty != null) {
String agentName = String.valueOf(agentNameProperty);
String[] paths = (String[]) pathProperty;
synchronized (cachedEvents) {
- if (log.isDebugEnabled()) {
- log.debug("queue event for agent {} on paths {}", agentName, Arrays.toString(paths));
- }
+ log.debug("queue event for agent {} on paths {}", agentName, Arrays.toString(paths));
Collection<String> eventsForAgent = cachedEvents.get(agentName);
if (eventsForAgent == null) {
eventsForAgent = new LinkedList<String>();
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationPackageExporterServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationPackageExporterServlet.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationPackageExporterServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationPackageExporterServlet.java Mon Aug 11 14:35:58 2014
@@ -70,9 +70,7 @@ public class ReplicationPackageExporterS
List<ReplicationPackage> replicationPackages = replicationPackageExporter.exportPackage(null);
if (replicationPackages.size() > 0) {
- if (log.isInfoEnabled()) {
- log.info("{} package(s) available for fetching, the first will be delivered", replicationPackages.size());
- }
+ log.info("{} package(s) available for fetching, the first will be delivered", replicationPackages.size());
ReplicationPackage replicationPackage = replicationPackages.get(0);
if (replicationPackage != null) {
@@ -90,33 +88,22 @@ public class ReplicationPackageExporterS
// everything ok
response.setStatus(200);
- if (log.isInfoEnabled()) {
- log.info("{} bytes written into the response", bytesCopied);
- }
+ log.info("{} bytes written into the response", bytesCopied);
success = true;
- }
- else {
- if (log.isWarnEnabled()) {
- log.warn("fetched a null package");
- }
+ } else {
+ log.warn("fetched a null package");
}
} else {
response.setStatus(204);
- if (log.isInfoEnabled()) {
- log.info("nothing to fetch");
- }
+ log.info("nothing to fetch");
}
} catch (Exception e) {
response.setStatus(503);
- if (log.isErrorEnabled()) {
- log.error("error while reverse replicating from agent", e);
- }
+ log.error("error while reverse replicating from agent", e);
} finally {
final long end = System.currentTimeMillis();
- if (log.isInfoEnabled()) {
- log.info("Processed replication export request in {}ms: : {}", new Object[]{end - start, success});
- }
+ log.info("Processed replication export request in {}ms: : {}", new Object[]{end - start, success});
}
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/NopTransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/NopTransportAuthenticationProvider.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/NopTransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/NopTransportAuthenticationProvider.java Mon Aug 11 14:35:58 2014
@@ -27,8 +27,6 @@ import org.apache.sling.replication.tran
*/
public class NopTransportAuthenticationProvider implements TransportAuthenticationProvider<Object, Object> {
-
-
public Object authenticate(Object authenticable, TransportAuthenticationContext context)
throws TransportAuthenticationException {
return authenticable;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/RepositoryTransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/RepositoryTransportAuthenticationProvider.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/RepositoryTransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/RepositoryTransportAuthenticationProvider.java Mon Aug 11 14:35:58 2014
@@ -22,6 +22,7 @@ import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationException;
@@ -53,9 +54,7 @@ public class RepositoryTransportAuthenti
if (!session.nodeExists(path)) {
throw new TransportAuthenticationException("failed to read path " + path);
} else {
- if (log.isInfoEnabled()) {
- log.info("authenticated path {} ", path);
- }
+ log.info("authenticated path {} ", path);
return session;
}
} catch (RepositoryException re) {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java Mon Aug 11 14:35:58 2014
@@ -48,9 +48,7 @@ public class UserCredentialsTransportAut
if (endpoint != null) {
Executor authenticated = authenticable.auth(new HttpHost(endpoint
.getUri().getHost()), username, password);
- if (log.isInfoEnabled()) {
- log.info("authenticated executor {} with user and password", authenticated);
- }
+ log.debug("authenticated executor HTTP client with user and password");
return authenticated;
} else {
throw new TransportAuthenticationException(
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java Mon Aug 11 14:35:58 2014
@@ -178,10 +178,8 @@ public class AdvancedHttpReplicationTran
if (response != null) {
Content content = response.returnContent();
- if (log.isInfoEnabled()) {
- log.info("Replication content of type {} for {} delivered: {}", new Object[]{
- type, Arrays.toString(replicationPackage.getPaths()), content});
- }
+ log.info("Replication content of type {} for {} delivered: {}", new Object[]{
+ type, Arrays.toString(replicationPackage.getPaths()), content});
} else {
throw new IOException("response is empty");
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandler.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandler.java Mon Aug 11 14:35:58 2014
@@ -24,8 +24,6 @@ import java.util.List;
import org.apache.sling.replication.serialization.ReplicationPackage;
import org.apache.sling.replication.transport.ReplicationTransportException;
import org.apache.sling.replication.transport.ReplicationTransportHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link org.apache.sling.replication.transport.ReplicationTransportHandler} supporting delivery / retrieval from multiple
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/AdvancedRemoteReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/AdvancedRemoteReplicationPackageImporter.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/AdvancedRemoteReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/AdvancedRemoteReplicationPackageImporter.java Mon Aug 11 14:35:58 2014
@@ -127,9 +127,7 @@ public class AdvancedRemoteReplicationPa
transportHandler.deliverPackage(replicationPackage);
result = true;
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("failed delivery", e);
- }
+ log.error("failed delivery", e);
}
return result;
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/RemoteReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/RemoteReplicationPackageImporter.java?rev=1617297&r1=1617296&r2=1617297&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/RemoteReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/importer/RemoteReplicationPackageImporter.java Mon Aug 11 14:35:58 2014
@@ -105,9 +105,7 @@ public class RemoteReplicationPackageImp
transportHandler.deliverPackage(replicationPackage);
result = true;
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("failed in importing package {} due to {}", replicationPackage, e);
- }
+ log.error("failed in importing package {} due to {}", replicationPackage, e);
}
return result;
}