Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java Wed Sep 9 12:09:19 2015 @@ -19,24 +19,20 @@ package org.apache.sling.distribution.serialization.impl.vlt; -import java.io.ByteArrayInputStream; +import javax.annotation.Nonnull; +import javax.jcr.Node; +import javax.jcr.Property; +import javax.jcr.RepositoryException; +import javax.jcr.Session; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.util.Properties; import java.util.TreeMap; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.jcr.Node; -import javax.jcr.Property; -import javax.jcr.RepositoryException; -import javax.jcr.Session; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.vault.fs.api.ImportMode; import org.apache.jackrabbit.vault.fs.api.PathFilterSet; import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter; @@ -49,7 +45,6 @@ import org.apache.jackrabbit.vault.packa import org.apache.jackrabbit.vault.packaging.PackageId; import org.apache.jackrabbit.vault.packaging.Packaging; import org.apache.jackrabbit.vault.packaging.VaultPackage; -import org.apache.jackrabbit.vault.util.JcrConstants; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; @@ -59,17 +54,17 @@ import org.apache.sling.distribution.ser import org.apache.sling.distribution.serialization.impl.AbstractDistributionPackageBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + /** * a {@link org.apache.sling.distribution.serialization.DistributionPackageBuilder} based on Apache Jackrabbit FileVault. * <p/> * Each {@link org.apache.sling.distribution.packaging.DistributionPackage} created by {@link JcrVaultDistributionPackageBuilder} is * backed by a {@link org.apache.jackrabbit.vault.packaging.JcrPackage}. */ -public class JcrVaultDistributionPackageBuilder extends AbstractDistributionPackageBuilder implements +public class JcrVaultDistributionPackageBuilder extends AbstractDistributionPackageBuilder implements DistributionPackageBuilder { private final Logger log = LoggerFactory.getLogger(getClass()); - private static final String VERSION = "0.0.1"; private static final String PACKAGE_GROUP = "sling/distribution"; @@ -81,7 +76,7 @@ public class JcrVaultDistributionPackage private final File tempDirectory; private final TreeMap<String, PathFilterSet> filters; - public JcrVaultDistributionPackageBuilder(String type, Packaging packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] packageRoots, String[] filterRules, String tempFilesFolder, String tempPackagesNode) { + public JcrVaultDistributionPackageBuilder(String type, Packaging packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] packageRoots, String[] filterRules, String tempFilesFolder, String tempPackagesNode) { super(type); this.packaging = packaging; @@ -105,7 +100,7 @@ public class JcrVaultDistributionPackage session = getSession(resourceResolver); String packageGroup = PACKAGE_GROUP; - String packageName = getType() + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID(); + String packageName = getType() + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID(); WorkspaceFilter filter = VltUtils.createFilter(request, filters); ExportOptions opts = VltUtils.getExportOptions(filter, packageRoots, packageGroup, packageName, VERSION); @@ -174,8 +169,7 @@ public class JcrVaultDistributionPackage try { session = getSession(resourceResolver); - String packageName = id; - JcrPackage jcrPackage = openPackage(session, packageName); + JcrPackage jcrPackage = openPackage(session, id); return new JcrVaultDistributionPackage(getType(), jcrPackage, session); } catch (RepositoryException e) { @@ -186,7 +180,6 @@ public class JcrVaultDistributionPackage } } - private JcrPackage uploadPackage(Session session, VaultPackage pack) throws IOException, RepositoryException { JcrPackageManager packageManager = packaging.getPackageManager(session); @@ -206,8 +199,7 @@ public class JcrVaultDistributionPackage return jcrPackage; } else { - JcrPackage jcrPackage = packageManager.upload(in, true); - return jcrPackage; + return packageManager.upload(in, true); } } finally { IOUtils.closeQuietly(in); @@ -223,11 +215,9 @@ public class JcrVaultDistributionPackage if (packageRoot != null) { Node packageNode = packageRoot.getNode(packageId.getDownloadName()); - JcrPackage jcrPackage = packageManager.open(packageNode); - return jcrPackage; + return packageManager.open(packageNode); } else { - JcrPackage jcrPackage = packageManager.open(packageId); - return jcrPackage; + return packageManager.open(packageId); } }
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java Wed Sep 9 12:09:19 2015 @@ -43,6 +43,9 @@ import org.apache.sling.distribution.ser import org.apache.sling.distribution.serialization.DistributionPackageReadingException; import org.apache.sling.distribution.serialization.impl.ResourceSharedDistributionPackageBuilder; +/** + * A package builder for Apache Jackrabbit FileVault based implementations. + */ @Component(metatype = true, label = "Apache Sling Distribution Packaging - Vault Package Builder Factory", description = "OSGi configuration for vault package builders", @@ -53,7 +56,6 @@ import org.apache.sling.distribution.ser @Service(DistributionPackageBuilder.class) public class VaultDistributionPackageBuilderFactory implements DistributionPackageBuilder { - /** * name of this package builder. */ @@ -61,7 +63,6 @@ public class VaultDistributionPackageBui public static final String NAME = DistributionComponentConstants.PN_NAME; - /** * type of this package builder. */ @@ -130,7 +131,7 @@ public class VaultDistributionPackageBui String[] packageRoots = SettingsUtils.removeEmptyEntries(PropertiesUtil.toStringArray(config.get(PACKAGE_ROOTS), null)); String[] packageFilters = SettingsUtils.removeEmptyEntries(PropertiesUtil.toStringArray(config.get(PACKAGE_FILTERS), null)); - String tempFsFolder = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(TEMP_FS_FOLDER), null)); + String tempFsFolder = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(TEMP_FS_FOLDER), null)); String tempJcrFolder = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(TEMP_JCR_FOLDER), null)); ImportMode importMode = null; @@ -140,22 +141,20 @@ public class VaultDistributionPackageBui AccessControlHandling aclHandling = null; if (aclHandlingString != null) { - aclHandling= AccessControlHandling.valueOf(aclHandlingString.trim()); + aclHandling = AccessControlHandling.valueOf(aclHandlingString.trim()); } if ("filevlt".equals(type)) { packageBuilder = new ResourceSharedDistributionPackageBuilder(new FileVaultDistributionPackageBuilder(name, packaging, importMode, aclHandling, packageRoots, packageFilters, tempFsFolder)); - } else { + } else { packageBuilder = new ResourceSharedDistributionPackageBuilder(new JcrVaultDistributionPackageBuilder(name, packaging, importMode, aclHandling, packageRoots, packageFilters, tempFsFolder, tempJcrFolder)); } } - public String getType() { return packageBuilder.getType(); } - public DistributionPackage createPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionPackageBuildingException { return packageBuilder.createPackage(resourceResolver, request); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java Wed Sep 9 12:09:19 2015 @@ -16,14 +16,22 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.sling.distribution.serialization.impl.vlt; - +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.List; +import java.util.NavigableMap; +import java.util.Properties; +import java.util.TreeMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.util.Text; import org.apache.jackrabbit.vault.fs.api.ImportMode; import org.apache.jackrabbit.vault.fs.api.PathFilterSet; import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter; @@ -36,24 +44,10 @@ import org.apache.jackrabbit.vault.fs.io import org.apache.jackrabbit.vault.packaging.ExportOptions; import org.apache.jackrabbit.vault.packaging.JcrPackage; import org.apache.jackrabbit.vault.packaging.PackageManager; -import org.apache.jackrabbit.vault.packaging.Packaging; import org.apache.jackrabbit.vault.packaging.VaultPackage; import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.component.impl.SettingsUtils; -import javax.jcr.Node; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.NavigableMap; -import java.util.Properties; -import java.util.SortedMap; -import java.util.TreeMap; - /** * Utility class for creating vlt filters and import/export options */ @@ -160,7 +154,6 @@ public class VltUtils { } - if (packageRoot == null || !packageRoot.startsWith("/")) { packageRoot = "/"; } @@ -173,15 +166,13 @@ public class VltUtils { ImportOptions opts = new ImportOptions(); if (aclHandling != null) { opts.setAccessControlHandling(aclHandling); - } - else { + } else { // default to overwrite opts.setAccessControlHandling(AccessControlHandling.OVERWRITE); } if (importMode != null) { opts.setImportMode(importMode); - } - else { + } else { // default to update opts.setImportMode(ImportMode.UPDATE); } @@ -193,8 +184,7 @@ public class VltUtils { File file = File.createTempFile("distr-vault-create-" + System.nanoTime(), ".zip", tempFolder); try { - VaultPackage vaultPackage = packageManager.assemble(session, options, file); - return vaultPackage; + return packageManager.assemble(session, options, file); } catch (RepositoryException e) { FileUtils.deleteQuietly(file); throw e; @@ -258,7 +248,6 @@ public class VltUtils { return directory; } - public static String findParent(String path, String nodeName) { path = path.endsWith("/") ? path : path + "/"; @@ -273,7 +262,6 @@ public class VltUtils { return path.substring(0, idx); } - public static TreeMap<String, PathFilterSet> parseFilters(String[] filters) { TreeMap<String, PathFilterSet> result = new TreeMap<String, PathFilterSet>(); @@ -292,7 +280,7 @@ public class VltUtils { PathFilterSet filterSet = new PathFilterSet(); - for (int i=1; i < filterParts.length; i++) { + for (int i = 1; i < filterParts.length; i++) { String filterPart = SettingsUtils.removeEmptyEntry(filterParts[i]); if (filterPart == null) { continue; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java Wed Sep 9 12:09:19 2015 @@ -18,25 +18,21 @@ */ package org.apache.sling.distribution.servlet; +import javax.servlet.ServletException; +import java.io.IOException; +import java.io.PrintWriter; + import org.apache.felix.scr.annotations.sling.SlingServlet; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; -import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.servlets.SlingAllMethodsServlet; import org.apache.sling.distribution.DistributionRequest; -import org.apache.sling.distribution.DistributionResponse; -import org.apache.sling.distribution.agent.DistributionAgent; -import org.apache.sling.distribution.agent.DistributionAgentException; import org.apache.sling.distribution.log.DistributionLog; import org.apache.sling.distribution.resources.DistributionResourceTypes; import org.apache.sling.distribution.util.RequestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletException; -import java.io.IOException; -import java.io.PrintWriter; - /** * Servlet to ask {@link org.apache.sling.distribution.agent.DistributionAgent}s to distribute (via HTTP POST). */ Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java Wed Sep 9 12:09:19 2015 @@ -47,11 +47,9 @@ public class DistributionAgentQueueServl private final Logger log = LoggerFactory.getLogger(getClass()); - @Reference DistributionPackageBuilderProvider packageBuilderProvider; - @Override protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { @@ -69,14 +67,12 @@ public class DistributionAgentQueueServl if (idParam != null) { deleteItems(resourceResolver, queue, idParam); - } - else { + } else { int limit = 1; try { limit = Integer.parseInt(limitParam); - } - catch (NumberFormatException ex) { - + } catch (NumberFormatException ex) { + log.warn("limit param malformed : "+limitParam, ex); } deleteItems(resourceResolver, queue, limit); } @@ -84,13 +80,13 @@ public class DistributionAgentQueueServl } protected void deleteItems(ResourceResolver resourceResolver, DistributionQueue queue, int limit) { - for(DistributionQueueEntry item : queue.getItems(0, limit)) { + for (DistributionQueueEntry item : queue.getItems(0, limit)) { deleteItem(resourceResolver, queue, item); - } + } } protected void deleteItems(ResourceResolver resourceResolver, DistributionQueue queue, String[] ids) { - for(String id : ids) { + for (String id : ids) { DistributionQueueEntry item = queue.getItem(id); deleteItem(resourceResolver, queue, item); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java Wed Sep 9 12:09:19 2015 @@ -26,9 +26,9 @@ import org.apache.sling.api.SlingHttpSer import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.servlets.SlingAllMethodsServlet; -import org.apache.sling.distribution.agent.DistributionAgent; import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.DistributionResponse; +import org.apache.sling.distribution.agent.DistributionAgent; import org.apache.sling.distribution.resources.DistributionResourceTypes; import org.apache.sling.distribution.util.RequestUtils; import org.slf4j.Logger; 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=1701984&r1=1701983&r2=1701984&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 Wed Sep 9 12:09:19 2015 @@ -48,7 +48,6 @@ public class DistributionPackageExporter private final Logger log = LoggerFactory.getLogger(getClass()); - @Override protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { @@ -75,7 +74,6 @@ public class DistributionPackageExporter } } - protected void exportOnePackage(SlingHttpServletRequest request, SlingHttpServletResponse response, boolean delete) throws ServletException, IOException { @@ -124,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.info("exported package {} was sent (and deleted={}), bytes written {}", new Object[]{packageId, delete, bytesCopied}); } else { log.warn("fetched a null package"); } @@ -143,8 +141,6 @@ public class DistributionPackageExporter } } - - void deletePackage(final SlingHttpServletRequest request, final SlingHttpServletResponse response) { DistributionPackageExporter distributionPackageExporter = request .getResource() 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=1701984&r1=1701983&r2=1701984&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 Wed Sep 9 12:09:19 2015 @@ -27,10 +27,8 @@ import org.apache.sling.api.SlingHttpSer import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.servlets.SlingAllMethodsServlet; -import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageImporter; import org.apache.sling.distribution.packaging.DistributionPackageInfo; -import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils; import org.apache.sling.distribution.resources.DistributionResourceTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java Wed Sep 9 12:09:19 2015 @@ -19,6 +19,8 @@ package org.apache.sling.distribution.servlet; +import java.io.IOException; + import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; @@ -26,8 +28,6 @@ import org.apache.sling.distribution.Dis import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * Utility class for writing json data to http responses. */ Modified: 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/core/DistributionTransport.java?rev=1701984&r1=1701983&r2=1701984&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/core/DistributionTransport.java Wed Sep 9 12:09:19 2015 @@ -23,8 +23,6 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; -import org.apache.sling.distribution.transport.DistributionTransportSecret; -import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; /** * A transport layer implementation to transport data between two (or eventually more) Sling instances. Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransport.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransport.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransport.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransport.java Wed Sep 9 12:09:19 2015 @@ -36,11 +36,9 @@ import org.apache.sling.api.resource.Res import org.apache.sling.distribution.log.impl.DefaultDistributionLog; import org.apache.sling.distribution.packaging.DistributionPackage; 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.DistributionTransportException; -import org.apache.sling.distribution.transport.DistributionTransportSecret; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Advanced HTTP {@link org.apache.sling.distribution.transport.core.DistributionTransport} supporting custom HTTP headers @@ -83,8 +81,8 @@ public class AdvancedHttpDistributionTra @Override public void deliverPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionTransportException { log.info("delivering package {} to {} using auth {}", - new Object[]{distributionPackage.getId(), - distributionEndpoint.getUri(), secretProvider}); + distributionPackage.getId(), + distributionEndpoint.getUri(), secretProvider); try { DistributionTransportSecret secret = secretProvider.getSecret(distributionEndpoint.getUri()); @@ -137,7 +135,7 @@ public class AdvancedHttpDistributionTra } private void deliverPackage(Executor executor, DistributionPackage distributionPackage, - DistributionEndpoint distributionEndpoint) throws IOException { + DistributionEndpoint distributionEndpoint) throws IOException { String type = distributionPackage.getType(); Request req = Request.Post(distributionEndpoint.getUri()).useExpectContinue(); 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=1701984&r1=1701983&r2=1701984&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 Wed Sep 9 12:09:19 2015 @@ -19,6 +19,12 @@ package org.apache.sling.distribution.transport.impl; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Map; + import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -28,25 +34,17 @@ import org.apache.http.client.utils.URIB import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Map; - public class HttpTransportUtils { static final Logger log = LoggerFactory.getLogger(HttpTransportUtils.class); public final static String HEADER_DISTRIBUTION_ORIGINAL_ID = "X-Distribution-OriginalId"; - public static InputStream fetchNextPackage(Executor executor, URI distributionURI, Map<String, String> headers) throws URISyntaxException, IOException { // always clear the result headers map headers.clear(); - URI fetchUri = getFetchUri(distributionURI); Request fetchReq = Request.Post(fetchUri).useExpectContinue(); HttpResponse httpResponse = executor.execute(fetchReq).returnResponse(); @@ -69,8 +67,6 @@ public class HttpTransportUtils { return entity.getContent(); } - - public static boolean deletePackage(Executor executor, URI distributionURI, String remotePackageId) throws URISyntaxException, IOException { URI deleteUri = getDeleteUri(distributionURI, remotePackageId); @@ -80,7 +76,6 @@ public class HttpTransportUtils { return httpResponse.getStatusLine().getStatusCode() == 200; } - public static URI getFetchUri(URI uri) throws URISyntaxException { URIBuilder uriBuilder = new URIBuilder(uri); uriBuilder.addParameter("operation", "fetch"); @@ -88,8 +83,6 @@ public class HttpTransportUtils { return uriBuilder.build(); } - - public static URI getDeleteUri(URI uri, String id) throws URISyntaxException { URIBuilder uriBuilder = new URIBuilder(uri); uriBuilder.addParameter("operation", "delete"); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransport.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransport.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransport.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransport.java Wed Sep 9 12:09:19 2015 @@ -29,10 +29,8 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.component.impl.SettingsUtils; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageInfo; -import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.apache.sling.distribution.transport.core.DistributionTransport; import org.apache.sling.distribution.transport.core.DistributionTransportException; -import org.apache.sling.distribution.transport.DistributionTransportSecret; /** * {@link org.apache.sling.distribution.transport.core.DistributionTransport} supporting delivery / retrieval from multiple @@ -43,7 +41,6 @@ public class MultipleEndpointDistributio private final Map<String, DistributionTransport> transportHelpers; private final TransportEndpointStrategyType endpointStrategyType; - public MultipleEndpointDistributionTransport(Map<String, DistributionTransport> transportHelpers, TransportEndpointStrategyType endpointStrategyType) { this.transportHelpers = new TreeMap<String, DistributionTransport>(); @@ -60,8 +57,7 @@ public class MultipleEndpointDistributio if (endpointStrategyType.equals(TransportEndpointStrategyType.One)) { DistributionPackageInfo info = distributionPackage.getInfo(); - String queueName = info == null ? null : info.getQueue(); - + String queueName = info.getQueue(); DistributionTransport distributionTransport = getDefaultTransport(); if (queueName != null) { @@ -72,9 +68,8 @@ public class MultipleEndpointDistributio distributionTransport.deliverPackage(resourceResolver, distributionPackage); } - - } else if (endpointStrategyType.equals(TransportEndpointStrategyType.All)) { - for (DistributionTransport distributionTransport: transportHelpers.values()) { + } else if (endpointStrategyType.equals(TransportEndpointStrategyType.All)) { + for (DistributionTransport distributionTransport : transportHelpers.values()) { distributionTransport.deliverPackage(resourceResolver, distributionPackage); } @@ -100,8 +95,8 @@ public class MultipleEndpointDistributio } - } else if (endpointStrategyType.equals(TransportEndpointStrategyType.All)) { - for (DistributionTransport distributionTransport: transportHelpers.values()) { + } else if (endpointStrategyType.equals(TransportEndpointStrategyType.All)) { + for (DistributionTransport distributionTransport : transportHelpers.values()) { Iterable<DistributionPackage> retrievedPackages = distributionTransport.retrievePackages(resourceResolver, distributionRequest); for (DistributionPackage retrievedPackage : retrievedPackages) { @@ -118,7 +113,7 @@ public class MultipleEndpointDistributio java.util.Collection<DistributionTransport> var = transportHelpers.values(); DistributionTransport[] handlers = var.toArray(new DistributionTransport[var.size()]); - if (handlers != null && handlers.length > 0) { + if (handlers.length > 0) { return handlers[0]; } @@ -126,6 +121,4 @@ public class MultipleEndpointDistributio } - - } 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=1701984&r1=1701983&r2=1701984&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 Wed Sep 9 12:09:19 2015 @@ -28,10 +28,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.http.Header; -import org.apache.http.HttpEntity; import org.apache.http.HttpHost; -import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Content; import org.apache.http.client.fluent.Executor; import org.apache.http.client.fluent.Request; @@ -45,22 +42,20 @@ import org.apache.sling.distribution.log import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.serialization.DistributionPackageBuilder; -import org.apache.sling.distribution.servlet.ServletJsonUtils; +import org.apache.sling.distribution.transport.DistributionTransportSecret; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.apache.sling.distribution.transport.core.DistributionTransport; import org.apache.sling.distribution.transport.core.DistributionTransportException; -import org.apache.sling.distribution.transport.DistributionTransportSecret; import org.apache.sling.distribution.util.RequestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +/** + * default HTTP implementation of {@link DistributionTransport} + */ public class SimpleHttpDistributionTransport implements DistributionTransport { - private static final String USERNAME = "username"; private static final String PASSWORD = "password"; - protected final DefaultDistributionLog log; private final DistributionEndpoint distributionEndpoint; private final DistributionPackageBuilder packageBuilder; @@ -93,11 +88,9 @@ public class SimpleHttpDistributionTrans DistributionTransportSecret secret = secretProvider.getSecret(distributionEndpoint.getUri()); - log.info("delivering package {} to {} with user {}", new Object[]{ - distributionPackage.getId(), + log.info("delivering package {} to {} with user {}", distributionPackage.getId(), distributionEndpoint.getUri(), - secret.asCredentialsMap().get(USERNAME) - }); + secret.asCredentialsMap().get(USERNAME)); executor = authenticate(secret, executor); @@ -115,11 +108,9 @@ public class SimpleHttpDistributionTrans } Content content = response.returnContent(); - log.info("delivered package {} of type {} with paths {}", new Object[]{ - distributionPackage.getId(), + log.info("delivered package {} of type {} with paths {}", distributionPackage.getId(), distributionPackage.getType(), - Arrays.toString(distributionPackage.getInfo().getPaths()), - }); + Arrays.toString(distributionPackage.getInfo().getPaths())); } catch (Exception ex) { throw new DistributionTransportException(ex); } @@ -144,7 +135,7 @@ public class SimpleHttpDistributionTrans DistributionTransportSecret secret = secretProvider.getSecret(distributionEndpoint.getUri()); executor = authenticate(secret, executor); - Request req = Request.Post(distributionURI).useExpectContinue(); +// Request req = Request.Post(distributionURI).useExpectContinue(); // TODO : add queue parameter Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/TransportEndpointStrategyType.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/TransportEndpointStrategyType.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/TransportEndpointStrategyType.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/TransportEndpointStrategyType.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.transport.impl; +/** + * Strategy options enum for transport + */ public enum TransportEndpointStrategyType { One, All 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=1701984&r1=1701983&r2=1701984&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 Wed Sep 9 12:09:19 2015 @@ -55,6 +55,7 @@ public abstract class AbstractJcrEventTr private final Map<String, JcrEventDistributionTriggerListener> registeredListeners = new ConcurrentHashMap<String, JcrEventDistributionTriggerListener>(); private final String path; + private final String serviceUser; private final SlingRepository repository; @@ -139,9 +140,9 @@ public abstract class AbstractJcrEventTr } private void addToList(DistributionRequest request, List<DistributionRequest> requestList) { - DistributionRequest lastRequest = requestList.isEmpty()? null : requestList.get(requestList.size() - 1); + DistributionRequest lastRequest = requestList.isEmpty() ? null : requestList.get(requestList.size() - 1); - if (lastRequest == null || lastRequest.getRequestType() == null || !lastRequest.getRequestType().equals(request.getRequestType())) { + if (lastRequest == null || !lastRequest.getRequestType().equals(request.getRequestType())) { requestList.add(request); } else if (hasDeepPaths(request) || hasDeepPaths(lastRequest)) { requestList.add(request); @@ -149,7 +150,7 @@ public abstract class AbstractJcrEventTr Set<String> allPaths = new TreeSet<String>(); allPaths.addAll(Arrays.asList(lastRequest.getPaths())); allPaths.addAll(Arrays.asList(request.getPaths())); - lastRequest = new SimpleDistributionRequest(lastRequest.getRequestType(), allPaths.toArray(new String[0])); + lastRequest = new SimpleDistributionRequest(lastRequest.getRequestType(), allPaths.toArray(new String[allPaths.size()])); requestList.set(requestList.size() - 1, lastRequest); } } @@ -159,7 +160,7 @@ public abstract class AbstractJcrEventTr } public void disable() { - for (JcrEventDistributionTriggerListener listener: registeredListeners.values()) { + for (JcrEventDistributionTriggerListener listener : registeredListeners.values()) { Session session; try { session = getSession(); @@ -205,7 +206,7 @@ public abstract class AbstractJcrEventTr Session getSession() throws RepositoryException { return cachedSession != null ? cachedSession : (cachedSession = repository.loginAdministrative(null)); // TODO: change after SLING-4312 - // : (cachedSession = repository.loginService(serviceUser, null)); + // : (cachedSession = repository.loginService(serviceUser, null)); } @@ -230,7 +231,7 @@ public abstract class AbstractJcrEventTr return false; } - for (String path: distributionRequest.getPaths()) { + for (String path : distributionRequest.getPaths()) { if (distributionRequest.isDeep(path)) { return true; } @@ -251,7 +252,7 @@ public abstract class AbstractJcrEventTr } public void run() { - for (DistributionRequest request: requestList) { + for (DistributionRequest request : requestList) { requestHandler.handle(request); } } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTrigger.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTrigger.java Wed Sep 9 12:09:19 2015 @@ -67,7 +67,6 @@ public class DistributionEventDistribute properties.put(EventConstants.EVENT_TOPIC, DistributionEventTopics.AGENT_PACKAGE_DISTRIBUTED); log.info("handler {} will chain distribute on path '{}'", requestHandler, pathPrefix); -// properties.put(EventConstants.EVENT_FILTER, "(path=" + path + "/*)"); if (bundleContext != null) { ServiceRegistration triggerPathEventRegistration = bundleContext.registerService(EventHandler.class.getName(), new TriggerAgentEventListener(requestHandler, pathPrefix), properties); @@ -87,7 +86,6 @@ public class DistributionEventDistribute } } - public void disable() { for (Map.Entry<String, ServiceRegistration> entry : registrations.entrySet()) { if (entry.getValue() != null) { @@ -97,7 +95,6 @@ public class DistributionEventDistribute registrations.clear(); } - private class TriggerAgentEventListener implements EventHandler { private final DistributionRequestHandler requestHandler; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.trigger.impl; +import javax.annotation.Nonnull; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; @@ -31,9 +34,6 @@ import org.apache.sling.distribution.tri import org.apache.sling.distribution.trigger.DistributionTriggerException; import org.osgi.framework.BundleContext; -import javax.annotation.Nonnull; -import java.util.Map; - @Component(metatype = true, label = "Apache Sling Distribution Trigger - Distribution Event Triggers Factory", configurationFactory = true, @@ -60,7 +60,7 @@ public class DistributionEventDistribute public void activate(BundleContext bundleContext, Map<String, Object> config) { String path = PropertiesUtil.toString(config.get(PATH), null); - trigger = new DistributionEventDistributeDistributionTrigger(path, bundleContext); + trigger = new DistributionEventDistributeDistributionTrigger(path, bundleContext); } @Deactivate Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.trigger.impl; +import javax.annotation.Nonnull; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; @@ -35,9 +38,6 @@ import org.apache.sling.distribution.tri import org.apache.sling.jcr.api.SlingRepository; import org.osgi.framework.BundleContext; -import javax.annotation.Nonnull; -import java.util.Map; - @Component(metatype = true, label = "Apache Sling Distribution Trigger - Jcr Event Triggers Factory", configurationFactory = true, @@ -70,7 +70,6 @@ public class JcrEventDistributionTrigger public static final String SERVICE_NAME = "serviceName"; - JcrEventDistributionTrigger trigger; @Reference @@ -88,7 +87,7 @@ public class JcrEventDistributionTrigger ignoredPathsPatterns = SettingsUtils.removeEmptyEntries(ignoredPathsPatterns); - trigger = new JcrEventDistributionTrigger(repository, scheduler, path, serviceName, ignoredPathsPatterns); + trigger = new JcrEventDistributionTrigger(repository, scheduler, path, serviceName, ignoredPathsPatterns); trigger.enable(); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.trigger.impl; +import javax.annotation.Nonnull; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; @@ -34,9 +37,6 @@ import org.apache.sling.distribution.tri import org.apache.sling.jcr.api.SlingRepository; import org.osgi.framework.BundleContext; -import javax.annotation.Nonnull; -import java.util.Map; - @Component(metatype = true, label = "Apache Sling Distribution Trigger - Persisted Jcr Event Triggers Factory", configurationFactory = true, @@ -70,7 +70,6 @@ public class PersistedJcrEventDistributi public static final String NUGGETS_PATH = "nuggetsPath"; - PersistedJcrEventDistributionTrigger trigger; @Reference @@ -87,13 +86,13 @@ public class PersistedJcrEventDistributi String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null); String nuggetsPath = PropertiesUtil.toString(config.get(NUGGETS_PATH), null); - trigger = new PersistedJcrEventDistributionTrigger(repository, scheduler, path, serviceName, nuggetsPath); + trigger = new PersistedJcrEventDistributionTrigger(repository, scheduler, path, serviceName, nuggetsPath); trigger.enable(); } @Deactivate public void deactivate() { - trigger.disable(); + trigger.disable(); } public void register(@Nonnull DistributionRequestHandler requestHandler) throws DistributionTriggerException { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.trigger.impl; +import javax.annotation.Nonnull; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; @@ -34,9 +37,6 @@ import org.apache.sling.distribution.tri import org.apache.sling.distribution.trigger.DistributionTriggerException; import org.osgi.framework.BundleContext; -import javax.annotation.Nonnull; -import java.util.Map; - @Component(metatype = true, label = "Apache Sling Distribution Trigger - Remote Event Triggers Factory", configurationFactory = true, @@ -68,7 +68,6 @@ public class RemoteEventDistributionTrig RemoteEventDistributionTrigger trigger; - @Activate public void activate(BundleContext bundleContext, Map<String, Object> config) { String endpoint = PropertiesUtil.toString(config.get(ENDPOINT), null); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java Wed Sep 9 12:09:19 2015 @@ -72,7 +72,7 @@ public class ResourceEventDistributionTr public void disable() { for (ServiceRegistration serviceRegistration : registrations.values()) { - serviceRegistration.unregister(); + serviceRegistration.unregister(); } registrations.clear(); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.trigger.impl; +import javax.annotation.Nonnull; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; @@ -33,9 +36,6 @@ import org.apache.sling.distribution.tri import org.apache.sling.jcr.api.SlingRepository; import org.osgi.framework.BundleContext; -import javax.annotation.Nonnull; -import java.util.Map; - @Component(metatype = true, label = "Apache Sling Distribution Trigger - Resource Event Triggers Factory", configurationFactory = true, @@ -46,7 +46,6 @@ import java.util.Map; public class ResourceEventDistributionTriggerFactory implements DistributionTrigger { - @Property(label = "Name", description = "The name of the trigger.") public static final String NAME = DistributionComponentConstants.PN_NAME; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java Wed Sep 9 12:09:19 2015 @@ -19,6 +19,9 @@ package org.apache.sling.distribution.trigger.impl; import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import org.apache.sling.commons.scheduler.ScheduleOptions; import org.apache.sling.commons.scheduler.Scheduler; @@ -30,10 +33,6 @@ import org.apache.sling.distribution.tri import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - /** * {@link org.apache.sling.distribution.trigger.DistributionTrigger} to schedule distributions on a certain * {@link org.apache.sling.distribution.agent.DistributionAgent} @@ -53,7 +52,6 @@ public class ScheduledDistributionTrigge private Set<String> registeredJobs = Collections.synchronizedSet(new HashSet<String>()); - public ScheduledDistributionTrigger(String distributionActionName, String path, int secondsInterval, Scheduler scheduler) { this.distributionAction = DistributionRequestType.fromName(distributionActionName); this.path = path; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java Wed Sep 9 12:09:19 2015 @@ -18,6 +18,9 @@ */ package org.apache.sling.distribution.trigger.impl; +import javax.annotation.Nonnull; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; @@ -35,9 +38,6 @@ import org.apache.sling.distribution.tri import org.apache.sling.jcr.api.SlingRepository; import org.osgi.framework.BundleContext; -import javax.annotation.Nonnull; -import java.util.Map; - @Component(metatype = true, label = "Apache Sling Distribution Trigger - Scheduled Triggers Factory", configurationFactory = true, @@ -85,12 +85,12 @@ public class ScheduledDistributionTrigge String path = PropertiesUtil.toString(config.get(PATH), null); int interval = PropertiesUtil.toInteger(config.get(SECONDS), 30); - trigger = new ScheduledDistributionTrigger(action, path, interval, scheduler); + trigger = new ScheduledDistributionTrigger(action, path, interval, scheduler); } @Deactivate public void deactivate() { - trigger.disable(); + trigger.disable(); } public void register(@Nonnull DistributionRequestHandler requestHandler) throws DistributionTriggerException { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java Wed Sep 9 12:09:19 2015 @@ -23,10 +23,10 @@ import java.net.URI; import java.net.URISyntaxException; import org.apache.http.client.utils.URIBuilder; -import org.apache.sling.distribution.SimpleDistributionRequest; -import org.apache.sling.distribution.impl.DistributionParameter; import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; +import org.apache.sling.distribution.impl.DistributionParameter; /** * Utility class for HTTP / distribution request related operations. @@ -54,7 +54,7 @@ public class RequestUtils { String[] paths = distributionRequest.getPaths(); if (paths != null) { - for (String path: paths) { + for (String path : paths) { uriBuilder.addParameter(DistributionParameter.PATH.toString(), path); } } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/package-info.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/package-info.java?rev=1701984&r1=1701983&r2=1701984&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/package-info.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/package-info.java Wed Sep 9 12:09:19 2015 @@ -17,8 +17,7 @@ * under the License. */ -@Version("0.1.0") -package org.apache.sling.distribution.util; +@Version("0.1.0") package org.apache.sling.distribution.util; import aQute.bnd.annotation.Version;
