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 2017/01/19 15:03:06 UTC
svn commit: r1779477 - in /sling/trunk/contrib/extensions/distribution:
core/src/main/java/org/apache/sling/distribution/agent/impl/
core/src/main/java/org/apache/sling/distribution/component/impl/
core/src/main/java/org/apache/sling/distribution/packa...
Author: tommaso
Date: Thu Jan 19 15:03:06 2017
New Revision: 1779477
URL: http://svn.apache.org/viewvc?rev=1779477&view=rev
Log:
minor static analysis fixes, fixed rat excludes on it project
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentAuthenticationInfo.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/ResourceConfigurationManager.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackage.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackage.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java
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/queue/impl/AsyncDeliveryDispatchingStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DigestUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStream.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializerTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTriggerTest.java
sling/trunk/contrib/extensions/distribution/it/pom.xml
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java Thu Jan 19 15:03:06 2017
@@ -66,7 +66,7 @@ abstract class AbstractDistributionAgent
private SimpleDistributionAgent agent;
- public AbstractDistributionAgentFactory(Class<DistributionAgentMBeanType> distributionAgentMBeanType) {
+ AbstractDistributionAgentFactory(Class<DistributionAgentMBeanType> distributionAgentMBeanType) {
this.distributionAgentMBeanType = distributionAgentMBeanType;
}
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=1779477&r1=1779476&r2=1779477&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 Thu Jan 19 15:03:06 2017
@@ -59,7 +59,7 @@ import org.apache.sling.jcr.api.SlingRep
* Basic implementation of a {@link org.apache.sling.distribution.agent.DistributionAgent}
*/
public class SimpleDistributionAgent implements DistributionAgent {
- public final static String DEFAULT_AGENT_SERVICE = "defaultAgentService";
+ private final static String DEFAULT_AGENT_SERVICE = "defaultAgentService";
private final DistributionQueueProvider queueProvider;
private final DistributionPackageImporter distributionPackageImporter;
@@ -168,8 +168,8 @@ public class SimpleDistributionAgent imp
boolean silent = DistributionRequestType.PULL.equals(distributionRequest.getRequestType());
- log.info(silent, "REQUEST-START {}: {} paths={}, user={}", new Object[]{requestId,
- distributionRequest.getRequestType(), distributionRequest.getPaths(), callingUser});
+ log.info(silent, "REQUEST-START {}: {} paths={}, user={}", requestId,
+ distributionRequest.getRequestType(), distributionRequest.getPaths(), callingUser);
// check permissions
distributionRequestAuthorizationStrategy.checkPermission(resourceResolver, distributionRequest);
@@ -181,19 +181,17 @@ public class SimpleDistributionAgent imp
// export packages
CompositeDistributionResponse distributionResponse = exportPackages(agentResourceResolver, distributionRequest, callingUser, requestId);
- log.debug("REQUEST-STARTED {}: {} paths={}, success={}, state={}, exportTime={}ms, noPackages={}, size={}B, noQueues={}", new Object[]{
- requestId,
+ log.debug("REQUEST-STARTED {}: {} paths={}, success={}, state={}, exportTime={}ms, noPackages={}, size={}B, noQueues={}", requestId,
distributionRequest.getRequestType(), distributionRequest.getPaths(),
distributionResponse.isSuccessful(), distributionResponse.getState(),
distributionResponse.getExportTime(),
distributionResponse.getPackagesCount(), distributionResponse.getPackagseSize(),
- distributionResponse.getQueuesCount()
- });
+ distributionResponse.getQueuesCount());
return distributionResponse;
} catch (DistributionException e) {
- log.error("REQUEST-FAIL {}: {} paths={}, user={}, message={}", new Object[]{requestId,
- distributionRequest.getRequestType(), distributionRequest.getPaths(), callingUser, e.getMessage()});
+ log.error("REQUEST-FAIL {}: {} paths={}, user={}, message={}", requestId,
+ distributionRequest.getRequestType(), distributionRequest.getPaths(), callingUser, e.getMessage());
throw e;
} finally {
DistributionUtils.ungetResourceResolver(agentResourceResolver);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentAuthenticationInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentAuthenticationInfo.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentAuthenticationInfo.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentAuthenticationInfo.java Thu Jan 19 15:03:06 2017
@@ -27,7 +27,7 @@ import org.apache.sling.jcr.api.SlingRep
/**
* Authentication information required by a {@link SimpleDistributionAgent} to perform its tasks.
*/
-public class SimpleDistributionAgentAuthenticationInfo {
+class SimpleDistributionAgentAuthenticationInfo {
private final SlingRepository slingRepository;
private final String agentService;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java Thu Jan 19 15:03:06 2017
@@ -133,12 +133,10 @@ class SimpleDistributionAgentQueueProces
removeItemFromQueue = true;
final long endTime = System.currentTimeMillis();
- log.info("[{}] PACKAGE-DELIVERED {}: {} paths={}, importTime={}ms, execTime={}ms, size={}B", new Object[]{
- queueName, requestId,
+ log.info("[{}] PACKAGE-DELIVERED {}: {} paths={}, importTime={}ms, execTime={}ms, size={}B", queueName, requestId,
requestType, paths,
endTime - startTime, endTime - globalStartTime,
- packageSize
- });
+ packageSize);
} catch (RecoverableDistributionException e) {
log.error("[{}] PACKAGE-FAIL {}: could not deliver {}, {}", queueName, requestId, distributionPackage.getId(), e.getMessage());
log.debug("could not deliver package {}", distributionPackage.getId(), e);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java Thu Jan 19 15:03:06 2017
@@ -63,8 +63,8 @@ public class DefaultDistributionConfigur
@Reference
ConfigurationAdmin configurationAdmin;
- DistributionConfigurationManager osgiManager;
- DistributionConfigurationManager resourceManager;
+ private DistributionConfigurationManager osgiManager;
+ private DistributionConfigurationManager resourceManager;
static String resourcePrefix;
static final String OSGI_PREFIX = "";
@@ -216,7 +216,7 @@ public class DefaultDistributionConfigur
* @param prefix a prefix
* @return a {@link Map} of prefix -> configuration
*/
- static Map<String, DistributionConfiguration> splitConfig(DistributionConfiguration config, String prefix) {
+ private static Map<String, DistributionConfiguration> splitConfig(DistributionConfiguration config, String prefix) {
Map<String, Object> distributionConfigurationProperties = config.getProperties();
// properties for OSGi configuration
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java Thu Jan 19 15:03:06 2017
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* Manager implementation which represents the distribution configurations as OSGI configuration.
*/
public class OsgiConfigurationManager implements DistributionConfigurationManager {
- final ConfigurationAdmin configurationAdmin;
+ private final ConfigurationAdmin configurationAdmin;
private final Logger log = LoggerFactory.getLogger(getClass());
public OsgiConfigurationManager(ConfigurationAdmin configurationAdmin) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/ResourceConfigurationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/ResourceConfigurationManager.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/ResourceConfigurationManager.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/ResourceConfigurationManager.java Thu Jan 19 15:03:06 2017
@@ -38,8 +38,8 @@ import java.util.Map;
*/
public class ResourceConfigurationManager implements DistributionConfigurationManager {
- final String CONTENT_NODE = "jcr:content";
- final String configRootPath;
+ private final String CONTENT_NODE = "jcr:content";
+ private final String configRootPath;
private final Logger log = LoggerFactory.getLogger(getClass());
private final String[] configProperties;
private final Map<String, String> configDefaults;
@@ -153,7 +153,7 @@ public class ResourceConfigurationManage
}
- Map<String, Object> getMap(Resource resource) {
+ private Map<String, Object> getMap(Resource resource) {
Map<String, Object> result = new HashMap<String, Object>();
Resource contentResource = resource.getChild(CONTENT_NODE);
@@ -166,7 +166,7 @@ public class ResourceConfigurationManage
return result;
}
- Map<String, Object> getFilteredMap(Resource resource) {
+ private Map<String, Object> getFilteredMap(Resource resource) {
Map<String, Object> result = getMap(resource);
result = filterMap(result);
@@ -174,7 +174,7 @@ public class ResourceConfigurationManage
return result;
}
- Map<String, Object> filterMap(Map<String, Object> configMap) {
+ private Map<String, Object> filterMap(Map<String, Object> configMap) {
Map<String, Object> result = new HashMap<String, Object>();
for (String key: configMap.keySet()) {
@@ -186,7 +186,7 @@ public class ResourceConfigurationManage
return result;
}
- boolean isAccepted(String key) {
+ private boolean isAccepted(String key) {
for (String property : configProperties) {
if (property.equals(key)) {
return true;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackage.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackage.java Thu Jan 19 15:03:06 2017
@@ -36,7 +36,7 @@ public abstract class AbstractDistributi
private final String digestAlgorithm;
private final String digestMessage;
- protected AbstractDistributionPackage(String id, String type, String digestAlgorithm, String digestMessage) {
+ AbstractDistributionPackage(String id, String type, String digestAlgorithm, String digestMessage) {
this.id = id;
this.info = new DistributionPackageInfo(type);
this.digestAlgorithm = digestAlgorithm;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java Thu Jan 19 15:03:06 2017
@@ -51,7 +51,7 @@ public abstract class AbstractDistributi
private final String type;
- protected AbstractDistributionPackageBuilder(String type) {
+ AbstractDistributionPackageBuilder(String type) {
this.type = type;
}
@@ -216,7 +216,7 @@ public abstract class AbstractDistributi
return distributionPackage;
}
- protected Session getSession(ResourceResolver resourceResolver) throws RepositoryException {
+ private Session getSession(ResourceResolver resourceResolver) throws RepositoryException {
Session session = resourceResolver.adaptTo(Session.class);
if (session != null) {
// this is needed in order to avoid loops in sync case when there're deletions, otherwise it could work with sling resources
@@ -227,7 +227,7 @@ public abstract class AbstractDistributi
return session;
}
- protected void ungetSession(Session session) {
+ private void ungetSession(Session session) {
if (session != null) {
try {
if (session.hasPendingChanges()) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java Thu Jan 19 15:03:06 2017
@@ -140,7 +140,7 @@ public class DistributionPackageUtils {
* Delete a distribution package, if deletion fails, ignore it
* @param distributionPackage the package to delete
*/
- public static void deleteSafely(DistributionPackage distributionPackage) {
+ private static void deleteSafely(DistributionPackage distributionPackage) {
if (distributionPackage != null) {
try {
distributionPackage.delete();
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackage.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackage.java Thu Jan 19 15:03:06 2017
@@ -97,7 +97,7 @@ public class FileDistributionPackage ext
}
- File getStatusFile() {
+ private File getStatusFile() {
String statusFilePath = file.getAbsolutePath() + ".status";
return new File(statusFilePath);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java Thu Jan 19 15:03:06 2017
@@ -18,8 +18,6 @@
*/
package org.apache.sling.distribution.packaging.impl;
-import static java.util.UUID.randomUUID;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
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=1779477&r1=1779476&r2=1779477&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 Jan 19 15:03:06 2017
@@ -182,7 +182,7 @@ public class ResourceDistributionPackage
}
- Resource uploadStream(ResourceResolver resourceResolver, Resource parent, InputStream stream, long size) throws PersistenceException {
+ private Resource uploadStream(ResourceResolver resourceResolver, Resource parent, InputStream stream, long size) throws PersistenceException {
String name;
log.debug("uploading stream");
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=1779477&r1=1779476&r2=1779477&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 Jan 19 15:03:06 2017
@@ -49,7 +49,6 @@ public class AsyncDeliveryDispatchingStr
private final List<String> queues;
private final Map<String, String> deliveryMappings;
- private final int MAX_QUEUE_ITEMS_THRESHOLD = 100;
/**
* create an async delivery strategy
@@ -77,6 +76,7 @@ public class AsyncDeliveryDispatchingStr
for (String referenceQueueName : deliveryMappings.keySet()) {
DistributionQueue queue = queueProvider.getQueue(referenceQueueName);
+ int MAX_QUEUE_ITEMS_THRESHOLD = 100;
if (queue.getStatus().getItemsCount() > MAX_QUEUE_ITEMS_THRESHOLD) {
// too many items in the queue, let's send actual packages and references separately
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java Thu Jan 19 15:03:06 2017
@@ -35,8 +35,8 @@ public class CachingDistributionQueue ex
// cache status for 30 sec as it is expensive to count items
private static final int EXPIRY_QUEUE_CACHE = 30 * 1000;
- static final Map<String, DistributionQueueStatus> queueCache = new ConcurrentHashMap<String, DistributionQueueStatus>();
- static final Map<String, Long> queueCacheExpiry = new ConcurrentHashMap<String, Long>();
+ private static final Map<String, DistributionQueueStatus> queueCache = new ConcurrentHashMap<String, DistributionQueueStatus>();
+ private static final Map<String, Long> queueCacheExpiry = new ConcurrentHashMap<String, Long>();
private final String cacheKey;
public CachingDistributionQueue(String cacheKey, DistributionQueue wrappedQueue) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java Thu Jan 19 15:03:06 2017
@@ -26,9 +26,9 @@ import org.apache.sling.distribution.que
import javax.annotation.Nonnull;
public abstract class DistributionQueueWrapper implements DistributionQueue {
- protected final DistributionQueue wrappedQueue;
+ final DistributionQueue wrappedQueue;
- public DistributionQueueWrapper(DistributionQueue wrappedQueue) {
+ DistributionQueueWrapper(DistributionQueue wrappedQueue) {
this.wrappedQueue = wrappedQueue;
}
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=1779477&r1=1779476&r2=1779477&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 Thu Jan 19 15:03:06 2017
@@ -121,8 +121,7 @@ public class JobHandlingDistributionQueu
List<Job> result = new ArrayList<Job>();
try {
- Map<String, Object>[] templates = null; // vargars compiler warning
- Collection<Job> jobs = jobManager.findJobs(QueryType.ALL, topic, actualLimit, templates);
+ Collection<Job> jobs = jobManager.findJobs(QueryType.ALL, topic, actualLimit);
int i = 0;
for (Job job : jobs) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java Thu Jan 19 15:03:06 2017
@@ -64,7 +64,7 @@ public class JobHandlingDistributionQueu
private BundleContext context;
private Set<String> processingQueueNames = null;
- private ConfigurationAdmin configAdmin;
+ private final ConfigurationAdmin configAdmin;
public JobHandlingDistributionQueueProvider(String prefix, JobManager jobManager, BundleContext context) {
this(prefix, jobManager, context, null);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java Thu Jan 19 15:03:06 2017
@@ -85,7 +85,7 @@ class JobHandlingUtils {
}
@CheckForNull
- public static String getQueueName(Job job) {
+ private static String getQueueName(Job job) {
String topic = job.getTopic();
if (topic == null || !topic.startsWith(JobHandlingDistributionQueue.DISTRIBUTION_QUEUE_TOPIC)) return null;
@@ -121,7 +121,7 @@ class JobHandlingUtils {
return null;
}
- public static String escapeId(String jobId) {
+ private static String escapeId(String jobId) {
//return id;
if (jobId == null) {
return null;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java Thu Jan 19 15:03:06 2017
@@ -109,11 +109,11 @@ public class DistributionConfigurationRe
return null;
}
- protected Map<String, Object> getChildResourceProperties(DistributionConfiguration config, String childResourceName) {
+ private Map<String, Object> getChildResourceProperties(DistributionConfiguration config, String childResourceName) {
return null;
}
- protected Iterable<String> getChildResourceChildren(DistributionConfiguration config, String childResourceName) {
+ private Iterable<String> getChildResourceChildren(DistributionConfiguration config, String childResourceName) {
return null;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java Thu Jan 19 15:03:06 2017
@@ -171,11 +171,11 @@ public abstract class AbstractReadableRe
}
- protected Map<String, Object> getResourceProperties(ResourceResolver resolver, SimplePathInfo pathInfo) {
+ Map<String, Object> getResourceProperties(ResourceResolver resolver, SimplePathInfo pathInfo) {
return getInternalResourceProperties(resolver, pathInfo);
}
- protected Iterable<String> getResourceChildren(ResourceResolver resolver, SimplePathInfo pathInfo) {
+ private Iterable<String> getResourceChildren(ResourceResolver resolver, SimplePathInfo pathInfo) {
return getInternalResourceChildren(resolver, pathInfo);
}
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=1779477&r1=1779476&r2=1779477&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 Jan 19 15:03:06 2017
@@ -55,7 +55,7 @@ public class FileVaultContentSerializer
private final Logger log = LoggerFactory.getLogger(getClass());
- static final String TYPE = "filevault";
+ private static final String TYPE = "filevault";
private static final String VERSION = "0.0.1";
private static final String PACKAGE_GROUP = "sling/distribution";
@@ -146,7 +146,7 @@ public class FileVaultContentSerializer
}
- protected Session getSession(ResourceResolver resourceResolver) throws RepositoryException {
+ private Session getSession(ResourceResolver resourceResolver) throws RepositoryException {
Session session = resourceResolver.adaptTo(Session.class);
if (session != null) {
DistributionJcrUtils.setDoNotDistribute(session);
@@ -156,7 +156,7 @@ public class FileVaultContentSerializer
return session;
}
- protected void ungetSession(Session session) {
+ private void ungetSession(Session session) {
if (session != null) {
try {
if (session.hasPendingChanges()) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java Thu Jan 19 15:03:06 2017
@@ -30,7 +30,7 @@ import org.apache.http.client.fluent.Exe
import org.apache.http.client.fluent.Request;
import org.apache.http.client.utils.URIBuilder;
-public class HttpTransportUtils {
+class HttpTransportUtils {
public static InputStream fetchNextPackage(Executor executor, URI distributionURI) throws URISyntaxException, IOException {
URI fetchUri = getFetchUri(distributionURI);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java Thu Jan 19 15:03:06 2017
@@ -168,7 +168,7 @@ public abstract class AbstractJcrEventTr
log.debug("current requests {}", requestList);
}
- void addMissingPaths(Set<String> allPaths) {
+ private void addMissingPaths(Set<String> allPaths) {
Set<String> newPaths = new HashSet<String>();
for (String path : allPaths) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DigestUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DigestUtils.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DigestUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DigestUtils.java Thu Jan 19 15:03:06 2017
@@ -88,7 +88,7 @@ public final class DigestUtils {
return targetDigest;
}
- public static void rewriteDigestMessage(DigestOutputStream digestOutput, OutputStream target) throws IOException {
+ private static void rewriteDigestMessage(DigestOutputStream digestOutput, OutputStream target) throws IOException {
final Writer writer = new OutputStreamWriter(target);
try {
readDigest(digestOutput.getMessageDigest(), writer);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStream.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStream.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStream.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStream.java Thu Jan 19 15:03:06 2017
@@ -31,7 +31,7 @@ import java.io.OutputStream;
import java.nio.ByteBuffer;
/**
- * {@link OutputStream} implementation which writes into a {@code byte[]} until a certain {@link #fileThreshold} is
+ * {@link OutputStream} implementation which writes into a {@code byte[]} until a certain threshold is
* reached and then starts writing into a {@code File} beyond that.
*/
public class FileBackedMemoryOutputStream extends OutputStream {
@@ -47,11 +47,11 @@ public class FileBackedMemoryOutputStrea
private final int memoryFactor;
- private MemoryUnit(int memoryFactor) {
+ MemoryUnit(int memoryFactor) {
this.memoryFactor = memoryFactor;
}
- };
+ }
private final ByteBuffer memory;
@@ -130,7 +130,7 @@ public class FileBackedMemoryOutputStrea
}
// method added just for testing purposes
- protected File getFile() {
+ File getFile() {
return file;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java Thu Jan 19 15:03:06 2017
@@ -29,7 +29,6 @@ import org.apache.sling.distribution.que
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
-import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.junit.Test;
import static org.mockito.Mockito.mock;
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java Thu Jan 19 15:03:06 2017
@@ -220,7 +220,7 @@ public class SimpleDistributionAgentTest
DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
DistributionQueueDispatchingStrategy dispatchingStrategy = mock(DistributionQueueDispatchingStrategy.class);
- when(dispatchingStrategy.getQueueNames()).thenReturn(Arrays.asList(new String[]{ "priority" }));
+ when(dispatchingStrategy.getQueueNames()).thenReturn(Arrays.asList("priority"));
DistributionEventFactory distributionEventFactory = mock(DistributionEventFactory.class);
ResourceResolverFactory resolverFactory = mock(ResourceResolverFactory.class);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java Thu Jan 19 15:03:06 2017
@@ -24,7 +24,6 @@ import org.apache.sling.distribution.age
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.junit.Test;
-import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
/**
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializerTest.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializerTest.java Thu Jan 19 15:03:06 2017
@@ -25,8 +25,6 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.OutputStream;
-import java.util.LinkedList;
-import java.util.List;
import org.apache.jackrabbit.vault.fs.api.ImportMode;
import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
@@ -45,8 +43,6 @@ import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.same;
import static org.mockito.Mockito.*;
/**
@@ -54,13 +50,10 @@ import static org.mockito.Mockito.*;
*/
public class FileVaultContentSerializerTest {
- private MockHelper helper;
- private ResourceResolver resourceResolver;
-
@Before
public void setUp() throws Exception {
- resourceResolver = new MockResourceResolverFactory().getResourceResolver(null);
- helper = MockHelper.create(resourceResolver).resource("/libs").p("prop", "value")
+ ResourceResolver resourceResolver = new MockResourceResolverFactory().getResourceResolver(null);
+ MockHelper helper = MockHelper.create(resourceResolver).resource("/libs").p("prop", "value")
.resource("sub").p("sub", "hello")
.resource(".sameLevel")
.resource("/apps").p("foo", "baa");
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTriggerTest.java?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTriggerTest.java Thu Jan 19 15:03:06 2017
@@ -42,14 +42,13 @@ import static org.mockito.Mockito.mock;
*/
public class AbstractJcrEventTriggerTest {
- private MockHelper helper;
private MockResourceResolverFactory rrf;
@Before
public void setUp() throws Exception {
rrf = new MockResourceResolverFactory();
ResourceResolver resourceResolver = rrf.getResourceResolver(null);
- helper = MockHelper.create(resourceResolver).resource("/a").resource("b").resource("c").resource("d")
+ MockHelper helper = MockHelper.create(resourceResolver).resource("/a").resource("b").resource("c").resource("d")
.resource("e").resource("f").resource("g").p("foo", true).resource(".h").p("foo", false);
helper.commit();
}
Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1779477&r1=1779476&r2=1779477&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Thu Jan 19 15:03:06 2017
@@ -133,6 +133,8 @@
<configuration>
<excludes>
<exclude>derby.log</exclude>
+ <exclude>**/sling.properties</exclude>
+ <exclude>**/cache.lock</exclude>
<exclude>src/main/resources/**/*.*</exclude>
<exclude>src/test/resources/**/*.*</exclude>
</excludes>