This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.distribution.api-0.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-api.git
commit 398a77417c42818e13a5db4743979d3ae4b3dc69 Author: Marius Petria <[email protected]> AuthorDate: Mon Nov 17 16:00:18 2014 +0000 SLING-4153: Cleaning DistributionComponentFactory of all constants and making it a ConsumerType git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/api@1640176 13f79535-47bb-0310-9956-ffa450edef68 --- .../component/DistributionComponentFactory.java | 297 +-------------------- .../component/DistributionComponentProvider.java | 4 +- 2 files changed, 7 insertions(+), 294 deletions(-) diff --git a/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java b/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java index 60d3301..8414138 100644 --- a/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java +++ b/src/main/java/org/apache/sling/distribution/component/DistributionComponentFactory.java @@ -23,308 +23,22 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Map; +import aQute.bnd.annotation.ConsumerType; import aQute.bnd.annotation.ProviderType; /** - * factory for {@link DistributionComponent}s + * factory for {@link DistributionComponent}s. + * A client should register a component factory if it has custom implementations of distribution components. */ -@ProviderType +@ConsumerType public interface DistributionComponentFactory { - /** - * the type of the component - */ - String COMPONENT_TYPE = "type"; - - /** - * the name of the component - */ - String COMPONENT_NAME = "name"; - - /** - * type for components referencing OSGi services - */ - String COMPONENT_TYPE_SERVICE = "service"; - - /** - * component enabled - */ - String COMPONENT_ENABLED = "enabled"; - - - /** - * distribution agent component - */ - String COMPONENT_AGENT = "agent"; - - /** - * package exporter component - */ - String COMPONENT_PACKAGE_EXPORTER = "packageExporter"; - - /** - * package importer component - */ - String COMPONENT_PACKAGE_IMPORTER = "packageImporter"; - - /** - * request authorization strategy component - */ - String COMPONENT_REQUEST_AUTHORIZATION_STRATEGY = "requestAuthorizationStrategy"; - - /** - * queue distribution strategy component - */ - String COMPONENT_QUEUE_DISTRIBUTION_STRATEGY = "queueDistributionStrategy"; - - /** - * queue provider component - */ - String COMPONENT_QUEUE_PROVIDER = "queueProvider"; - - /** - * trigger component - */ - String COMPONENT_TRIGGER = "trigger"; - - /** - * package builder component - */ - String COMPONENT_PACKAGE_BUILDER = "packageBuilder"; - - /** - * transport authentication provider component - */ - String COMPONENT_TRANSPORT_AUTHENTICATION_PROVIDER = "transportAuthenticationProvider"; - - /** - * simple distribution agent type - */ - String AGENT_SIMPLE = "simple"; - - /** - * service user property - */ - String AGENT_SIMPLE_PROPERTY_SERVICE_NAME = "serviceName"; - - /** - * 'passive' property for agents (for defining "queueing agents") - */ - String AGENT_SIMPLE_PROPERTY_IS_PASSIVE = "isPassive"; - - /** - * local package exporter type - */ - String PACKAGE_EXPORTER_LOCAL = "local"; - - /** - * remote package exporter type - */ - String PACKAGE_EXPORTER_REMOTE = "remote"; - - /** - * endpoints property - */ - String PACKAGE_EXPORTER_REMOTE_PROPERTY_ENDPOINTS = "endpoints"; - - /** - * endpoint strategy property - */ - String PACKAGE_EXPORTER_REMOTE_PROPERTY_ENDPOINTS_STRATEGY = "endpoints.strategy"; - - /** - * no. of items to poll property - */ - String PACKAGE_EXPORTER_REMOTE_PROPERTY_POLL_ITEMS = "poll.items"; - - /** - * package exporter's agent property - */ - String PACKAGE_EXPORTER_AGENT = "agent"; - - /** - * local package importer type - */ - String PACKAGE_IMPORTER_LOCAL = "local"; - - /** - * remote package importer type - */ - String PACKAGE_IMPORTER_REMOTE = "remote"; - - /** - * endpoints property - */ - String PACKAGE_IMPORTER_REMOTE_PROPERTY_ENDPOINTS = "endpoints"; - - /** - * endpoint strategy property - */ - String PACKAGE_IMPORTER_REMOTE_PROPERTY_ENDPOINTS_STRATEGY = "endpoints.strategy"; - - /** - * user property - */ - String TRANSPORT_AUTHENTICATION_PROVIDER_USER = "user"; - - /** - * username property - */ - String TRANSPORT_AUTHENTICATION_PROVIDER_USER_PROPERTY_USERNAME = "username"; - - /** - * password property - */ - String TRANSPORT_AUTHENTICATION_PROVIDER_USER_PROPERTY_PASSWORD = "password"; - - /** - * remote event trigger type - */ - String TRIGGER_REMOTE_EVENT = "remoteEvent"; - - /** - * remote event endpoint property - */ - String TRIGGER_REMOTE_EVENT_PROPERTY_ENDPOINT = "endpoint"; - - /** - * resource event trigger type - */ - String TRIGGER_RESOURCE_EVENT = "resourceEvent"; - - /** - * resource event path property - */ - String TRIGGER_RESOURCE_EVENT_PROPERTY_PATH = "path"; - - /** - * scheduled trigger type - */ - String TRIGGER_SCHEDULED_EVENT = "scheduledEvent"; - - /** - * scheduled trigger action property - */ - String TRIGGER_SCHEDULED_EVENT_PROPERTY_ACTION = "action"; - - /** - * scheduled trigger path property - */ - String TRIGGER_SCHEDULED_EVENT_PROPERTY_PATH = "path"; - - /** - * scheduled trigger seconds property - */ - String TRIGGER_SCHEDULED_EVENT_PROPERTY_SECONDS = "seconds"; - - /** - * chain distribution trigger type - */ - String TRIGGER_DISTRIBUTION_EVENT = "distributionEvent"; - - /** - * chain distribution path property - */ - String TRIGGER_DISTRIBUTION_EVENT_PROPERTY_PATH = "path"; - - /** - * jcr event trigger type - */ - String TRIGGER_JCR_EVENT = "jcrEvent"; - - /** - * jcr event trigger path property - */ - String TRIGGER_JCR_EVENT_PROPERTY_PATH = "path"; - - /** - * jcr event trigger service user property - */ - String TRIGGER_JCR_EVENT_PROPERTY_SERVICE_NAME = "servicename"; - - /** - * jcr persisting event trigger type - */ - String TRIGGER_PERSISTED_JCR_EVENT = "persistedJcrEvent"; - - /** - * jcr persisting event trigger path property - */ - String TRIGGER_PERSISTED_JCR_EVENT_PROPERTY_PATH = "path"; - - /** - * jcr persisting event trigger service user property - */ - String TRIGGER_PERSISTED_JCR_EVENT_PROPERTY_SERVICE_NAME = "servicename"; - - /** - * jcr persisting event trigger nuggets path property - */ - String TRIGGER_PERSISTED_JCR_EVENT_PROPERTY_NUGGETS_PATH = "nuggetsPath"; - - /** - * privilege request authorization strategy type - */ - String REQUEST_AUTHORIZATION_STRATEGY_PRIVILEGE = "privilege"; - - /** - * privilege request authorization strategy jcr privilege property - */ - String REQUEST_AUTHORIZATION_STRATEGY_PRIVILEGE_PROPERTY_JCR_PRIVILEGE = "jcrPrivilege"; - - /** - * file vault package builder type - */ - String PACKAGE_BUILDER_FILEVLT = "vlt"; - - /** - * import mode property for file vault package builder - */ - String PACKAGE_BUILDER_FILEVLT_IMPORT_MODE = "importMode"; - - /** - * ACL handling property for file vault package builder - */ - String PACKAGE_BUILDER_FILEVLT_ACLHANDLING = "aclHandling"; - - /** - * queue provider job type - */ - String QUEUE_PROVIDER_JOB = "job"; - - /** - * property for default topics - */ - String QUEUE_PROVIDER_PROPERTY_QUEUE_PREFIX = "queue.prefix"; - - - /** - * queue provider simple type - */ - String QUEUE_PROVIDER_SIMPLE = "simple"; - - /** - * queue distribution strategy single type - */ - String QUEUE_DISTRIBUTION_STRATEGY_SINGLE = "single"; - - /** - * queue distribution strategy priority type - */ - String QUEUE_DISTRIBUTION_STRATEGY_PRIORITY = "priority"; - - /** - * queue distribution strategy priority paths property - */ - String QUEUE_DISTRIBUTION_STRATEGY_PRIORITY_PROPERTY_PATHS = "priority.paths"; /** * 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 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 DistributionComponent} of the specified type initialized with given properties or <code>null</code> @@ -332,6 +46,5 @@ public interface DistributionComponentFactory { */ @CheckForNull <ComponentType extends DistributionComponent> ComponentType createComponent(@Nonnull java.lang.Class<ComponentType> type, - @Nonnull Map<String, Object> properties, - @Nullable DistributionComponentProvider componentProvider); + @Nonnull Map<String, Object> properties); } diff --git a/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java b/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java index a8479a7..2286c36 100644 --- a/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java +++ b/src/main/java/org/apache/sling/distribution/component/DistributionComponentProvider.java @@ -22,12 +22,12 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import aQute.bnd.annotation.ConsumerType; +import aQute.bnd.annotation.ProviderType; /** * provider for already existing {@link DistributionComponent}s */ -@ConsumerType +@ProviderType public interface DistributionComponentProvider { /** -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
