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 2015/12/22 14:05:16 UTC
svn commit: r1721391 - in
/sling/trunk/contrib/extensions/distribution/core/src:
main/java/org/apache/sling/distribution/agent/impl/
main/java/org/apache/sling/distribution/packaging/impl/exporter/
main/java/org/apache/sling/distribution/packaging/impl...
Author: tommaso
Date: Tue Dec 22 13:05:15 2015
New Revision: 1721391
URL: http://svn.apache.org/viewvc?rev=1721391&view=rev
Log:
SLING-5399 - cleared logging, first iteration, minor refactorings
Added:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionPackageProxy.java
- copied, changed from r1721388, sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionPackageProxy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransport.java
- copied, changed from r1721388, sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransport.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransportContext.java
- copied, changed from r1721388, sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransportContext.java
Removed:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.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/importer/RemoteDistributionPackageImporter.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/impl/jobhandling/DistributionAgentJobConsumer.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.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/servlet/DistributionPackageExporterServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/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=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java Tue Dec 22 13:05:15 2015
@@ -247,7 +247,7 @@ public class SimpleDistributionAgent imp
distributionPackage.close();
}
- log.info("scheduled package {} with info {}", distributionPackage.getId(), distributionPackage.getInfo());
+ log.debug("scheduled package {} with info {}", distributionPackage.getId(), distributionPackage.getInfo());
return distributionResponses;
@@ -418,7 +418,7 @@ public class SimpleDistributionAgent imp
DistributionPackageUtils.releaseOrDelete(distributionPackage, queueName);
}
- log.info("processed queue {} package {} with info {}", queueName, distributionPackage.getId(), distributionPackage.getInfo());
+ log.debug("processed queue {} package {} with info {}", queueName, distributionPackage.getId(), distributionPackage.getInfo());
} else {
success = true; // return success if package does not exist in order to clear the queue.
log.error("distribution package with id {} does not exist. the package will be skipped.", queueItem.getId());
@@ -460,7 +460,7 @@ public class SimpleDistributionAgent imp
return false;
}
- log.info("distribution package {} was reenqueued", distributionPackage.getId());
+ log.debug("distribution package {} was reenqueued", distributionPackage.getId());
return true;
}
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=1721391&r1=1721390&r2=1721391&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 Tue Dec 22 13:05:15 2015
@@ -128,7 +128,7 @@ public class AgentDistributionPackageExp
if (packageBuilder != null) {
distributionPackage = packageBuilder.getPackage(resourceResolver, queueItem.getId());
- log.info("item {} fetched from the queue", info);
+ log.debug("item {} fetched from the queue", info);
if (distributionPackage != null) {
return new AgentDistributionPackage(distributionPackage, queue);
}
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=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java Tue Dec 22 13:05:15 2015
@@ -33,10 +33,10 @@ import org.apache.sling.distribution.ser
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.apache.sling.distribution.transport.core.DistributionTransportContext;
-import org.apache.sling.distribution.transport.core.DistributionTransport;
+import org.apache.sling.distribution.transport.DistributionTransportContext;
+import org.apache.sling.distribution.transport.DistributionTransport;
import org.apache.sling.distribution.transport.impl.DistributionEndpoint;
-import org.apache.sling.distribution.transport.core.DistributionPackageProxy;
+import org.apache.sling.distribution.transport.DistributionPackageProxy;
import org.apache.sling.distribution.transport.impl.SimpleHttpDistributionTransport;
/**
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=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java Tue Dec 22 13:05:15 2015
@@ -31,8 +31,8 @@ import org.apache.sling.distribution.ser
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.serialization.DistributionPackageInfo;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.apache.sling.distribution.transport.core.DistributionTransportContext;
-import org.apache.sling.distribution.transport.core.DistributionTransport;
+import org.apache.sling.distribution.transport.DistributionTransportContext;
+import org.apache.sling.distribution.transport.DistributionTransport;
import org.apache.sling.distribution.transport.impl.DistributionEndpoint;
import org.apache.sling.distribution.transport.impl.SimpleHttpDistributionTransport;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java Tue Dec 22 13:05:15 2015
@@ -84,7 +84,7 @@ public class RepositoryDistributionPacka
IOUtils.closeQuietly(inputStream);
}
}
- log.info("package {} imported into the repository as node {} ",
+ log.debug("package {} imported into the repository as node {} ",
distributionPackage.getId(), addedNode.getPath());
} else {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java Tue Dec 22 13:05:15 2015
@@ -44,10 +44,10 @@ class DistributionAgentJobConsumer imple
String queueName = JobHandlingUtils.getQueueName(job);
DistributionQueueEntry entry = JobHandlingUtils.getEntry(job);
DistributionQueueItem item = entry.getItem();
- log.info("processing item {} in queue {}", item.getId(), queueName);
+ log.debug("processing item {} in queue {}", item.getId(), queueName);
boolean processingResult = queueProcessor.process(queueName, entry);
JobResult jobResult = processingResult ? JobResult.OK : JobResult.FAILED;
- log.info("item {} processed {} with result {}", new Object[]{item.getId(), jobResult, jobResult});
+ log.debug("item {} processed {}", item.getId(), jobResult);
return jobResult;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java Tue Dec 22 13:05:15 2015
@@ -71,7 +71,7 @@ public class JobHandlingDistributionQueu
Map<String, Object> properties = JobHandlingUtils.createFullProperties(item);
Job job = jobManager.createJob(topic).properties(properties).add();
- log.info("job {} added for item {}", job.getId(), item.getId());
+ log.debug("job {} added for item {}", job.getId(), item.getId());
return JobHandlingUtils.getEntry(job);
} catch (Exception e) {
@@ -177,7 +177,7 @@ public class JobHandlingDistributionQueu
removed = jobManager.removeJobById(job.getId());
}
- log.info("item with id {} removed from the queue: {}", id, removed);
+ log.debug("item with id {} removed from the queue: {}", id, removed);
return entry;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java Tue Dec 22 13:05:15 2015
@@ -47,7 +47,7 @@ class ScheduledDistributionQueueProcesso
if (queueProcessor.process(queue.getName(), entry)) {
if (queue.remove(entry.getItem().getId()) != null) {
- log.info("item {} processed and removed from the queue", entry.getItem());
+ log.debug("item {} processed and removed from the queue", entry.getItem());
}
} else {
log.warn("processing of item {} failed", entry.getItem().getId());
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java Tue Dec 22 13:05:15 2015
@@ -57,7 +57,7 @@ public class SimpleDistributionQueue imp
private final Map<DistributionQueueItem, DistributionQueueItemStatus> statusMap;
public SimpleDistributionQueue(String agentName, String name) {
- log.info("starting a simple queue for agent {}", agentName);
+ log.debug("starting a simple queue for agent {}", agentName);
this.name = name;
this.queue = new LinkedBlockingQueue<DistributionQueueItem>();
this.statusMap = new WeakHashMap<DistributionQueueItem, DistributionQueueItemStatus>(10);
@@ -145,7 +145,7 @@ public class SimpleDistributionQueue imp
if (toRemove != null) {
removed = queue.remove(toRemove.getItem());
}
- log.info("item with id {} removed from the queue: {}", id, removed);
+ log.debug("item with id {} removed from the queue: {}", id, removed);
if (removed) {
return toRemove;
} else {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java Tue Dec 22 13:05:15 2015
@@ -60,10 +60,10 @@ public class SimpleDistributionQueueProv
DistributionQueue queue = queueMap.get(key);
if (queue == null) {
- log.info("creating a queue with key {}", key);
+ log.debug("creating a queue with key {}", key);
queue = new SimpleDistributionQueue(name, queueName);
queueMap.put(key, queue);
- log.info("queue created {}", queue);
+ log.debug("queue created {}", queue);
}
return queue;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java Tue Dec 22 13:05:15 2015
@@ -73,7 +73,7 @@ public class DefaultSharedDistributionPa
DistributionPackage distributionPackage = distributionPackageBuilder.createPackage(resourceResolver, request);
String packageName = null;
- log.info("mydebug1 create {}", distributionPackage.getId());
+ log.debug("create {}", distributionPackage.getId());
try {
packageName = generateNameFromId(resourceResolver, distributionPackage);
@@ -86,7 +86,7 @@ public class DefaultSharedDistributionPa
String packagePath = getPathFromName(packageName);
DistributionPackage sharedDistributionPackage = new DefaultSharedDistributionPackage(repolock, resourceResolver, packageName, packagePath, distributionPackage);
- log.info("mydebug2 created shared package {} for {}", sharedDistributionPackage.getId(), distributionPackage.getId());
+ log.debug("created shared package {} for {}", sharedDistributionPackage.getId(), distributionPackage.getId());
return sharedDistributionPackage;
}
@@ -96,7 +96,7 @@ public class DefaultSharedDistributionPa
public DistributionPackage readPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionException {
DistributionPackage distributionPackage = distributionPackageBuilder.readPackage(resourceResolver, stream);
- log.info("mydebug4 read shared package {}", distributionPackage);
+ log.debug("read shared package {}", distributionPackage);
if (distributionPackage == null) {
return null;
@@ -115,7 +115,7 @@ public class DefaultSharedDistributionPa
DistributionPackage sharedDistributionPackage = new DefaultSharedDistributionPackage(repolock, resourceResolver, packageName, packagePath, distributionPackage);
- log.info("mydebug3 created shared package {} for {}", sharedDistributionPackage.getId(), distributionPackage.getId());
+ log.debug("created shared package {} for {}", sharedDistributionPackage.getId(), distributionPackage.getId());
return sharedDistributionPackage;
}
@@ -124,7 +124,7 @@ public class DefaultSharedDistributionPa
String packageName = distributionPackageId;
String originalPackageId = retrieveIdFromName(resourceResolver, packageName);
- log.info("mydebug {} {}", packageName, originalPackageId);
+ log.debug("getting package {} {}", packageName, originalPackageId);
if (originalPackageId == null) {
return null;
@@ -132,7 +132,7 @@ public class DefaultSharedDistributionPa
DistributionPackage distributionPackage = distributionPackageBuilder.getPackage(resourceResolver, originalPackageId);
- log.info("mydebug2 {}", distributionPackage);
+ log.debug("obtained package {}", distributionPackage);
if (distributionPackage == null) {
return null;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java Tue Dec 22 13:05:15 2015
@@ -122,7 +122,7 @@ public class DistributionPackageExporter
// everything ok
response.setStatus(200);
- log.info("exported package {} was sent (and deleted={}), bytes written {}", new Object[]{packageId, delete, bytesCopied});
+ log.debug("exported package {} was sent (and deleted={}), bytes written {}", new Object[]{packageId, delete, bytesCopied});
}
});
@@ -154,7 +154,7 @@ public class DistributionPackageExporter
if (distributionPackage != null) {
distributionPackage.delete();
- log.info("exported package {} was deleted", distributionPackage.getId());
+ log.debug("exported package {} was deleted", distributionPackage.getId());
response.setStatus(200);
} else {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java Tue Dec 22 13:05:15 2015
@@ -66,7 +66,7 @@ public class DistributionPackageImporter
log.error("Error during distribution import", e);
} finally {
long end = System.currentTimeMillis();
- log.info("Processed package import request in {} ms", end - start);
+ log.debug("Processed package import request in {} ms", end - start);
}
}
Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionPackageProxy.java (from r1721388, sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionPackageProxy.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionPackageProxy.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionPackageProxy.java&p1=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionPackageProxy.java&r1=1721388&r2=1721391&rev=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionPackageProxy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionPackageProxy.java Tue Dec 22 13:05:15 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.distribution.transport.core;
+package org.apache.sling.distribution.transport;
import org.apache.sling.distribution.serialization.DistributionPackage;
Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransport.java (from r1721388, sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransport.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransport.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransport.java&p1=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransport.java&r1=1721388&r2=1721391&rev=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransport.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransport.java Tue Dec 22 13:05:15 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.transport.core;
+package org.apache.sling.distribution.transport;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransportContext.java (from r1721388, sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransportContext.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransportContext.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransportContext.java&p1=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransportContext.java&r1=1721388&r2=1721391&rev=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/core/DistributionTransportContext.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/DistributionTransportContext.java Tue Dec 22 13:05:15 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.distribution.transport.core;
+package org.apache.sling.distribution.transport;
import org.apache.sling.api.wrappers.ValueMapDecorator;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java Tue Dec 22 13:05:15 2015
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.tr
import org.apache.http.client.fluent.Executor;
import org.apache.sling.distribution.serialization.DistributionPackage;
-import org.apache.sling.distribution.transport.core.DistributionPackageProxy;
+import org.apache.sling.distribution.transport.DistributionPackageProxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java Tue Dec 22 13:05:15 2015
@@ -44,9 +44,9 @@ import org.apache.sling.distribution.ser
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecret;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.apache.sling.distribution.transport.core.DistributionTransportContext;
-import org.apache.sling.distribution.transport.core.DistributionTransport;
-import org.apache.sling.distribution.transport.core.DistributionPackageProxy;
+import org.apache.sling.distribution.transport.DistributionTransportContext;
+import org.apache.sling.distribution.transport.DistributionTransport;
+import org.apache.sling.distribution.transport.DistributionPackageProxy;
import org.apache.sling.distribution.util.RequestUtils;
/**
@@ -110,7 +110,7 @@ public class SimpleHttpDistributionTrans
Content content = response.returnContent();
log.debug("delivered package {} to {}", distributionPackage.getId(), distributionEndpoint.getUri());
} catch (HttpHostConnectException e) {
- log.info("could not connect to {} - retrying", distributionEndpoint.getUri());
+ log.debug("could not connect to {} - retrying", distributionEndpoint.getUri());
throw new RecoverableDistributionException(e);
} catch (Exception ex) {
throw new DistributionException(ex);
@@ -162,7 +162,7 @@ public class SimpleHttpDistributionTrans
log.warn("responsePackage is null");
}
} catch (HttpHostConnectException e) {
- log.info("could not connect to {} - skipping", distributionEndpoint.getUri());
+ log.debug("could not connect to {} - skipping", distributionEndpoint.getUri());
} catch (Exception ex) {
log.error("cannot retrieve packages", ex);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java?rev=1721391&r1=1721390&r2=1721391&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java Tue Dec 22 13:05:15 2015
@@ -40,8 +40,8 @@ import org.apache.sling.distribution.ser
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecret;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.apache.sling.distribution.transport.core.DistributionTransportContext;
-import org.apache.sling.distribution.transport.core.DistributionPackageProxy;
+import org.apache.sling.distribution.transport.DistributionTransportContext;
+import org.apache.sling.distribution.transport.DistributionPackageProxy;
import org.junit.Ignore;
import org.junit.Test;