sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomm...@apache.org
Subject svn commit: r1637333 [3/12] - in /sling/trunk/contrib/extensions: distribution/ distribution/core/ distribution/core/src/main/java/org/apache/sling/distribution/ distribution/core/src/main/java/org/apache/sling/distribution/agent/ distribution/core/src...
Date Fri, 07 Nov 2014 10:28:08 GMT
Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationRequest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationRequest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationRequest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java Fri Nov  7 10:28:02 2014
@@ -16,52 +16,52 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.communication;
+package org.apache.sling.distribution.communication;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
 
 /**
- * A replication request
+ * A distribution request
  */
-public class ReplicationRequest {
+public class DistributionRequest {
 
     private final long time;
 
-    private final ReplicationActionType action;
+    private final DistributionActionType action;
 
     private final String[] paths;
 
-    public ReplicationRequest(@Nonnull ReplicationActionType action, @Nonnull String[] paths) {
+    public DistributionRequest(@Nonnull DistributionActionType action, @Nonnull String[] paths) {
         this(System.currentTimeMillis(), action, paths);
     }
 
-    public ReplicationRequest(long time, @Nonnull ReplicationActionType action, @Nonnull String... paths) {
+    public DistributionRequest(long time, @Nonnull DistributionActionType action, @Nonnull String... paths) {
         this.time = time;
         this.action = action;
         this.paths = paths;
     }
 
     /**
-     * get the time this replication request was created
+     * get the time this distribution request was created
      *
-     * @return a <code>long</code> representing the replication request creation time e.g. as returend by {@code System#currentTimeMillis}
+     * @return a <code>long</code> representing the distribution request creation time e.g. as returend by {@code System#currentTimeMillis}
      */
     public long getTime() {
         return time;
     }
 
     /**
-     * get the {@link org.apache.sling.replication.communication.ReplicationActionType} associated with this request
+     * get the {@link DistributionActionType} associated with this request
      *
-     * @return the action as a <code>ReplicationActionType</code>
+     * @return the action as a <code>distributionActionType</code>
      */
-    public ReplicationActionType getAction() {
+    public DistributionActionType getAction() {
         return action;
     }
 
     /**
-     * get the paths for this replication request
+     * get the paths for this distribution request
      *
      * @return an array of <code>String</code>s representing the paths
      */
@@ -71,7 +71,7 @@ public class ReplicationRequest {
 
     @Override
     public String toString() {
-        return "ReplicationRequest{" +
+        return "DistributionRequest{" +
                 "time=" + time +
                 ", action=" + action +
                 ", paths=" + Arrays.toString(paths) +

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationResponse.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationResponse.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationResponse.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java Fri Nov  7 10:28:02 2014
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.communication;
+package org.apache.sling.distribution.communication;
 
 /**
- * A replication response
+ * A distribution response
  */
-public class ReplicationResponse {
+public class DistributionResponse {
 
     private final String status;
     private boolean successful;
 
-    public ReplicationResponse(String status, boolean successful) {
+    public DistributionResponse(String status, boolean successful) {
         this.status = status;
         this.successful = successful;
     }

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/package-info.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/package-info.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/communication/package-info.java Fri Nov  7 10:28:02 2014
@@ -18,7 +18,7 @@
  */
 
 @Version("0.1.0")
-package org.apache.sling.replication.communication;
+package org.apache.sling.distribution.communication;
 
 import aQute.bnd.annotation.Version;
 

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponent.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponent.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponent.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponent.java Fri Nov  7 10:28:02 2014
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component;
+package org.apache.sling.distribution.component;
 
 import aQute.bnd.annotation.ConsumerType;
 
 /**
- * Marker interface for Sling Replication components like: {@link org.apache.sling.replication.agent.ReplicationAgent}s,
- * {@link org.apache.sling.replication.trigger.ReplicationTrigger}s, {@link org.apache.sling.replication.packaging.ReplicationPackageExporter}s
- * and {@link org.apache.sling.replication.packaging.ReplicationPackageImporter}s.
+ * Marker interface for Sling Distribution components like: {@link org.apache.sling.distribution.agent.DistributionAgent}s,
+ * {@link org.apache.sling.distribution.trigger.DistributionTrigger}s, {@link org.apache.sling.distribution.packaging.DistributionPackageExporter}s
+ * and {@link org.apache.sling.distribution.packaging.DistributionPackageImporter}s.
  */
 @ConsumerType
-public interface ReplicationComponent {
+public interface DistributionComponent {
 
 }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component;
+package org.apache.sling.distribution.component;
 
 import aQute.bnd.annotation.ProviderType;
 
@@ -26,10 +26,10 @@ import javax.annotation.Nullable;
 import java.util.Map;
 
 /**
- * factory for {@link ReplicationComponent}s
+ * factory for {@link DistributionComponent}s
  */
 @ProviderType
-public interface ReplicationComponentFactory {
+public interface DistributionComponentFactory {
 
     /**
      * the type of the component
@@ -53,7 +53,7 @@ public interface ReplicationComponentFac
 
 
     /**
-     * replication agent component
+     * distribution agent component
      */
     String COMPONENT_AGENT = "agent";
 
@@ -98,7 +98,7 @@ public interface ReplicationComponentFac
     String COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER = "transportAuthenticationProvider";
 
     /**
-     * simple replication agent type
+     * simple distribution agent type
      */
     String AGENT_SIMPLE = "simple";
 
@@ -218,14 +218,14 @@ public interface ReplicationComponentFac
     String TRIGGER_SCHEDULED_EVENT_PROPERTY_SECONDS = "seconds";
 
     /**
-     * chain replication trigger type
+     * chain distribution trigger type
      */
-    String TRIGGER_REPLICATION_EVENT = "replicationEvent";
+    String TRIGGER_DISTRIBUTION_EVENT = "distributionEvent";
 
     /**
-     * chain replication path property
+     * chain distribution path property
      */
-    String TRIGGER_REPLICATION_EVENT_PROPERTY_PATH = "path";
+    String TRIGGER_DISTRIBUTION_EVENT_PROPERTY_PATH = "path";
 
     /**
      * jcr event trigger type
@@ -313,19 +313,19 @@ public interface ReplicationComponentFac
     String QUEUE_DISTRIBUTION_STRATEGY_PRIORITY_PROPERTY_PATHS = "priority.paths";
 
     /**
-     * create a {@link ReplicationComponent}
+     * create a {@link DistributionComponent}
      *
      * @param type              the {@link java.lang.Class} of the component to be created
      * @param properties        the properties to be supplied for the initialization of the component
-     * @param componentProvider the {@link ReplicationComponentProvider} used to eventually
-     *                          wire additional required {@link ReplicationComponent}s
-     * @param <ComponentType>   the actual type of the {@link ReplicationComponent}
+     * @param componentProvider the {@link DistributionComponentProvider} used to eventually
+     *                          wire additional required {@link DistributionComponent}s
+     * @param <ComponentType>   the actual type of the {@link DistributionComponent}
      *                          to be created
-     * @return a {@link ReplicationComponent} of the specified type initialized with given properties or <code>null</code>
+     * @return a {@link DistributionComponent} of the specified type initialized with given properties or <code>null</code>
      * if that could not be created
      */
     @CheckForNull
-    <ComponentType extends ReplicationComponent> ComponentType createComponent(@Nonnull java.lang.Class<ComponentType> type,
+    <ComponentType extends DistributionComponent> ComponentType createComponent(@Nonnull java.lang.Class<ComponentType> type,
                                                                                @Nonnull Map<String, Object> properties,
-                                                                               @Nullable ReplicationComponentProvider componentProvider);
+                                                                               @Nullable DistributionComponentProvider componentProvider);
 }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component;
+package org.apache.sling.distribution.component;
 
 import aQute.bnd.annotation.ConsumerType;
 
@@ -25,10 +25,10 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
- * provider for already existing {@link ReplicationComponent}s
+ * provider for already existing {@link DistributionComponent}s
  */
 @ConsumerType
-public interface ReplicationComponentProvider {
+public interface DistributionComponentProvider {
 
     /**
      * Retrieves an already existing component by name.
@@ -36,13 +36,13 @@ public interface ReplicationComponentPro
      *
      * @param type            the {@link java.lang.Class} of the component to be retrieved
      * @param componentName   the component name
-     * @param <ComponentType> the actual type of the {@link ReplicationComponent}
+     * @param <ComponentType> the actual type of the {@link DistributionComponent}
      *                        to be retrieved
-     * @return the {@link ReplicationComponent} of the specified type,
-     * with the specified name, or <code>null</code> if such a {@link ReplicationComponent}
+     * @return the {@link DistributionComponent} of the specified type,
+     * with the specified name, or <code>null</code> if such a {@link DistributionComponent}
      * doesn't exist
      */
     @CheckForNull
-    <ComponentType extends ReplicationComponent> ComponentType getComponent(@Nonnull java.lang.Class<ComponentType> type,
+    <ComponentType extends DistributionComponent> ComponentType getComponent(@Nonnull java.lang.Class<ComponentType> type,
                                                                             @Nullable String componentName);
 }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/ManagedDistributionComponent.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/ManagedDistributionComponent.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/ManagedDistributionComponent.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/ManagedDistributionComponent.java Fri Nov  7 10:28:02 2014
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component;
+package org.apache.sling.distribution.component;
 
 import aQute.bnd.annotation.ConsumerType;
 
 /**
- * A managed {@link org.apache.sling.replication.component.ReplicationComponent} is a component which requires explicit
+ * A managed {@link DistributionComponent} is a component which requires explicit
  * initialization and releasing of its underlying (and implementation specific) resources.
  */
 @ConsumerType
-public interface ManagedReplicationComponent {
+public interface ManagedDistributionComponent {
 
     /**
      * Enable the component

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/DefaultReplicationComponentFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/DefaultReplicationComponentFactory.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/DefaultReplicationComponentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component.impl;
+package org.apache.sling.distribution.component.impl;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -36,66 +36,65 @@ import org.apache.sling.commons.osgi.Pro
 import org.apache.sling.commons.scheduler.Scheduler;
 import org.apache.sling.event.jobs.JobManager;
 import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.replication.agent.ReplicationAgent;
-import org.apache.sling.replication.agent.ReplicationRequestAuthorizationStrategy;
-import org.apache.sling.replication.agent.impl.PrivilegeReplicationRequestAuthorizationStrategy;
-import org.apache.sling.replication.agent.impl.SimpleReplicationAgent;
-import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.component.ReplicationComponent;
-import org.apache.sling.replication.component.ReplicationComponentFactory;
-import org.apache.sling.replication.component.ReplicationComponentProvider;
-import org.apache.sling.replication.event.impl.ReplicationEventFactory;
-import org.apache.sling.replication.packaging.ReplicationPackageExporter;
-import org.apache.sling.replication.packaging.ReplicationPackageImporter;
-import org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporter;
-import org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporter;
-import org.apache.sling.replication.packaging.impl.exporter.RemoteReplicationPackageExporter;
-import org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporter;
-import org.apache.sling.replication.packaging.impl.importer.RemoteReplicationPackageImporter;
-import org.apache.sling.replication.queue.ReplicationQueueDistributionStrategy;
-import org.apache.sling.replication.queue.ReplicationQueueProvider;
-import org.apache.sling.replication.queue.impl.ErrorAwareQueueDistributionStrategy;
-import org.apache.sling.replication.queue.impl.PriorityPathDistributionStrategy;
-import org.apache.sling.replication.queue.impl.SingleQueueDistributionStrategy;
-import org.apache.sling.replication.queue.impl.jobhandling.JobHandlingReplicationQueueProvider;
-import org.apache.sling.replication.queue.impl.simple.SimpleReplicationQueueProvider;
-import org.apache.sling.replication.serialization.ReplicationPackageBuilder;
-import org.apache.sling.replication.serialization.impl.ResourceSharedReplicationPackageBuilder;
-import org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilder;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.ChainReplicateReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.JcrEventReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.PersistingJcrEventReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.RemoteEventReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.ResourceEventReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.ScheduledReplicationTrigger;
+import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.DistributionRequestAuthorizationStrategy;
+import org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategy;
+import org.apache.sling.distribution.agent.impl.SimpleDistributionAgent;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.component.DistributionComponent;
+import org.apache.sling.distribution.component.DistributionComponentFactory;
+import org.apache.sling.distribution.component.DistributionComponentProvider;
+import org.apache.sling.distribution.event.impl.DistributionEventFactory;
+import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporter;
+import org.apache.sling.distribution.queue.DistributionQueueDistributionStrategy;
+import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.PriorityPathDistributionStrategy;
+import org.apache.sling.distribution.queue.impl.SingleQueueDistributionStrategy;
+import org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.simple.SimpleDistributionQueueProvider;
+import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
+import org.apache.sling.distribution.serialization.impl.ResourceSharedDistributionPackageBuilder;
+import org.apache.sling.distribution.serialization.impl.vlt.FileVaultDistributionPackageBuilder;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider;
+import org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProvider;
+import org.apache.sling.distribution.trigger.DistributionTrigger;
+import org.apache.sling.distribution.trigger.impl.ChainDistributeDistributionTrigger;
+import org.apache.sling.distribution.trigger.impl.JcrEventDistributionTrigger;
+import org.apache.sling.distribution.trigger.impl.PersistingJcrEventDistributionTrigger;
+import org.apache.sling.distribution.trigger.impl.RemoteEventDistributionTrigger;
+import org.apache.sling.distribution.trigger.impl.ResourceEventDistributionTrigger;
+import org.apache.sling.distribution.trigger.impl.ScheduledDistributionTrigger;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A generic factory for replication components using a compact configuration, already existing OSGi services
+ * A generic factory for distribution components using a compact configuration, already existing OSGi services
  * for the components to be wired can be used as well as directly instantiated components (called by type name).
  * <p/>
- * Currently supported components are {@link org.apache.sling.replication.agent.ReplicationAgent}s,
- * {@link org.apache.sling.replication.trigger.ReplicationTrigger}s and
- * {@link org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider}s
+ * Currently supported components are {@link org.apache.sling.distribution.agent.DistributionAgent}s,
+ * {@link org.apache.sling.distribution.trigger.DistributionTrigger}s and
+ * {@link org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider}s
  */
 @Component(metatype = true,
-        label = "Generic Replication Components Factory",
-        description = "OSGi configuration Replication Component factory",
+        label = "Generic Distribution Components Factory",
+        description = "OSGi configuration Distribution Component factory",
         specVersion = "1.1",
         immediate = true
 )
-@Service(ReplicationComponentFactory.class)
-public class DefaultReplicationComponentFactory implements ReplicationComponentFactory, ReplicationComponentProvider {
+@Service(DistributionComponentFactory.class)
+public class DefaultDistributionComponentFactory implements DistributionComponentFactory, DistributionComponentProvider {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     @Reference
-    private ReplicationEventFactory replicationEventFactory;
+    private DistributionEventFactory distributionEventFactory;
 
     @Reference
     private ResourceResolverFactory resourceResolverFactory;
@@ -119,62 +118,62 @@ public class DefaultReplicationComponent
         this.bundleContext = bundleContext;
     }
 
-    public <ComponentType extends ReplicationComponent> ComponentType createComponent(@Nonnull Class<ComponentType> type,
+    public <ComponentType extends DistributionComponent> ComponentType createComponent(@Nonnull Class<ComponentType> type,
                                                                                       @Nonnull Map<String, Object> properties,
-                                                                                      @Nullable ReplicationComponentProvider componentProvider) {
+                                                                                      @Nullable DistributionComponentProvider componentProvider) {
 
         if (componentProvider == null) {
             componentProvider = this;
         }
 
-        if (type.isAssignableFrom(ReplicationAgent.class)) {
+        if (type.isAssignableFrom(DistributionAgent.class)) {
             return (ComponentType) createAgent(properties, componentProvider);
-        } else if (type.isAssignableFrom(ReplicationTrigger.class)) {
+        } else if (type.isAssignableFrom(DistributionTrigger.class)) {
             return (ComponentType) createTrigger(properties, componentProvider);
         } else if (type.isAssignableFrom(TransportAuthenticationProvider.class)) {
             return (ComponentType) createTransportAuthenticationProvider(properties, componentProvider);
-        } else if (type.isAssignableFrom(ReplicationPackageImporter.class)) {
+        } else if (type.isAssignableFrom(DistributionPackageImporter.class)) {
             return (ComponentType) createImporter(properties, componentProvider);
-        } else if (type.isAssignableFrom(ReplicationPackageExporter.class)) {
+        } else if (type.isAssignableFrom(DistributionPackageExporter.class)) {
             return (ComponentType) createExporter(properties, componentProvider);
         }
 
         return null;
     }
 
-    public ReplicationAgent createAgent(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    public DistributionAgent createAgent(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
 
-        String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), ReplicationComponentFactory.AGENT_SIMPLE);
+        String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), DistributionComponentFactory.AGENT_SIMPLE);
 
-        if (ReplicationComponentFactory.AGENT_SIMPLE.equals(factory)) {
+        if (DistributionComponentFactory.AGENT_SIMPLE.equals(factory)) {
 
             Map<String, Object> exporterProperties = extractMap(COMPONENT_PACKAGE_EXPORTER, properties);
-            ReplicationPackageExporter packageExporter = createExporter(exporterProperties, componentProvider);
+            DistributionPackageExporter packageExporter = createExporter(exporterProperties, componentProvider);
 
             Map<String, Object> importerProperties = extractMap(COMPONENT_PACKAGE_IMPORTER, properties);
-            ReplicationPackageImporter packageImporter = createImporter(importerProperties, componentProvider);
+            DistributionPackageImporter packageImporter = createImporter(importerProperties, componentProvider);
 
             Map<String, Object> authorizationStrategyProperties = extractMap(COMPONENT_REQUEST_AUTHORIZATION_STRATEGY, properties);
-            ReplicationRequestAuthorizationStrategy packageExporterStrategy = createAuthorizationStrategy(authorizationStrategyProperties, componentProvider);
+            DistributionRequestAuthorizationStrategy packageExporterStrategy = createAuthorizationStrategy(authorizationStrategyProperties, componentProvider);
 
             Map<String, Object> queueDistributionStrategyProperties = extractMap(COMPONENT_QUEUE_DISTRIBUTION_STRATEGY, properties);
-            ReplicationQueueDistributionStrategy queueDistributionStrategy = createDistributionStrategy(queueDistributionStrategyProperties, componentProvider);
+            DistributionQueueDistributionStrategy queueDistributionStrategy = createDistributionStrategy(queueDistributionStrategyProperties, componentProvider);
 
             Map<String, Object> queueProviderProperties = extractMap(COMPONENT_QUEUE_PROVIDER, properties);
-            ReplicationQueueProvider queueProvider = createQueueProvider(queueProviderProperties, componentProvider);
+            DistributionQueueProvider queueProvider = createQueueProvider(queueProviderProperties, componentProvider);
 
             List<Map<String, Object>> triggersProperties = extractMapList(COMPONENT_TRIGGER, properties);
-            List<ReplicationTrigger> triggers = createTriggerList(triggersProperties, componentProvider);
+            List<DistributionTrigger> triggers = createTriggerList(triggersProperties, componentProvider);
 
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), String.valueOf(new Random().nextInt(1000)));
 
-            String serviceName = PropertiesUtil.toString(properties.get(ReplicationComponentFactory.AGENT_SIMPLE_PROPERTY_SERVICE_NAME), null);
+            String serviceName = PropertiesUtil.toString(properties.get(DistributionComponentFactory.AGENT_SIMPLE_PROPERTY_SERVICE_NAME), null);
 
-            boolean isPassive = PropertiesUtil.toBoolean(properties.get(ReplicationComponentFactory.AGENT_SIMPLE_PROPERTY_IS_PASSIVE), false);
+            boolean isPassive = PropertiesUtil.toBoolean(properties.get(DistributionComponentFactory.AGENT_SIMPLE_PROPERTY_IS_PASSIVE), false);
 
-            return new SimpleReplicationAgent(name, isPassive, serviceName,
+            return new SimpleDistributionAgent(name, isPassive, serviceName,
                     packageImporter, packageExporter, packageExporterStrategy,
-                    queueProvider, queueDistributionStrategy, replicationEventFactory, resourceResolverFactory, triggers);
+                    queueProvider, queueDistributionStrategy, distributionEventFactory, resourceResolverFactory, triggers);
 
         }
 
@@ -182,71 +181,71 @@ public class DefaultReplicationComponent
 
     }
 
-    private ReplicationRequestAuthorizationStrategy createAuthorizationStrategy(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    private DistributionRequestAuthorizationStrategy createAuthorizationStrategy(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
 
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return componentProvider.getComponent(ReplicationRequestAuthorizationStrategy.class, name);
+            return componentProvider.getComponent(DistributionRequestAuthorizationStrategy.class, name);
 
         } else if (REQUEST_AUTHORIZATION_STRATEGY_PRIVILEGE.equals(factory)) {
             String jcrPrivilege = PropertiesUtil.toString(properties.get(REQUEST_AUTHORIZATION_STRATEGY_PRIVILEGE_PROPERTY_JCR_PRIVILEGE), null);
-            return new PrivilegeReplicationRequestAuthorizationStrategy(jcrPrivilege);
+            return new PrivilegeDistributionRequestAuthorizationStrategy(jcrPrivilege);
         }
 
         return null;
     }
 
 
-    public ReplicationPackageExporter createExporter(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    public DistributionPackageExporter createExporter(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
 
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return componentProvider.getComponent(ReplicationPackageExporter.class, name);
+            return componentProvider.getComponent(DistributionPackageExporter.class, name);
 
         } else if (PACKAGE_EXPORTER_LOCAL.equals(factory)) {
             Map<String, Object> builderProperties = extractMap(COMPONENT_PACKAGE_BUILDER, properties);
-            ReplicationPackageBuilder packageBuilder = createBuilder(builderProperties);
-            return new LocalReplicationPackageExporter(packageBuilder);
+            DistributionPackageBuilder packageBuilder = createBuilder(builderProperties);
+            return new LocalDistributionPackageExporter(packageBuilder);
         } else if (PACKAGE_EXPORTER_REMOTE.equals(factory)) {
             Map<String, Object> authenticationProviderProperties = extractMap(COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER, properties);
             TransportAuthenticationProvider authenticationProvider = createTransportAuthenticationProvider(authenticationProviderProperties, componentProvider);
 
             Map<String, Object> builderProperties = extractMap(COMPONENT_PACKAGE_BUILDER, properties);
-            ReplicationPackageBuilder packageBuilder = createBuilder(builderProperties);
+            DistributionPackageBuilder packageBuilder = createBuilder(builderProperties);
 
 
             String[] endpoints = PropertiesUtil.toStringArray(properties.get(PACKAGE_EXPORTER_REMOTE_PROPERTY_ENDPOINTS), new String[0]);
             String endpointStrategyName = PropertiesUtil.toString(properties.get(PACKAGE_EXPORTER_REMOTE_PROPERTY_ENDPOINTS_STRATEGY), "One");
             int pollItems = PropertiesUtil.toInteger(properties.get(PACKAGE_EXPORTER_REMOTE_PROPERTY_POLL_ITEMS), Integer.MAX_VALUE);
 
-            return new RemoteReplicationPackageExporter(packageBuilder, authenticationProvider, endpoints, endpointStrategyName, pollItems);
+            return new RemoteDistributionPackageExporter(packageBuilder, authenticationProvider, endpoints, endpointStrategyName, pollItems);
         } else if (PACKAGE_EXPORTER_AGENT.equals(factory)) {
             Map<String, Object> builderProperties = extractMap(COMPONENT_PACKAGE_BUILDER, properties);
-            ReplicationPackageBuilder packageBuilder = createBuilder(builderProperties);
-            ReplicationAgent agent = componentProvider.getComponent(ReplicationAgent.class, null);
+            DistributionPackageBuilder packageBuilder = createBuilder(builderProperties);
+            DistributionAgent agent = componentProvider.getComponent(DistributionAgent.class, null);
 
-            return new AgentReplicationPackageExporter(properties, agent, packageBuilder);
+            return new AgentDistributionPackageExporter(properties, agent, packageBuilder);
         }
 
 
         return null;
     }
 
-    public ReplicationPackageImporter createImporter(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    public DistributionPackageImporter createImporter(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
 
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return componentProvider.getComponent(ReplicationPackageImporter.class, name);
+            return componentProvider.getComponent(DistributionPackageImporter.class, name);
         } else if (PACKAGE_IMPORTER_LOCAL.equals(factory)) {
             Map<String, Object> builderProperties = extractMap(COMPONENT_PACKAGE_BUILDER, properties);
-            ReplicationPackageBuilder packageBuilder = createBuilder(builderProperties);
-            return new LocalReplicationPackageImporter(packageBuilder, replicationEventFactory);
+            DistributionPackageBuilder packageBuilder = createBuilder(builderProperties);
+            return new LocalDistributionPackageImporter(packageBuilder, distributionEventFactory);
         } else if (PACKAGE_IMPORTER_REMOTE.equals(factory)) {
             Map<String, Object> authenticationProviderProperties = extractMap(COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER, properties);
             TransportAuthenticationProvider authenticationProvider = createTransportAuthenticationProvider(authenticationProviderProperties, componentProvider);
@@ -254,38 +253,38 @@ public class DefaultReplicationComponent
             String[] endpoints = PropertiesUtil.toStringArray(properties.get(PACKAGE_EXPORTER_REMOTE_PROPERTY_ENDPOINTS), new String[0]);
             String endpointStrategyName = PropertiesUtil.toString(properties.get(PACKAGE_EXPORTER_REMOTE_PROPERTY_ENDPOINTS_STRATEGY), "One");
 
-            return new RemoteReplicationPackageImporter(authenticationProvider, endpoints, endpointStrategyName);
+            return new RemoteDistributionPackageImporter(authenticationProvider, endpoints, endpointStrategyName);
         }
 
         return null;
     }
 
-    public ReplicationQueueProvider createQueueProvider(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    public DistributionQueueProvider createQueueProvider(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return componentProvider.getComponent(ReplicationQueueProvider.class, name);
+            return componentProvider.getComponent(DistributionQueueProvider.class, name);
         }
         else if (QUEUE_PROVIDER_JOB.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return new JobHandlingReplicationQueueProvider(name, jobManager, bundleContext);
+            return new JobHandlingDistributionQueueProvider(name, jobManager, bundleContext);
         }
         else if (QUEUE_PROVIDER_SIMPLE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
 
-            return new SimpleReplicationQueueProvider(scheduler, name);
+            return new SimpleDistributionQueueProvider(scheduler, name);
         }
 
         return null;
     }
 
-    public ReplicationQueueDistributionStrategy createDistributionStrategy(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    public DistributionQueueDistributionStrategy createDistributionStrategy(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return componentProvider.getComponent(ReplicationQueueDistributionStrategy.class, name);
+            return componentProvider.getComponent(DistributionQueueDistributionStrategy.class, name);
         }
         else if (QUEUE_DISTRIBUTION_STRATEGY_SINGLE.equals(factory)) {
             return new SingleQueueDistributionStrategy();
@@ -299,7 +298,7 @@ public class DefaultReplicationComponent
         return null;
     }
 
-    public TransportAuthenticationProvider createTransportAuthenticationProvider(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    public TransportAuthenticationProvider createTransportAuthenticationProvider(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
@@ -315,16 +314,16 @@ public class DefaultReplicationComponent
         return null;
     }
 
-    public ReplicationPackageBuilder createBuilder(Map<String, Object> properties) {
+    public DistributionPackageBuilder createBuilder(Map<String, Object> properties) {
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (PACKAGE_BUILDER_FILEVLT.equals(factory)) {
             String importMode = PropertiesUtil.toString(properties.get(PACKAGE_BUILDER_FILEVLT_IMPORT_MODE), null);
             String aclHandling = PropertiesUtil.toString(properties.get(PACKAGE_BUILDER_FILEVLT_ACLHANDLING), null);
             if (importMode != null && aclHandling != null) {
-                return new ResourceSharedReplicationPackageBuilder(new FileVaultReplicationPackageBuilder(packaging, replicationEventFactory, importMode, aclHandling));
+                return new ResourceSharedDistributionPackageBuilder(new FileVaultDistributionPackageBuilder(packaging, distributionEventFactory, importMode, aclHandling));
             } else {
-                return new ResourceSharedReplicationPackageBuilder(new FileVaultReplicationPackageBuilder(packaging, replicationEventFactory));
+                return new ResourceSharedDistributionPackageBuilder(new FileVaultDistributionPackageBuilder(packaging, distributionEventFactory));
             }
         }
 
@@ -332,12 +331,12 @@ public class DefaultReplicationComponent
     }
 
 
-    protected ReplicationTrigger createTrigger(Map<String, Object> properties, ReplicationComponentProvider componentProvider) {
+    protected DistributionTrigger createTrigger(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
         String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
 
         if (COMPONENT_TYPE_SERVICE.equals(factory)) {
             String name = PropertiesUtil.toString(properties.get(COMPONENT_NAME), null);
-            return componentProvider.getComponent(ReplicationTrigger.class, name);
+            return componentProvider.getComponent(DistributionTrigger.class, name);
 
         } else if (TRIGGER_REMOTE_EVENT.equals(factory)) {
             Map<String, Object> authenticationProviderProperties = extractMap(COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER, properties);
@@ -345,39 +344,39 @@ public class DefaultReplicationComponent
             TransportAuthenticationProvider authenticationProvider = createTransportAuthenticationProvider(authenticationProviderProperties, componentProvider);
             String endpoint = PropertiesUtil.toString(properties.get(TRIGGER_REMOTE_EVENT_PROPERTY_ENDPOINT), null);
 
-            return new RemoteEventReplicationTrigger(endpoint, authenticationProvider, scheduler);
+            return new RemoteEventDistributionTrigger(endpoint, authenticationProvider, scheduler);
         } else if (TRIGGER_RESOURCE_EVENT.equals(factory)) {
             String path = PropertiesUtil.toString(properties.get(TRIGGER_RESOURCE_EVENT_PROPERTY_PATH), null);
 
-            return new ResourceEventReplicationTrigger(path, bundleContext);
+            return new ResourceEventDistributionTrigger(path, bundleContext);
         } else if (TRIGGER_SCHEDULED_EVENT.equals(factory)) {
-            String action = PropertiesUtil.toString(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_ACTION), ReplicationActionType.POLL.name());
+            String action = PropertiesUtil.toString(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_ACTION), DistributionActionType.POLL.name());
             String path = PropertiesUtil.toString(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_PATH), "/");
             int interval = PropertiesUtil.toInteger(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_SECONDS), 30);
 
-            return new ScheduledReplicationTrigger(action, path, interval, scheduler);
-        } else if (TRIGGER_REPLICATION_EVENT.equals(factory)) {
-            String path = PropertiesUtil.toString(properties.get(TRIGGER_REPLICATION_EVENT_PROPERTY_PATH), null);
+            return new ScheduledDistributionTrigger(action, path, interval, scheduler);
+        } else if (TRIGGER_DISTRIBUTION_EVENT.equals(factory)) {
+            String path = PropertiesUtil.toString(properties.get(TRIGGER_DISTRIBUTION_EVENT_PROPERTY_PATH), null);
 
-            return new ChainReplicateReplicationTrigger(path, bundleContext);
+            return new ChainDistributeDistributionTrigger(path, bundleContext);
         } else if (TRIGGER_JCR_EVENT.equals(factory)) {
             String path = PropertiesUtil.toString(properties.get(TRIGGER_JCR_EVENT_PROPERTY_PATH), null);
             String serviceName = PropertiesUtil.toString(properties.get(TRIGGER_JCR_EVENT_PROPERTY_SERVICE_NAME), null);
 
-            return new JcrEventReplicationTrigger(repository, path, serviceName);
+            return new JcrEventDistributionTrigger(repository, path, serviceName);
         } else if (TRIGGER_PERSISTED_JCR_EVENT.equals(factory)) {
             String path = PropertiesUtil.toString(properties.get(TRIGGER_PERSISTED_JCR_EVENT_PROPERTY_PATH), null);
             String serviceName = PropertiesUtil.toString(properties.get(TRIGGER_PERSISTED_JCR_EVENT_PROPERTY_SERVICE_NAME), null);
             String nuggetsPath = PropertiesUtil.toString(properties.get(TRIGGER_PERSISTED_JCR_EVENT_PROPERTY_NUGGETS_PATH), null);
 
-            return new PersistingJcrEventReplicationTrigger(repository, path, serviceName, nuggetsPath);
+            return new PersistingJcrEventDistributionTrigger(repository, path, serviceName, nuggetsPath);
         }
 
         return null;
     }
 
-    private List<ReplicationTrigger> createTriggerList(List<Map<String, Object>> triggersProperties, ReplicationComponentProvider componentProvider) {
-        List<ReplicationTrigger> triggers = new ArrayList<ReplicationTrigger>();
+    private List<DistributionTrigger> createTriggerList(List<Map<String, Object>> triggersProperties, DistributionComponentProvider componentProvider) {
+        List<DistributionTrigger> triggers = new ArrayList<DistributionTrigger>();
         for (Map<String, Object> properties : triggersProperties) {
             triggers.add(createTrigger(properties, componentProvider));
         }
@@ -419,7 +418,7 @@ public class DefaultReplicationComponent
 
     }
 
-    public <ComponentType extends ReplicationComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
+    public <ComponentType extends DistributionComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
                                                                                    @Nullable String componentName) {
         return null;
     }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/DefaultReplicationComponentProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/DefaultReplicationComponentProvider.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/DefaultReplicationComponentProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component.impl;
+package org.apache.sling.distribution.component.impl;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -30,57 +30,57 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.ReferencePolicy;
 import org.apache.felix.scr.annotations.References;
 import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.replication.agent.ReplicationAgent;
-import org.apache.sling.replication.component.ReplicationComponent;
-import org.apache.sling.replication.component.ReplicationComponentProvider;
-import org.apache.sling.replication.packaging.ReplicationPackageExporter;
-import org.apache.sling.replication.packaging.ReplicationPackageImporter;
-import org.apache.sling.replication.queue.ReplicationQueueDistributionStrategy;
-import org.apache.sling.replication.queue.ReplicationQueueProvider;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
+import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.component.DistributionComponent;
+import org.apache.sling.distribution.component.DistributionComponentProvider;
+import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.queue.DistributionQueueDistributionStrategy;
+import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * default implementation of {@link org.apache.sling.replication.component.ReplicationComponentProvider} (as an OSGi service).
+ * default implementation of {@link org.apache.sling.distribution.component.DistributionComponentProvider} (as an OSGi service).
  */
 @Component
-@Service(ReplicationComponentProvider.class)
+@Service(DistributionComponentProvider.class)
 @Property(name = "name", value = "default")
 @References({
-        @Reference(name = "replicationAgent", referenceInterface = ReplicationAgent.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
-        @Reference(name = "replicationPackageImporter", referenceInterface = ReplicationPackageImporter.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
-        @Reference(name = "replicationPackageExporter", referenceInterface = ReplicationPackageExporter.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
-        @Reference(name = "replicationQueueProvider", referenceInterface = ReplicationQueueProvider.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
-        @Reference(name = "replicationQueueDistributionStrategy", referenceInterface = ReplicationQueueDistributionStrategy.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+        @Reference(name = "distributionAgent", referenceInterface = DistributionAgent.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+        @Reference(name = "distributionPackageImporter", referenceInterface = DistributionPackageImporter.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+        @Reference(name = "distributionPackageExporter", referenceInterface = DistributionPackageExporter.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+        @Reference(name = "distributionQueueProvider", referenceInterface = DistributionQueueProvider.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+        @Reference(name = "distributionQueueDistributionStrategy", referenceInterface = DistributionQueueDistributionStrategy.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
         @Reference(name = "transportAuthenticationProvider", referenceInterface = TransportAuthenticationProvider.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
 })
-public class DefaultReplicationComponentProvider implements ReplicationComponentProvider {
+public class DefaultDistributionComponentProvider implements DistributionComponentProvider {
 
     public static final String COMPONENT_TYPE = "type";
     public static final String NAME = "name";
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    Map<String, ReplicationAgent> replicationAgentMap = new ConcurrentHashMap<String, ReplicationAgent>();
-    Map<String, ReplicationQueueProvider> replicationQueueProviderMap = new ConcurrentHashMap<String, ReplicationQueueProvider>();
-    Map<String, ReplicationQueueDistributionStrategy> replicationQueueDistributionStrategyMap = new ConcurrentHashMap<String, ReplicationQueueDistributionStrategy>();
+    Map<String, DistributionAgent> distributionAgentMap = new ConcurrentHashMap<String, DistributionAgent>();
+    Map<String, DistributionQueueProvider> distributionQueueProviderMap = new ConcurrentHashMap<String, DistributionQueueProvider>();
+    Map<String, DistributionQueueDistributionStrategy> distributionQueueDistributionStrategyMap = new ConcurrentHashMap<String, DistributionQueueDistributionStrategy>();
     Map<String, TransportAuthenticationProvider> transportAuthenticationProviderMap = new ConcurrentHashMap<String, TransportAuthenticationProvider>();
-    Map<String, ReplicationPackageImporter> replicationPackageImporterMap = new ConcurrentHashMap<String, ReplicationPackageImporter>();
-    Map<String, ReplicationPackageExporter> replicationPackageExporterMap = new ConcurrentHashMap<String, ReplicationPackageExporter>();
+    Map<String, DistributionPackageImporter> distributionPackageImporterMap = new ConcurrentHashMap<String, DistributionPackageImporter>();
+    Map<String, DistributionPackageExporter> distributionPackageExporterMap = new ConcurrentHashMap<String, DistributionPackageExporter>();
     private BundleContext bundleContext;
 
-    public <ComponentType extends ReplicationComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
+    public <ComponentType extends DistributionComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
                                                                                    @Nullable String componentName) {
-        if (type.isAssignableFrom(ReplicationPackageExporter.class)) {
-            return (ComponentType) replicationPackageExporterMap.get(componentName);
-        } else if (type.isAssignableFrom(ReplicationPackageImporter.class)) {
-            return (ComponentType) replicationPackageImporterMap.get(componentName);
-        } else if (type.isAssignableFrom(ReplicationQueueProvider.class)) {
-            return (ComponentType) replicationQueueProviderMap.get(componentName);
-        } else if (type.isAssignableFrom(ReplicationQueueDistributionStrategy.class)) {
-            return (ComponentType) replicationQueueDistributionStrategyMap.get(componentName);
+        if (type.isAssignableFrom(DistributionPackageExporter.class)) {
+            return (ComponentType) distributionPackageExporterMap.get(componentName);
+        } else if (type.isAssignableFrom(DistributionPackageImporter.class)) {
+            return (ComponentType) distributionPackageImporterMap.get(componentName);
+        } else if (type.isAssignableFrom(DistributionQueueProvider.class)) {
+            return (ComponentType) distributionQueueProviderMap.get(componentName);
+        } else if (type.isAssignableFrom(DistributionQueueDistributionStrategy.class)) {
+            return (ComponentType) distributionQueueDistributionStrategyMap.get(componentName);
         } else if (type.isAssignableFrom(TransportAuthenticationProvider.class)) {
             return (ComponentType) transportAuthenticationProviderMap.get(componentName);
         }
@@ -88,35 +88,35 @@ public class DefaultReplicationComponent
         return null;
     }
 
-    private void bindReplicationQueueProvider(ReplicationQueueProvider replicationQueueProvider, Map<String, Object> config) {
+    private void bindDistributionQueueProvider(DistributionQueueProvider distributionQueueProvider, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationQueueProviderMap.put(name, replicationQueueProvider);
+            distributionQueueProviderMap.put(name, distributionQueueProvider);
         }
     }
 
-    private void unbindReplicationQueueProvider(ReplicationQueueProvider replicationQueueProvider, Map<String, Object> config) {
+    private void unbindDistributionQueueProvider(DistributionQueueProvider distributionQueueProvider, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationQueueProviderMap.remove(name);
+            distributionQueueProviderMap.remove(name);
         }
     }
 
-    private void bindReplicationQueueDistributionStrategy(ReplicationQueueDistributionStrategy replicationQueueDistributionStrategy, Map<String, Object> config) {
+    private void bindDistributionQueueDistributionStrategy(DistributionQueueDistributionStrategy distributionQueueDistributionStrategy, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationQueueDistributionStrategyMap.put(name, replicationQueueDistributionStrategy);
+            distributionQueueDistributionStrategyMap.put(name, distributionQueueDistributionStrategy);
         }
     }
 
-    private void unbindReplicationQueueDistributionStrategy(ReplicationQueueDistributionStrategy replicationQueueDistributionStrategy, Map<String, Object> config) {
+    private void unbindDistributionQueueDistributionStrategy(DistributionQueueDistributionStrategy distributionQueueDistributionStrategy, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationQueueDistributionStrategyMap.remove(name);
+            distributionQueueDistributionStrategyMap.remove(name);
         }
     }
 
@@ -139,53 +139,53 @@ public class DefaultReplicationComponent
         }
     }
 
-    private void bindReplicationPackageImporter(ReplicationPackageImporter replicationPackageImporter, Map<String, Object> config) {
+    private void bindDistributionPackageImporter(DistributionPackageImporter distributionPackageImporter, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationPackageImporterMap.put(name, replicationPackageImporter);
+            distributionPackageImporterMap.put(name, distributionPackageImporter);
 
         }
     }
 
-    private void unbindReplicationPackageImporter(ReplicationPackageImporter replicationPackageImporter, Map<String, Object> config) {
+    private void unbindDistributionPackageImporter(DistributionPackageImporter distributionPackageImporter, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationPackageImporterMap.remove(name);
+            distributionPackageImporterMap.remove(name);
         }
     }
 
-    private void bindReplicationPackageExporter(ReplicationPackageExporter replicationPackageExporter, Map<String, Object> config) {
+    private void bindDistributionPackageExporter(DistributionPackageExporter distributionPackageExporter, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationPackageExporterMap.put(name, replicationPackageExporter);
+            distributionPackageExporterMap.put(name, distributionPackageExporter);
         }
     }
 
-    private void unbindReplicationPackageExporter(ReplicationPackageExporter replicationPackageExporter, Map<String, Object> config) {
+    private void unbindDistributionPackageExporter(DistributionPackageExporter distributionPackageExporter, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationPackageExporterMap.remove(name);
+            distributionPackageExporterMap.remove(name);
         }
 
     }
 
-    private void bindReplicationAgent(ReplicationAgent replicationAgent, Map<String, Object> config) {
+    private void bindDistributionAgent(DistributionAgent distributionAgent, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationAgentMap.put(name, replicationAgent);
+            distributionAgentMap.put(name, distributionAgent);
         }
     }
 
-    private void unbindReplicationAgent(ReplicationAgent replicationAgent, Map<String, Object> config) {
+    private void unbindDistributionAgent(DistributionAgent distributionAgent, Map<String, Object> config) {
 
         String name = (String) config.get("name");
         if (name != null) {
-            replicationAgentMap.remove(name);
+            distributionAgentMap.remove(name);
         }
 
     }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/GenericDistributionComponentFactory.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/GenericReplicationComponentFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/GenericDistributionComponentFactory.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/GenericDistributionComponentFactory.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/GenericReplicationComponentFactory.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/impl/GenericReplicationComponentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/GenericDistributionComponentFactory.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component.impl;
+package org.apache.sling.distribution.component.impl;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -34,14 +34,14 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferencePolicy;
 import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.replication.agent.ReplicationAgent;
-import org.apache.sling.replication.component.ManagedReplicationComponent;
-import org.apache.sling.replication.component.ReplicationComponent;
-import org.apache.sling.replication.component.ReplicationComponentFactory;
-import org.apache.sling.replication.component.ReplicationComponentProvider;
-import org.apache.sling.replication.resources.impl.OsgiUtils;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.component.DistributionComponent;
+import org.apache.sling.distribution.component.ManagedDistributionComponent;
+import org.apache.sling.distribution.component.DistributionComponentFactory;
+import org.apache.sling.distribution.component.DistributionComponentProvider;
+import org.apache.sling.distribution.resources.impl.OsgiUtils;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider;
+import org.apache.sling.distribution.trigger.DistributionTrigger;
 import org.apache.sling.settings.SlingSettingsService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -50,23 +50,23 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Component(metatype = true,
-        label = "Sling Replication - Generic Components Factory",
-        description = "OSGi configuration factory for generic Replication Components",
+        label = "Sling Distribution - Generic Components Factory",
+        description = "OSGi configuration factory for generic Distribution Components",
         configurationFactory = true,
         specVersion = "1.1",
         policy = ConfigurationPolicy.REQUIRE
 )
-public class GenericReplicationComponentFactory implements ReplicationComponentProvider {
-    private static final String TRANSPORT_AUTHENTICATION_PROVIDER_TARGET = ReplicationComponentFactory.COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER + ".target";
+public class GenericDistributionComponentFactory implements DistributionComponentProvider {
+    private static final String TRANSPORT_AUTHENTICATION_PROVIDER_TARGET = DistributionComponentFactory.COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER + ".target";
 
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     @Property(boolValue = true, label = "Enabled")
-    private static final String ENABLED = ReplicationComponentFactory.COMPONENT_ENABLED;
+    private static final String ENABLED = DistributionComponentFactory.COMPONENT_ENABLED;
 
     @Property(label = "Name")
-    public static final String NAME = ReplicationComponentFactory.COMPONENT_NAME;
+    public static final String NAME = DistributionComponentFactory.COMPONENT_NAME;
 
     @Property(label = "Properties")
     public static final String PROPERTIES = "properties";
@@ -78,7 +78,7 @@ public class GenericReplicationComponent
     private SlingSettingsService settingsService;
 
     @Reference
-    private ReplicationComponentFactory componentFactory;
+    private DistributionComponentFactory componentFactory;
 
     @Property(label = "Target TransportAuthenticationProvider", name = TRANSPORT_AUTHENTICATION_PROVIDER_TARGET)
     @Reference(name = "transportAuthenticationProvider", policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.OPTIONAL_UNARY)
@@ -122,16 +122,16 @@ public class GenericReplicationComponent
                 Object componentObject = null;
 
                 try {
-                    if (ReplicationComponentFactory.COMPONENT_AGENT.equals(componentType)) {
-                        ReplicationAgent agent = componentFactory.createComponent(ReplicationAgent.class, properties, this);
-                        componentClass = ReplicationAgent.class.getName();
+                    if (DistributionComponentFactory.COMPONENT_AGENT.equals(componentType)) {
+                        DistributionAgent agent = componentFactory.createComponent(DistributionAgent.class, properties, this);
+                        componentClass = DistributionAgent.class.getName();
                         componentObject = agent;
 
-                    } else if (ReplicationComponentFactory.COMPONENT_TRIGGER.equals(componentType)) {
+                    } else if (DistributionComponentFactory.COMPONENT_TRIGGER.equals(componentType)) {
 
-                        ReplicationTrigger trigger = componentFactory.createComponent(ReplicationTrigger.class, properties, this);
+                        DistributionTrigger trigger = componentFactory.createComponent(DistributionTrigger.class, properties, this);
 
-                        componentClass = ReplicationTrigger.class.getName();
+                        componentClass = DistributionTrigger.class.getName();
                         componentObject = trigger;
                     }
                 }
@@ -140,8 +140,8 @@ public class GenericReplicationComponent
                 }
 
                 if (componentObject != null && componentClass != null) {
-                    if (componentObject instanceof ManagedReplicationComponent) {
-                        ((ManagedReplicationComponent) componentObject).enable();
+                    if (componentObject instanceof ManagedDistributionComponent) {
+                        ((ManagedDistributionComponent) componentObject).enable();
                     }
 
                     componentReg = context.registerService(componentClass, componentObject, props);
@@ -159,8 +159,8 @@ public class GenericReplicationComponent
         if (componentReg != null) {
             ServiceReference reference = componentReg.getReference();
             Object service = context.getService(reference);
-            if (service instanceof ManagedReplicationComponent) {
-                ((ManagedReplicationComponent) service).disable();
+            if (service instanceof ManagedDistributionComponent) {
+                ((ManagedDistributionComponent) service).disable();
             }
 
             componentReg.unregister();
@@ -191,7 +191,7 @@ public class GenericReplicationComponent
         refresh();
     }
 
-    public <ComponentType extends ReplicationComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
+    public <ComponentType extends DistributionComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
                                                                                    @Nullable String componentName) {
         if (type.isAssignableFrom(TransportAuthenticationProvider.class)) {
             return (ComponentType) transportAuthenticationProvider;

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.component.impl;
+package org.apache.sling.distribution.component.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/package-info.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/package-info.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/package-info.java Fri Nov  7 10:28:02 2014
@@ -18,7 +18,7 @@
  */
 
 @Version("0.1.0")
-package org.apache.sling.replication.component;
+package org.apache.sling.distribution.component;
 
 import aQute.bnd.annotation.Version;
 

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/ReplicationEvent.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/ReplicationEvent.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/ReplicationEvent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java Fri Nov  7 10:28:02 2014
@@ -16,30 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.event;
+package org.apache.sling.distribution.event;
 
 import java.util.Dictionary;
 
 import org.osgi.service.event.Event;
 
 /**
- * A replication related event
+ * A distribution related event
  */
-public class ReplicationEvent extends Event {
+public class DistributionEvent extends Event {
 
-    public static final String EVENT_TOPIC = "org/apache/sling/replication/event";
+    public static final String EVENT_TOPIC = "org/apache/sling/distribution/event";
 
-    public ReplicationEvent(ReplicationEventType type, Dictionary<?, ?> properties) {
+    public DistributionEvent(DistributionEventType type, Dictionary<?, ?> properties) {
         super(getTopic(type), properties);
     }
 
     /**
      * get the topic for a certain event type
      *
-     * @param type the {@link org.apache.sling.replication.event.ReplicationEventType} to get the topic for
+     * @param type the {@link DistributionEventType} to get the topic for
      * @return the topic for the given event type
      */
-    public static String getTopic(ReplicationEventType type) {
+    public static String getTopic(DistributionEventType type) {
         return EVENT_TOPIC + '/' + type.name();
     }
 }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/ReplicationEventType.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/ReplicationEventType.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/ReplicationEventType.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java Fri Nov  7 10:28:02 2014
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.event;
+package org.apache.sling.distribution.event;
 
 /**
- * an enum of the possible types of events related to replication
+ * an enum of the possible types of events related to distribution
  */
-public enum ReplicationEventType {
+public enum DistributionEventType {
 
     /**
      * event for package created

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/DefaultReplicationEventFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java Fri Nov  7 10:28:02 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.event.impl;
+package org.apache.sling.distribution.event.impl;
 
 import javax.annotation.Nonnull;
 import java.util.Dictionary;
@@ -24,28 +24,28 @@ import java.util.Dictionary;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.replication.event.ReplicationEvent;
-import org.apache.sling.replication.event.ReplicationEventType;
+import org.apache.sling.distribution.event.DistributionEvent;
+import org.apache.sling.distribution.event.DistributionEventType;
 import org.osgi.service.event.EventAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * {@link ReplicationEventFactory} OSGi service
+ * {@link DistributionEventFactory} OSGi service
  */
-@Component(immediate = true, label = "Event Factory for Replication Events")
-@Service(value = ReplicationEventFactory.class)
-public class DefaultReplicationEventFactory implements ReplicationEventFactory {
+@Component(immediate = true, label = "Event Factory for Distribution Events")
+@Service(value = DistributionEventFactory.class)
+public class DefaultDistributionEventFactory implements DistributionEventFactory {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     @Reference
     private EventAdmin eventAdmin;
 
-    public void generateEvent(@Nonnull ReplicationEventType replicationEventType, @Nonnull Dictionary<?, ?> properties) {
-        ReplicationEvent replicationEvent = new ReplicationEvent(replicationEventType, properties);
-        eventAdmin.postEvent(replicationEvent);
-        log.debug("replication event posted {}", replicationEvent);
+    public void generateEvent(@Nonnull DistributionEventType distributionEventType, @Nonnull Dictionary<?, ?> properties) {
+        DistributionEvent distributionEvent = new DistributionEvent(distributionEventType, properties);
+        eventAdmin.postEvent(distributionEvent);
+        log.debug("distribution event posted {}", distributionEvent);
     }
 
 }

Copied: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DistributionEventFactory.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/ReplicationEventFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DistributionEventFactory.java?p2=sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DistributionEventFactory.java&p1=sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/ReplicationEventFactory.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/event/impl/ReplicationEventFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DistributionEventFactory.java Fri Nov  7 10:28:02 2014
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.replication.event.impl;
+package org.apache.sling.distribution.event.impl;
 
 import javax.annotation.Nonnull;
 import java.util.Dictionary;
 
-import org.apache.sling.replication.event.ReplicationEventType;
+import org.apache.sling.distribution.event.DistributionEventType;
 
 /**
- * generate replication related events
+ * generate distribution related events
  */
-public interface ReplicationEventFactory {
+public interface DistributionEventFactory {
 
     /**
-     * generate a replication event
+     * generate a distribution event
      *
-     * @param replicationEventType the type of event to be generated
+     * @param distributionEventType the type of event to be generated
      * @param properties           a dictionary of properties to be attached to the event
      */
-    void generateEvent(@Nonnull ReplicationEventType replicationEventType, @Nonnull Dictionary<?, ?> properties);
+    void generateEvent(@Nonnull DistributionEventType distributionEventType, @Nonnull Dictionary<?, ?> properties);
 }

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/package-info.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/package-info.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/package-info.java Fri Nov  7 10:28:02 2014
@@ -18,7 +18,7 @@
  */
 
 @Version("0.1.0")
-package org.apache.sling.replication.event;
+package org.apache.sling.distribution.event;
 
 import aQute.bnd.annotation.Version;
 



Mime
View raw message