You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:29:05 UTC
[sling-org-apache-sling-distribution-api] 31/41: SLING-4153 - moved
communication to root distribution package
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 6e96d9d1bd94d7ca5e83ad6611735b477094f63b
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Dec 16 10:40:49 2014 +0000
SLING-4153 - moved communication to root distribution package
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/api@1645902 13f79535-47bb-0310-9956-ffa450edef68
---
.../{communication => }/DistributionRequest.java | 4 ++--
.../{communication => }/DistributionRequestState.java | 12 ++++++------
.../{communication => }/DistributionRequestType.java | 4 ++--
.../{communication => }/DistributionResponse.java | 10 +++++-----
.../sling/distribution/{communication => }/Distributor.java | 10 +++++-----
.../{communication => }/SimpleDistributionRequest.java | 2 +-
.../sling/distribution/{communication => }/package-info.java | 0
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java b/src/main/java/org/apache/sling/distribution/DistributionRequest.java
similarity index 91%
rename from src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
rename to src/main/java/org/apache/sling/distribution/DistributionRequest.java
index 3bb64d2..72edf92 100644
--- a/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
+++ b/src/main/java/org/apache/sling/distribution/DistributionRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.communication;
+package org.apache.sling.distribution;
import aQute.bnd.annotation.ProviderType;
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
import java.util.Arrays;
/**
- * A {@link org.apache.sling.distribution.communication.DistributionRequest} represents the need from the caller to have
+ * A {@link org.apache.sling.distribution.DistributionRequest} represents the need from the caller to have
* some content being distributed from a source instance to a target instance.
*/
@ProviderType
diff --git a/src/main/java/org/apache/sling/distribution/communication/DistributionRequestState.java b/src/main/java/org/apache/sling/distribution/DistributionRequestState.java
similarity index 77%
rename from src/main/java/org/apache/sling/distribution/communication/DistributionRequestState.java
rename to src/main/java/org/apache/sling/distribution/DistributionRequestState.java
index 914240d..68da98d 100644
--- a/src/main/java/org/apache/sling/distribution/communication/DistributionRequestState.java
+++ b/src/main/java/org/apache/sling/distribution/DistributionRequestState.java
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.communication;
+package org.apache.sling.distribution;
/**
- * The different states a {@link org.apache.sling.distribution.communication.DistributionRequest} can have during its lifecycle.
- * Allowed transitions of {@link org.apache.sling.distribution.communication.DistributionRequestState} for a certain
- * {@link org.apache.sling.distribution.communication.DistributionRequest} are:
+ * The different states a {@link org.apache.sling.distribution.DistributionRequest} can have during its lifecycle.
+ * Allowed transitions of {@link org.apache.sling.distribution.DistributionRequestState} for a certain
+ * {@link org.apache.sling.distribution.DistributionRequest} are:
* {@code #DISTRIBUTED} -> ø
* {@code #DROPPED} -> ø
* {@code #ACCEPTED} -> {@code #DROPPED}
* {@code #ACCEPTED} -> {@code #DISTRIBUTED}
* <p/>
- * {@link org.apache.sling.distribution.communication.DistributionRequest}s executed synchronously
- * will only results in {@code #DISTRIBUTED} or {@code #DROPPED} {@link org.apache.sling.distribution.communication.DistributionRequestState}s
+ * {@link org.apache.sling.distribution.DistributionRequest}s executed synchronously
+ * will only results in {@code #DISTRIBUTED} or {@code #DROPPED} {@link org.apache.sling.distribution.DistributionRequestState}s
* while requests executed asynchronously can result in any of {@code #DISTRIBUTED}, {@code #DROPPED} or {@code #ACCEPTED} states.
*/
public enum DistributionRequestState {
diff --git a/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java b/src/main/java/org/apache/sling/distribution/DistributionRequestType.java
similarity index 94%
rename from src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java
rename to src/main/java/org/apache/sling/distribution/DistributionRequestType.java
index 360b415..f005510 100644
--- a/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java
+++ b/src/main/java/org/apache/sling/distribution/DistributionRequestType.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.communication;
+package org.apache.sling.distribution;
import javax.annotation.CheckForNull;
/**
- * The request type tied to a specific {@link org.apache.sling.distribution.communication.DistributionRequest}, used to decide how
+ * The request type tied to a specific {@link org.apache.sling.distribution.DistributionRequest}, used to decide how
* the distribution content should be aggregated.
* <p/>
* {@code ADD} requests can for example lead to the creation of a package of resources to be persisted on the target instance.
diff --git a/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java b/src/main/java/org/apache/sling/distribution/DistributionResponse.java
similarity index 81%
rename from src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java
rename to src/main/java/org/apache/sling/distribution/DistributionResponse.java
index c2c7298..f1ca93c 100644
--- a/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java
+++ b/src/main/java/org/apache/sling/distribution/DistributionResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.communication;
+package org.apache.sling.distribution;
import aQute.bnd.annotation.ProviderType;
@@ -25,10 +25,10 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
- * A {@link org.apache.sling.distribution.communication.DistributionResponse} represents the outcome of a
- * {@link org.apache.sling.distribution.communication.DistributionRequest} as handled by a certain distribution agent.
- * Such a response will include the {@link org.apache.sling.distribution.communication.DistributionRequestState state} of
- * the {@link org.apache.sling.distribution.communication.DistributionRequest request} and optionally a message for more
+ * A {@link org.apache.sling.distribution.DistributionResponse} represents the outcome of a
+ * {@link org.apache.sling.distribution.DistributionRequest} as handled by a certain distribution agent.
+ * Such a response will include the {@link org.apache.sling.distribution.DistributionRequestState state} of
+ * the {@link org.apache.sling.distribution.DistributionRequest request} and optionally a message for more
* verbose information about the outcome of the request.
*/
@ProviderType
diff --git a/src/main/java/org/apache/sling/distribution/communication/Distributor.java b/src/main/java/org/apache/sling/distribution/Distributor.java
similarity index 80%
rename from src/main/java/org/apache/sling/distribution/communication/Distributor.java
rename to src/main/java/org/apache/sling/distribution/Distributor.java
index 3d1b77c..4a714fa 100644
--- a/src/main/java/org/apache/sling/distribution/communication/Distributor.java
+++ b/src/main/java/org/apache/sling/distribution/Distributor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.distribution.communication;
+package org.apache.sling.distribution;
import aQute.bnd.annotation.ProviderType;
import org.apache.sling.api.resource.ResourceResolver;
@@ -25,7 +25,7 @@ import org.apache.sling.api.resource.ResourceResolver;
import javax.annotation.Nonnull;
/**
- * A distributor is responsible for dispatching {@link org.apache.sling.distribution.communication.DistributionRequest}s to distribution agents.
+ * A distributor is responsible for dispatching {@link org.apache.sling.distribution.DistributionRequest}s to distribution agents.
* <p/>
* The distribution agents are executing the requests by creating packages from a source Sling instance containing content for the specified paths
* and then pushing and installing these on a target instance.
@@ -33,10 +33,10 @@ import javax.annotation.Nonnull;
@ProviderType
public interface Distributor {
/**
- * Perform a {@link org.apache.sling.distribution.communication.DistributionRequest} to distribute content from a source
+ * Perform a {@link org.apache.sling.distribution.DistributionRequest} to distribute content from a source
* instance to a target instance.
* The content to be sent will be assembled according to the information contained in the request.
- * A {@link org.apache.sling.distribution.communication.DistributionResponse} holding the {@link org.apache.sling.distribution.communication.DistributionRequestState}
+ * A {@link org.apache.sling.distribution.DistributionResponse} holding the {@link org.apache.sling.distribution.DistributionRequestState}
* of the provided request will be returned.
* Synchronous distribution agents will usually block until the execution has finished
* while asynchronous agents will usually return the response as soon as the content to be distributed has been assembled
@@ -45,7 +45,7 @@ public interface Distributor {
* @param agentName the name of the agent used to distribute the request
* @param distributionRequest the distribution request
* @param resourceResolver the resource resolver used for authorizing the request,
- * @return a {@link org.apache.sling.distribution.communication.DistributionResponse}
+ * @return a {@link org.apache.sling.distribution.DistributionResponse}
*/
@Nonnull
DistributionResponse distribute(@Nonnull String agentName, @Nonnull ResourceResolver resourceResolver,
diff --git a/src/main/java/org/apache/sling/distribution/communication/SimpleDistributionRequest.java b/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
similarity index 98%
rename from src/main/java/org/apache/sling/distribution/communication/SimpleDistributionRequest.java
rename to src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
index 010e516..6d14084 100644
--- a/src/main/java/org/apache/sling/distribution/communication/SimpleDistributionRequest.java
+++ b/src/main/java/org/apache/sling/distribution/SimpleDistributionRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.communication;
+package org.apache.sling.distribution;
import javax.annotation.Nonnull;
import java.util.Arrays;
diff --git a/src/main/java/org/apache/sling/distribution/communication/package-info.java b/src/main/java/org/apache/sling/distribution/package-info.java
similarity index 100%
rename from src/main/java/org/apache/sling/distribution/communication/package-info.java
rename to src/main/java/org/apache/sling/distribution/package-info.java
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.