You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2014/11/03 13:52:43 UTC
svn commit: r1636343 - in
/sling/trunk/contrib/extensions/replication/core/src:
main/java/org/apache/sling/replication/agent/
main/java/org/apache/sling/replication/communication/
main/java/org/apache/sling/replication/component/ main/java/org/apache/s...
Author: mpetria
Date: Mon Nov 3 12:52:42 2014
New Revision: 1636343
URL: http://svn.apache.org/r1636343
Log:
SLING-4106: adding ConsumerType/ProviderType annotations to replication API
Added:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/ReplicationEndpoint.java
Removed:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationRequestAuthorizationStrategy.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageExporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/SharedReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RepositoryReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueue.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueDistributionStrategy.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProcessor.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/ReplicationTransportHandler.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationRequestHandler.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java
sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java Mon Nov 3 12:52:42 2014
@@ -22,6 +22,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import aQute.bnd.annotation.ProviderType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.communication.ReplicationResponse;
@@ -35,6 +36,7 @@ import org.apache.sling.replication.queu
* specific path(s) which will resume pulling resources from a certain Sling instance and / or pushing resources to
* other instances.
*/
+@ProviderType
public interface ReplicationAgent extends ReplicationComponent {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationRequestAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationRequestAuthorizationStrategy.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationRequestAuthorizationStrategy.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationRequestAuthorizationStrategy.java Mon Nov 3 12:52:42 2014
@@ -20,6 +20,7 @@ package org.apache.sling.replication.age
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.component.ReplicationComponent;
@@ -27,6 +28,7 @@ import org.apache.sling.replication.comp
/**
* Strategy for authorizing requests
*/
+@ConsumerType
public interface ReplicationRequestAuthorizationStrategy extends ReplicationComponent {
/**
Modified: 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/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ManagedReplicationComponent.java Mon Nov 3 12:52:42 2014
@@ -18,10 +18,13 @@
*/
package org.apache.sling.replication.component;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* A managed {@link org.apache.sling.replication.component.ReplicationComponent} is a component which requires explicit
* initialization and releasing of its underlying (and implementation specific) resources.
*/
+@ConsumerType
public interface ManagedReplicationComponent {
/**
Modified: 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/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponent.java Mon Nov 3 12:52:42 2014
@@ -18,11 +18,14 @@
*/
package org.apache.sling.replication.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.
*/
+@ConsumerType
public interface ReplicationComponent {
}
Modified: 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/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java Mon Nov 3 12:52:42 2014
@@ -18,6 +18,8 @@
*/
package org.apache.sling.replication.component;
+import aQute.bnd.annotation.ProviderType;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -26,6 +28,7 @@ import java.util.Map;
/**
* factory for {@link ReplicationComponent}s
*/
+@ProviderType
public interface ReplicationComponentFactory {
/**
Modified: 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/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentProvider.java Mon Nov 3 12:52:42 2014
@@ -18,6 +18,8 @@
*/
package org.apache.sling.replication.component;
+import aQute.bnd.annotation.ConsumerType;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -25,6 +27,7 @@ import javax.annotation.Nullable;
/**
* provider for already existing {@link ReplicationComponent}s
*/
+@ConsumerType
public interface ReplicationComponentProvider {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java Mon Nov 3 12:52:42 2014
@@ -18,6 +18,8 @@
*/
package org.apache.sling.replication.packaging;
+import aQute.bnd.annotation.ConsumerType;
+
import javax.annotation.Nonnull;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +28,7 @@ import java.io.Serializable;
/**
* A replication package
*/
+@ConsumerType
public interface ReplicationPackage extends Serializable {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageExporter.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageExporter.java Mon Nov 3 12:52:42 2014
@@ -23,6 +23,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import java.util.List;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.component.ReplicationComponent;
@@ -33,6 +34,7 @@ import org.apache.sling.replication.seri
* {@link org.apache.sling.replication.packaging.ReplicationPackage}s to be then imported by a {@link org.apache.sling.replication.agent.ReplicationAgent}
* (via a {@link org.apache.sling.replication.packaging.ReplicationPackageImporter}).
*/
+@ConsumerType
public interface ReplicationPackageExporter extends ReplicationComponent {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java Mon Nov 3 12:52:42 2014
@@ -22,6 +22,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import java.io.InputStream;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.replication.component.ReplicationComponent;
@@ -29,6 +30,7 @@ import org.apache.sling.replication.comp
* A {@link org.apache.sling.replication.packaging.ReplicationPackageImporter} is responsible for importing
* {@link org.apache.sling.replication.packaging.ReplicationPackage}s into the resource tree.
*/
+@ConsumerType
public interface ReplicationPackageImporter extends ReplicationComponent {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java Mon Nov 3 12:52:42 2014
@@ -24,23 +24,33 @@ package org.apache.sling.replication.pac
* Additional information about a package.
* Additional information is optional and components should expect every piece of it to be null.
*/
-public interface ReplicationPackageInfo {
+public class ReplicationPackageInfo {
+
+ private String origin;
/**
* retrieves the origin of the package.
* @return the package origin
*/
- String getOrigin();
+ public String getOrigin() {
+ return origin;
+ }
/**
* sets the origin of the package.
* @param origin the originating instance of this package
*/
- void setOrigin(String origin);
+ public void setOrigin(String origin) {
+ this.origin = origin;
+ }
/**
* fills the current info object from the provided one.
* @param packageInfo package metadata
*/
- void fillInfo(ReplicationPackageInfo packageInfo);
+ public void fillInfo(ReplicationPackageInfo packageInfo) {
+ if (packageInfo != null) {
+ this.setOrigin(packageInfo.getOrigin());
+ }
+ }
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/SharedReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/SharedReplicationPackage.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/SharedReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/SharedReplicationPackage.java Mon Nov 3 12:52:42 2014
@@ -18,9 +18,12 @@
*/
package org.apache.sling.replication.packaging;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* A {@link ReplicationPackage} that offers basic reference counting
*/
+@ConsumerType
public interface SharedReplicationPackage extends ReplicationPackage {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporter.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporter.java Mon Nov 3 12:52:42 2014
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.packaging.ReplicationPackage;
import org.apache.sling.replication.packaging.ReplicationPackageExporter;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java Mon Nov 3 12:52:42 2014
@@ -34,7 +34,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.component.ReplicationComponentFactory;
import org.apache.sling.replication.event.impl.ReplicationEventFactory;
import org.apache.sling.replication.packaging.ReplicationPackage;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporter.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporter.java Mon Nov 3 12:52:42 2014
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.packaging.ReplicationPackage;
import org.apache.sling.replication.packaging.ReplicationPackageImportException;
import org.apache.sling.replication.packaging.ReplicationPackageImporter;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RepositoryReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RepositoryReplicationPackageImporter.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RepositoryReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RepositoryReplicationPackageImporter.java Mon Nov 3 12:52:42 2014
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.jackrabbit.util.Text;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.event.impl.ReplicationEventFactory;
import org.apache.sling.replication.event.ReplicationEventType;
import org.apache.sling.replication.packaging.ReplicationPackage;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueue.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueue.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueue.java Mon Nov 3 12:52:42 2014
@@ -18,6 +18,8 @@
*/
package org.apache.sling.replication.queue;
+import aQute.bnd.annotation.ConsumerType;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import java.util.Collection;
@@ -25,6 +27,7 @@ import java.util.Collection;
/**
* a queue for handling {@link org.apache.sling.replication.agent.ReplicationAgent}s' requests
*/
+@ConsumerType
public interface ReplicationQueue {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueDistributionStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueDistributionStrategy.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueDistributionStrategy.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueDistributionStrategy.java Mon Nov 3 12:52:42 2014
@@ -20,6 +20,7 @@ package org.apache.sling.replication.que
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.component.ReplicationComponent;
import org.apache.sling.replication.packaging.ReplicationPackage;
@@ -30,6 +31,7 @@ import java.util.List;
* a {@link ReplicationQueueDistributionStrategy} implements an algorithm for the distribution of
* {@link org.apache.sling.replication.packaging.ReplicationPackage}s among the available queues
*/
+@ConsumerType
public interface ReplicationQueueDistributionStrategy extends ReplicationComponent {
String DEFAULT_QUEUE_NAME = "";
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java Mon Nov 3 12:52:42 2014
@@ -18,6 +18,7 @@
*/
package org.apache.sling.replication.queue;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.replication.packaging.ReplicationPackageInfo;
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProcessor.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProcessor.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProcessor.java Mon Nov 3 12:52:42 2014
@@ -18,11 +18,14 @@
*/
package org.apache.sling.replication.queue;
+import aQute.bnd.annotation.ConsumerType;
+
import javax.annotation.Nonnull;
/**
* Processor of {@link org.apache.sling.replication.queue.ReplicationQueueItem}s
*/
+@ConsumerType
public interface ReplicationQueueProcessor {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProvider.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueProvider.java Mon Nov 3 12:52:42 2014
@@ -21,11 +21,13 @@ package org.apache.sling.replication.que
import javax.annotation.Nonnull;
import java.util.Collection;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.replication.component.ReplicationComponent;
/**
* A provider for {@link ReplicationQueue}s
*/
+@ConsumerType
public interface ReplicationQueueProvider extends ReplicationComponent {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java Mon Nov 3 12:52:42 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.replication.packaging.ReplicationPackageInfo;
import org.apache.sling.replication.queue.ReplicationQueueItem;
-import org.apache.sling.replication.serialization.impl.SimpleReplicationPackageInfo;
public class JobHandlingUtils {
@@ -39,7 +38,7 @@ public class JobHandlingUtils {
protected static final String ORIGIN = "replication.package.origin";
public static ReplicationQueueItem getPackage(final Job job) {
- ReplicationPackageInfo packageInfo = new SimpleReplicationPackageInfo();
+ ReplicationPackageInfo packageInfo = new ReplicationPackageInfo();
packageInfo.setOrigin((String) job.getProperty(ORIGIN));
return new ReplicationQueueItem((String) job.getProperty(ID),
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java Mon Nov 3 12:52:42 2014
@@ -27,7 +27,7 @@ import org.apache.sling.replication.pack
* abstract implementation of a {@link org.apache.sling.replication.packaging.ReplicationPackage}
*/
public abstract class AbstractReplicationPackage implements ReplicationPackage {
- private final ReplicationPackageInfo info = new SimpleReplicationPackageInfo();
+ private final ReplicationPackageInfo info = new ReplicationPackageInfo();
@Nonnull
public ReplicationPackageInfo getInfo() {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/ReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/ReplicationTransportHandler.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/ReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/ReplicationTransportHandler.java Mon Nov 3 12:52:42 2014
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.packaging.ReplicationPackage;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java Mon Nov 3 12:52:42 2014
@@ -18,6 +18,7 @@
*/
package org.apache.sling.replication.transport.authentication;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.replication.component.ReplicationComponent;
/**
@@ -27,6 +28,7 @@ import org.apache.sling.replication.comp
* 'authenticables' objects of type {@link A}, producing 'authenticated' objects of type {@link T}.
*
*/
+@ConsumerType
public interface TransportAuthenticationProvider<A, T> extends ReplicationComponent {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java Mon Nov 3 12:52:42 2014
@@ -23,7 +23,7 @@ import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.fluent.Executor;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationException;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandler.java Mon Nov 3 12:52:42 2014
@@ -33,7 +33,7 @@ import org.apache.http.client.fluent.Req
import org.apache.http.client.fluent.Response;
import org.apache.http.entity.ContentType;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.packaging.ReplicationPackage;
import org.apache.sling.replication.serialization.ReplicationPackageBuilder;
import org.apache.sling.replication.transport.ReplicationTransportException;
Added: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/ReplicationEndpoint.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/ReplicationEndpoint.java?rev=1636343&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/ReplicationEndpoint.java (added)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/ReplicationEndpoint.java Mon Nov 3 12:52:42 2014
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.replication.transport.impl;
+
+import java.net.URI;
+
+/**
+ * A replication endpoint
+ */
+public class ReplicationEndpoint {
+
+ private final URI uri;
+
+ public ReplicationEndpoint(URI uri) {
+ this.uri = uri;
+ }
+
+ public ReplicationEndpoint(String uriString) {
+ this.uri = URI.create(uriString);
+ }
+
+ /**
+ * get the URI of this replication endpoint
+ *
+ * @return a <code>URI</code>
+ */
+ public URI getUri() {
+ return uri;
+ }
+
+ @Override
+ public String toString() {
+ return uri.toASCIIString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ReplicationEndpoint that = (ReplicationEndpoint) o;
+
+ return uri.equals(that.uri);
+
+ }
+
+ @Override
+ public int hashCode() {
+ return uri.hashCode();
+ }
+}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java Mon Nov 3 12:52:42 2014
@@ -36,7 +36,7 @@ import org.apache.http.client.fluent.Res
import org.apache.http.conn.HttpHostConnectException;
import org.apache.http.entity.ContentType;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.packaging.ReplicationPackage;
import org.apache.sling.replication.serialization.ReplicationPackageBuilder;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationRequestHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationRequestHandler.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationRequestHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationRequestHandler.java Mon Nov 3 12:52:42 2014
@@ -20,12 +20,14 @@ package org.apache.sling.replication.tri
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.replication.communication.ReplicationRequest;
/**
* An handler for {@link org.apache.sling.replication.communication.ReplicationRequest}s passed to a
* {@link org.apache.sling.replication.trigger.ReplicationTrigger}
*/
+@ConsumerType
public interface ReplicationRequestHandler {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java Mon Nov 3 12:52:42 2014
@@ -20,6 +20,7 @@ package org.apache.sling.replication.tri
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.replication.component.ReplicationComponent;
/**
@@ -29,6 +30,7 @@ import org.apache.sling.replication.comp
* A {@link org.apache.sling.replication.trigger.ReplicationTrigger} is meant to be stateless so that more than one
* {@link org.apache.sling.replication.trigger.ReplicationRequestHandler} can be registered into the same trigger.
*/
+@ConsumerType
public interface ReplicationTrigger extends ReplicationComponent {
/**
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java Mon Nov 3 12:52:42 2014
@@ -41,7 +41,7 @@ import org.apache.http.nio.protocol.Basi
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java Mon Nov 3 12:52:42 2014
@@ -19,7 +19,7 @@
package org.apache.sling.replication.transport.authentication.impl;
import org.apache.http.client.fluent.Executor;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
import org.junit.Test;
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java?rev=1636343&r1=1636342&r2=1636343&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java Mon Nov 3 12:52:42 2014
@@ -30,7 +30,7 @@ import org.apache.http.client.fluent.Req
import org.apache.http.client.fluent.Response;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.communication.ReplicationEndpoint;
+import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.packaging.ReplicationPackage;
import org.apache.sling.replication.packaging.ReplicationPackageInfo;