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 2016/07/28 10:10:00 UTC
svn commit: r1754385 - in
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution:
packaging/impl/ packaging/impl/importer/ queue/impl/ queue/impl/simple/
serialization/impl/vlt/
Author: tommaso
Date: Thu Jul 28 10:10:00 2016
New Revision: 1754385
URL: http://svn.apache.org/viewvc?rev=1754385&view=rev
Log:
SLING-5695 - fixed local importer, minor fixes, reduced too loud logs
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.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/vlt/FileVaultContentSerializer.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java?rev=1754385&r1=1754384&r2=1754385&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java Thu Jul 28 10:10:00 2016
@@ -116,7 +116,6 @@ public class ResourceDistributionPackage
throws DistributionException {
try {
distributionContentSerializer.importFromStream(resourceResolver, inputStream);
-
return true;
} finally {
IOUtils.closeQuietly(inputStream);
@@ -137,7 +136,7 @@ public class ResourceDistributionPackage
Resource uploadStream(Resource parent, InputStream stream, long size) throws PersistenceException {
String name;
- log.info("uploading stream");
+ log.debug("uploading stream");
if (size == -1) {
// stable id
Map<String, Object> info = new HashMap<String, Object>();
@@ -157,7 +156,6 @@ public class ResourceDistributionPackage
} else {
name = "dstrpck-" + System.currentTimeMillis() + "-" + UUID.randomUUID().toString();
}
- log.info("name ok");
Map<String, Object> props = new HashMap<String, Object>();
props.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, "sling:Folder");
@@ -167,7 +165,6 @@ public class ResourceDistributionPackage
props.put("size", size);
}
-
ResourceResolver resourceResolver = parent.getResourceResolver();
Resource r = resourceResolver.getResource(parent, name);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java?rev=1754385&r1=1754384&r2=1754385&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java Thu Jul 28 10:10:00 2016
@@ -101,7 +101,7 @@ public class LocalDistributionPackageImp
String actualPackageId = ReferencePackage.idFromReference(reference);
log.info("installing from reference {}", actualPackageId);
DistributionPackage distributionPackage = packageBuilder.getPackage(resourceResolver, actualPackageId);
- if (distributionPackage != null && packageBuilder.installPackage(resourceResolver, distributionPackage)) {
+ if (distributionPackage != null) {
DistributionPackageInfo packageInfo = packageBuilder.installPackage(resourceResolver, stream);
log.info("package installed {}", packageInfo);
eventFactory.generatePackageEvent(DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED, DistributionComponentKind.IMPORTER, name, packageInfo);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java?rev=1754385&r1=1754384&r2=1754385&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java Thu Jul 28 10:10:00 2016
@@ -95,7 +95,7 @@ public class AsyncDeliveryDispatchingStr
DistributionQueueEntry deliveryQueueEntry = deliveryQueue.add(item);
if (deliveryQueueEntry != null) {
DistributionQueueItemStatus status = deliveryQueueEntry.getStatus();
- log.info("item {} added to delivery queue: {}", item, status);
+ log.debug("item {} added to delivery queue: {}", item, status);
result.add(status);
} else {
DistributionPackageUtils.release(distributionPackage, deliveryQueueName);
@@ -109,7 +109,7 @@ public class AsyncDeliveryDispatchingStr
DistributionQueueEntry referenceQueueEntry = referenceQueue.add(referenceQueueItem);
if (referenceQueueEntry != null) {
DistributionQueueItemStatus status = referenceQueueEntry.getStatus();
- log.info("item {} added to reference queue: {}", referenceQueueItem, status);
+ log.debug("item {} added to reference queue: {}", referenceQueueItem, status);
} else {
DistributionPackageUtils.release(referencePackage, referenceQueueName);
log.error("cannot add package {} to reference queue {}", distributionPackageId, referenceQueueName);
@@ -128,7 +128,7 @@ public class AsyncDeliveryDispatchingStr
if (queueEntry != null) {
status = queueEntry.getStatus();
- log.info("item {} added to queue: {}", item, status);
+ log.debug("item {} added to queue: {}", item, status);
} else {
DistributionPackageUtils.release(distributionPackage, referenceQueueName);
log.error("cannot add package {} to queue {}", distributionPackageId, referenceQueueName);
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=1754385&r1=1754384&r2=1754385&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 Thu Jul 28 10:10:00 2016
@@ -102,7 +102,7 @@ public class SimpleDistributionQueueProv
@Override
public DistributionQueue getQueue(@Nonnull String queueName, @Nonnull DistributionQueueType type) {
- throw new RuntimeException("not supported");
+ return getQueue(queueName);
}
Collection<SimpleDistributionQueue> getQueues() {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java?rev=1754385&r1=1754384&r2=1754385&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java Thu Jul 28 10:10:00 2016
@@ -113,7 +113,6 @@ public class FileVaultContentSerializer
session = getSession(resourceResolver);
ImportOptions importOptions = VltUtils.getImportOptions(aclHandling, importMode, autosaveThreshold);
-
if (inputStream instanceof FileDistributionPackage.PackageInputStream) {
file = ((FileDistributionPackage.PackageInputStream) inputStream).getFile();
isTmp = false;