You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/11/21 17:34:29 UTC
svn commit: r1640955 [1/2] - in /sling/trunk/contrib/extensions/distribution:
api/src/main/java/org/apache/sling/distribution/agent/
api/src/main/java/org/apache/sling/distribution/communication/
api/src/main/java/org/apache/sling/distribution/packagin...
Author: tommaso
Date: Fri Nov 21 16:34:28 2014
New Revision: 1640955
URL: http://svn.apache.org/r1640955
Log:
SLING-4153 - moved paths and request type into package's packageinfo
Added:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java
- copied, changed from r1640924, sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionActionType.java
Removed:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionActionType.java
Modified:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDispatchingStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackage.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentRootServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandler.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandler.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDistributionStrategyTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTest.java
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardDistributionTest.java
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ReverseDistributionTest.java
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java Fri Nov 21 16:34:28 2014
@@ -31,7 +31,7 @@ import org.apache.sling.distribution.que
/**
* A distribution agent is responsible for handling {@link org.apache.sling.distribution.communication.DistributionRequest}s.
* <p/>
- * This means executing actions of e.g.: a specific {@link org.apache.sling.distribution.communication.DistributionActionType}s on
+ * This means executing actions of e.g.: a specific {@link org.apache.sling.distribution.communication.DistributionRequestType}s on
* specific path(s) which will resume pulling resources from a certain Sling instance and / or pushing resources to
* other instances.
*/
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java Fri Nov 21 16:34:28 2014
@@ -29,11 +29,11 @@ public final class DistributionRequest {
private final long time;
- private final DistributionActionType actionType;
+ private final DistributionRequestType actionType;
private final String[] paths;
- public DistributionRequest(@Nonnull DistributionActionType actionType, @Nonnull String... paths) {
+ public DistributionRequest(@Nonnull DistributionRequestType actionType, @Nonnull String... paths) {
this.time = System.currentTimeMillis();
this.actionType = actionType;
this.paths = paths;
@@ -49,11 +49,11 @@ public final class DistributionRequest {
}
/**
- * get the {@link DistributionActionType} associated with this request
+ * get the {@link DistributionRequestType} associated with this request
*
- * @return the type of actionType for request as a {@link DistributionActionType}
+ * @return the type of actionType for request as a {@link DistributionRequestType}
*/
- public DistributionActionType getActionType() {
+ public DistributionRequestType getRequestType() {
return actionType;
}
Copied: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java (from r1640924, sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionActionType.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java?p2=sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java&p1=sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionActionType.java&r1=1640924&r2=1640955&rev=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionActionType.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequestType.java Fri Nov 21 16:34:28 2014
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.co
import javax.annotation.CheckForNull;
/**
- * The action 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.communication.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.
@@ -30,7 +30,7 @@ import javax.annotation.CheckForNull;
* {@code PULL} requests can for example lead to the creation of a "command package" that will trigger fetching of content
* from the target instance.
*/
-public enum DistributionActionType {
+public enum DistributionRequestType {
/**
* Action type for adding content
@@ -55,12 +55,12 @@ public enum DistributionActionType {
* @return the type or {@code null}
*/
@CheckForNull
- public static DistributionActionType fromName(String n) {
+ public static DistributionRequestType fromName(String n) {
if (n == null) {
return null;
}
try {
- return DistributionActionType.valueOf(n.toUpperCase());
+ return DistributionRequestType.valueOf(n.toUpperCase());
} catch (IllegalArgumentException e) {
return null;
}
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java Fri Nov 21 16:34:28 2014
@@ -40,22 +40,6 @@ public interface DistributionPackage {
String getId();
/**
- * get the paths covered by this package
- *
- * @return an array of paths
- */
- @Nonnull
- String[] getPaths();
-
- /**
- * get the action this package is used for
- *
- * @return the action
- */
- @Nonnull
- String getActionType();
-
- /**
* get the type of package
*
* @return the package type
@@ -74,13 +58,6 @@ public interface DistributionPackage {
InputStream createInputStream() throws IOException;
/**
- * get package stream length
- *
- * @return the package length
- */
- long getLength();
-
- /**
* releases all resources associated with this package
*/
void delete();
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java Fri Nov 21 16:34:28 2014
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.distribution.packaging;
import javax.annotation.CheckForNull;
import java.net.URI;
+import org.apache.sling.distribution.communication.DistributionRequestType;
+
/**
* Additional information about a package.
* Additional information is optional and components should expect every piece of it to be null.
@@ -29,9 +30,32 @@ import java.net.URI;
public final class DistributionPackageInfo {
private URI origin;
+ private DistributionRequestType requestType;
+ private String[] paths;
+
+ /**
+ * get the paths covered by the package holding this info
+ *
+ * @return an array of paths
+ */
+ @CheckForNull
+ public String[] getPaths() {
+ return paths;
+ }
+
+ /**
+ * get the request type associated to the package holding this info
+ *
+ * @return the request type
+ */
+ @CheckForNull
+ public DistributionRequestType getRequestType() {
+ return requestType;
+ }
/**
- * retrieves the origin of the package.
+ * retrieves the origin of the package holding this info
+ *
* @return the package origin
*/
@CheckForNull
@@ -41,6 +65,7 @@ public final class DistributionPackageIn
/**
* sets the origin of the package.
+ *
* @param origin the originating instance of this package
*/
public void setOrigin(URI origin) {
@@ -48,12 +73,33 @@ public final class DistributionPackageIn
}
/**
+ * sets the request type for the package holding this info
+ *
+ * @param requestType the request type that originated this package
+ */
+ public void setRequestType(DistributionRequestType requestType) {
+ this.requestType = requestType;
+ }
+
+ /**
+ * sets the paths "covered" by the package holding this info
+ *
+ * @param paths the paths "covered" by this package
+ */
+ public void setPaths(String[] paths) {
+ this.paths = paths;
+ }
+
+ /**
* fills the current info object from the provided one.
+ *
* @param packageInfo package metadata
*/
public void fillInfo(DistributionPackageInfo packageInfo) {
if (packageInfo != null) {
this.setOrigin(packageInfo.getOrigin());
+ this.setPaths(packageInfo.getPaths());
+ this.setRequestType(packageInfo.getRequestType());
}
}
}
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java Fri Nov 21 16:34:28 2014
@@ -18,6 +18,8 @@
*/
package org.apache.sling.distribution.queue;
+import javax.annotation.Nonnull;
+
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
/**
@@ -31,38 +33,27 @@ public class DistributionQueueItem {
private final String id;
- private final String[] paths;
-
- private final String action;
-
private final String type;
private final DistributionPackageInfo packageInfo;
- public DistributionQueueItem(String id, String[] paths, String action, String type, DistributionPackageInfo packageInfo) {
+ public DistributionQueueItem(@Nonnull String id, @Nonnull String type, @Nonnull DistributionPackageInfo packageInfo) {
this.id = id;
- this.paths = paths;
- this.action = action;
this.type = type;
this.packageInfo = packageInfo;
}
+ @Nonnull
public String getId() {
return id;
}
- public String[] getPaths() {
- return paths;
- }
-
- public String getAction() {
- return action;
- }
-
+ @Nonnull
public String getType() {
return type;
}
+ @Nonnull
public DistributionPackageInfo getPackageInfo() {
return packageInfo;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java Fri Nov 21 16:34:28 2014
@@ -27,7 +27,7 @@ import javax.jcr.security.Privilege;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.agent.DistributionRequestAuthorizationException;
import org.apache.sling.distribution.agent.DistributionRequestAuthorizationStrategy;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
public class PrivilegeDistributionRequestAuthorizationStrategy implements DistributionRequestAuthorizationStrategy {
@@ -46,10 +46,10 @@ public class PrivilegeDistributionReques
Session session = resourceResolver.adaptTo(Session.class);
try {
- if (DistributionActionType.ADD.equals(distributionRequest.getActionType())) {
+ if (DistributionRequestType.ADD.equals(distributionRequest.getRequestType())) {
checkPermissionForAdd(session, distributionRequest.getPaths());
}
- else if (DistributionActionType.DELETE.equals(distributionRequest.getActionType())) {
+ else if (DistributionRequestType.DELETE.equals(distributionRequest.getRequestType())) {
checkPermissionForDelete(session, distributionRequest.getPaths());
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java Fri Nov 21 16:34:28 2014
@@ -185,7 +185,9 @@ public class SimpleDistributionAgent imp
Iterable<DistributionQueueItemState> states = queueDistributionStrategy.add(distributionPackage, queueProvider);
for (DistributionQueueItemState state : states) {
Dictionary<Object, Object> properties = new Properties();
- properties.put("distribution.package.paths", distributionPackage.getPaths());
+ if (distributionPackage.getInfo().getPaths() != null) {
+ properties.put("distribution.package.paths", distributionPackage.getInfo().getPaths());
+ }
properties.put("distribution.agent.name", name);
distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_QUEUED, properties);
@@ -308,14 +310,13 @@ public class SimpleDistributionAgent imp
DistributionPackage distributionPackage = distributionPackageExporter.getPackage(agentResourceResolver, queueItem.getId());
-
if (distributionPackage != null) {
distributionPackage.getInfo().fillInfo(queueItem.getPackageInfo());
distributionPackageImporter.importPackage(agentResourceResolver, distributionPackage);
Dictionary<Object, Object> properties = new Properties();
- properties.put("distribution.package.paths", distributionPackage.getPaths());
+ properties.put("distribution.package.paths", distributionPackage.getInfo().getPaths());
properties.put("distribution.agent.name", name);
distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_DISTRIBUTED, properties);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java Fri Nov 21 16:34:28 2014
@@ -33,7 +33,7 @@ import org.apache.sling.distribution.age
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.communication.DistributionRequestType;
import org.apache.sling.distribution.component.DistributionComponent;
import org.apache.sling.distribution.component.DistributionComponentFactory;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
@@ -332,7 +332,7 @@ public class DefaultDistributionComponen
return new ResourceEventDistributionTrigger(path, bundleContext);
} else if (TRIGGER_SCHEDULED_EVENT.equals(factory)) {
- String action = PropertiesUtil.toString(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_ACTION), DistributionActionType.PULL.name());
+ String action = PropertiesUtil.toString(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_ACTION), DistributionRequestType.PULL.name());
String path = PropertiesUtil.toString(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_PATH), "/");
int interval = PropertiesUtil.toInteger(properties.get(TRIGGER_SCHEDULED_EVENT_PROPERTY_SECONDS), 30);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java Fri Nov 21 16:34:28 2014
@@ -70,11 +70,11 @@ public class LocalDistributionPackageImp
success = packageBuilder.installPackage(resourceResolver, distributionPackage);
if (success) {
- log.info("Distribution package read and installed for path(s) {}", Arrays.toString(distributionPackage.getPaths()));
+ log.info("Distribution package read and installed for path(s) {}", Arrays.toString(distributionPackage.getInfo().getPaths()));
Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
- dictionary.put("distribution.action", distributionPackage.getActionType());
- dictionary.put("distribution.path", distributionPackage.getPaths());
+ dictionary.put("distribution.request.type", distributionPackage.getInfo().getRequestType());
+ dictionary.put("distribution.path", distributionPackage.getInfo().getPaths());
distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_INSTALLED, dictionary);
} else {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java Fri Nov 21 16:34:28 2014
@@ -92,7 +92,7 @@ public class RepositoryDistributionPacka
distributionPackage.getId(), addedNode.getPath());
Dictionary<Object, Object> props = new Properties();
- props.put("path", distributionPackage.getPaths());
+ props.put("path", distributionPackage.getInfo().getPaths());
distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_IMPORTED, props);
} else {
throw new Exception("could not get a Session to deliver package to the repository");
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDispatchingStrategy.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDispatchingStrategy.java Fri Nov 21 16:34:28 2014
@@ -124,8 +124,6 @@ public class ErrorAwareQueueDispatchingS
private DistributionQueueItem getItem(DistributionPackage distributionPackage) {
DistributionQueueItem distributionQueueItem = new DistributionQueueItem(distributionPackage.getId(),
- distributionPackage.getPaths(),
- distributionPackage.getActionType(),
distributionPackage.getType(),
distributionPackage.getInfo());
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java Fri Nov 21 16:34:28 2014
@@ -49,24 +49,25 @@ public class PriorityPathQueueDispatchin
private DistributionQueue getQueue(DistributionQueueItem distributionPackage, DistributionQueueProvider queueProvider)
throws DistributionQueueException {
- String[] paths = distributionPackage.getPaths();
+ String[] paths = distributionPackage.getPackageInfo().getPaths();
- log.info("calculating priority for paths {}", Arrays.toString(paths));
-
- boolean usePriorityQueue = false;
String pp = null;
- for (String path : paths) {
- for (String priorityPath : priorityPaths) {
- if (path.startsWith(priorityPath)) {
- usePriorityQueue = true;
- pp = priorityPath;
- break;
+
+ if (paths != null) {
+ log.info("calculating priority for paths {}", Arrays.toString(paths));
+
+ for (String path : paths) {
+ for (String priorityPath : priorityPaths) {
+ if (path.startsWith(priorityPath)) {
+ pp = priorityPath;
+ break;
+ }
}
}
}
DistributionQueue queue;
- if (usePriorityQueue) {
+ if (pp != null) {
log.info("using priority queue for path {}", pp);
queue = queueProvider.getQueue(pp);
} else {
@@ -97,8 +98,6 @@ public class PriorityPathQueueDispatchin
private DistributionQueueItem getItem(DistributionPackage distributionPackage) {
DistributionQueueItem distributionQueueItem = new DistributionQueueItem(distributionPackage.getId(),
- distributionPackage.getPaths(),
- distributionPackage.getActionType(),
distributionPackage.getType(),
distributionPackage.getInfo());
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java Fri Nov 21 16:34:28 2014
@@ -58,8 +58,6 @@ public class SingleQueueDispatchingStrat
private DistributionQueueItem getItem(DistributionPackage distributionPackage) {
DistributionQueueItem distributionQueueItem = new DistributionQueueItem(distributionPackage.getId(),
- distributionPackage.getPaths(),
- distributionPackage.getActionType(),
distributionPackage.getType(),
distributionPackage.getInfo());
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java Fri Nov 21 16:34:28 2014
@@ -22,6 +22,7 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.event.jobs.Job;
@@ -34,17 +35,17 @@ public class JobHandlingUtils {
private static final String TYPE = "distribution.package.type";
- protected static final String ACTION = "distribution.package.action";
+ protected static final String REQUEST_TYPE = "distribution.package.request.type";
protected static final String ORIGIN = "distribution.package.origin";
public static DistributionQueueItem getPackage(final Job job) {
DistributionPackageInfo packageInfo = new DistributionPackageInfo();
packageInfo.setOrigin((URI) job.getProperty(ORIGIN));
+ packageInfo.setPaths((String[]) job.getProperty(PATHS));
+ packageInfo.setRequestType((DistributionRequestType) job.getProperty(REQUEST_TYPE));
return new DistributionQueueItem((String) job.getProperty(ID),
- (String[]) job.getProperty(PATHS),
- String.valueOf(job.getProperty(ACTION)),
String.valueOf(job.getProperty(TYPE)), packageInfo);
}
@@ -53,13 +54,17 @@ public class JobHandlingUtils {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(ID, distributionQueueItem.getId());
- properties.put(PATHS, distributionQueueItem.getPaths());
- properties.put(ACTION, distributionQueueItem.getAction());
properties.put(TYPE, distributionQueueItem.getType());
- DistributionPackageInfo packageInfo = distributionQueueItem.getPackageInfo();
- if (packageInfo != null && packageInfo.getOrigin() != null) {
- properties.put(ORIGIN, packageInfo.getOrigin());
+ DistributionPackageInfo info = distributionQueueItem.getPackageInfo();
+ if (info.getPaths() != null) {
+ properties.put(PATHS, info.getPaths());
+ }
+ if (info.getRequestType() != null) {
+ properties.put(REQUEST_TYPE, info.getRequestType());
+ }
+ if (info.getOrigin() != null) {
+ properties.put(ORIGIN, info.getOrigin());
}
return properties;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java Fri Nov 21 16:34:28 2014
@@ -51,9 +51,7 @@ class ScheduledDistributionQueueProcesso
if (queueProcessor.process(queue.getName(), item)) {
queue.remove(item.getId());
} else {
- log.warn("processing of item {} failed",
- Arrays.toString(item.getPaths()));
-
+ log.warn("processing of item {} failed", item.getId());
}
}
// }
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java Fri Nov 21 16:34:28 2014
@@ -30,8 +30,8 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.distribution.communication.DistributionActionType;
import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.event.DistributionEventType;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.packaging.DistributionPackage;
@@ -62,21 +62,25 @@ public abstract class AbstractDistributi
public DistributionPackage createPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request)
throws DistributionPackageBuildingException {
DistributionPackage distributionPackage;
- if (DistributionActionType.ADD.equals(request.getActionType())) {
+ if (DistributionRequestType.ADD.equals(request.getRequestType())) {
distributionPackage = createPackageForAdd(resourceResolver, request);
- } else if (DistributionActionType.DELETE.equals(request.getActionType())) {
+ } else if (DistributionRequestType.DELETE.equals(request.getRequestType())) {
distributionPackage = new VoidDistributionPackage(request, type);
- } else if (DistributionActionType.PULL.equals(request.getActionType())) {
+ } else if (DistributionRequestType.PULL.equals(request.getRequestType())) {
distributionPackage = new VoidDistributionPackage(request, type);
} else {
throw new DistributionPackageBuildingException("unknown action type "
- + request.getActionType());
+ + request.getRequestType());
}
- if (distributionPackage != null && distributionEventFactory != null) {
- Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
- dictionary.put("distribution.action", distributionPackage.getActionType());
- dictionary.put("distribution.path", distributionPackage.getPaths());
- distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_CREATED, dictionary);
+ if (distributionPackage != null) {
+ distributionPackage.getInfo().setRequestType(request.getRequestType());
+ distributionPackage.getInfo().setPaths(request.getPaths());
+ if (distributionEventFactory != null) {
+ Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
+ dictionary.put("distribution.request.type", distributionPackage.getInfo().getRequestType());
+ dictionary.put("distribution.path", distributionPackage.getInfo().getPaths());
+ distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_CREATED, dictionary);
+ }
}
return distributionPackage;
}
@@ -109,9 +113,9 @@ public abstract class AbstractDistributi
}
public boolean installPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageReadingException {
- DistributionActionType actionType = DistributionActionType.fromName(distributionPackage.getActionType());
+ DistributionRequestType actionType = distributionPackage.getInfo().getRequestType();
boolean installed;
- if (DistributionActionType.DELETE.equals(actionType)) {
+ if (DistributionRequestType.DELETE.equals(actionType)) {
installed = installDeletePackage(resourceResolver, distributionPackage);
} else {
installed = installPackageInternal(resourceResolver, distributionPackage);
@@ -119,8 +123,8 @@ public abstract class AbstractDistributi
if (installed && distributionEventFactory != null) {
Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
- dictionary.put("distribution.action", distributionPackage.getActionType());
- dictionary.put("distribution.path", distributionPackage.getPaths());
+ dictionary.put("distribution.request.type", distributionPackage.getInfo().getRequestType());
+ dictionary.put("distribution.path", distributionPackage.getInfo().getPaths());
distributionEventFactory.generateEvent(DistributionEventType.PACKAGE_INSTALLED, dictionary);
}
@@ -132,7 +136,7 @@ public abstract class AbstractDistributi
try {
if (distributionPackage != null) {
session = getSession(resourceResolver);
- for (String path : distributionPackage.getPaths()) {
+ for (String path : distributionPackage.getInfo().getPaths()) {
if (session.itemExists(path)) {
session.removeItem(path);
}
@@ -174,13 +178,13 @@ public abstract class AbstractDistributi
}
protected void ungetSession(Session session) {
- if (session != null) {
- try {
- session.save();
- } catch (RepositoryException e) {
- log.debug("Cannot save session", e);
- }
- }
+ if (session != null) {
+ try {
+ session.save();
+ } catch (RepositoryException e) {
+ log.debug("Cannot save session", e);
+ }
+ }
}
protected abstract DistributionPackage createPackageForAdd(ResourceResolver resourceResolver, DistributionRequest request)
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java Fri Nov 21 16:34:28 2014
@@ -87,16 +87,6 @@ public class ResourceSharedDistributionP
}
@Nonnull
- public String[] getPaths() {
- return distributionPackage.getPaths();
- }
-
- @Nonnull
- public String getActionType() {
- return distributionPackage.getActionType();
- }
-
- @Nonnull
public String getType() {
return distributionPackage.getType();
}
@@ -106,10 +96,6 @@ public class ResourceSharedDistributionP
return distributionPackage.createInputStream();
}
- public long getLength() {
- return distributionPackage.getLength();
- }
-
public void delete() {
Resource resource = getProxyResource();
try {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java Fri Nov 21 16:34:28 2014
@@ -41,7 +41,7 @@ import org.apache.sling.distribution.ser
public class ResourceSharedDistributionPackageBuilder implements DistributionPackageBuilder {
private final String PN_ORIGINAL_ID = "original.package.id";
- private final String PN_ORIGINAL_ACTION = "original.package.action";
+ private final String PN_ORIGINAL_REQUEST_TYPE = "original.package.request.type";
private final String PN_ORIGINAL_PATHS = "original.package.paths";
private final String PACKAGE_NAME_PREFIX = "distrpackage";
@@ -123,8 +123,8 @@ public class ResourceSharedDistributionP
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(PN_ORIGINAL_ID, distributionPackage.getId());
- properties.put(PN_ORIGINAL_ACTION, distributionPackage.getActionType());
- properties.put(PN_ORIGINAL_PATHS, distributionPackage.getPaths());
+ properties.put(PN_ORIGINAL_REQUEST_TYPE, distributionPackage.getInfo().getRequestType());
+ properties.put(PN_ORIGINAL_PATHS, distributionPackage.getInfo().getPaths());
Resource resource = ResourceUtil.getOrCreateResource(resourceResolver, packagePath, "sling:Folder", "sling:Folder", false);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackage.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackage.java Fri Nov 21 16:34:28 2014
@@ -27,8 +27,8 @@ import java.util.Arrays;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.util.Text;
-import org.apache.sling.distribution.communication.DistributionActionType;
import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.packaging.DistributionPackage;
/**
@@ -44,7 +44,7 @@ public class VoidDistributionPackage ext
private final String id;
- private final String action;
+ private final DistributionRequestType requestType;
public VoidDistributionPackage(DistributionRequest request) {
@@ -54,11 +54,13 @@ public class VoidDistributionPackage ext
public VoidDistributionPackage(DistributionRequest request, String type) {
this.type = type;
this.paths = request.getPaths();
- this.action = request.getActionType().toString();
- this.id = request.getActionType().toString()
+ this.requestType = request.getRequestType();
+ this.id = request.getRequestType().toString()
+ ':' + Arrays.toString(request.getPaths()).replaceAll("\\[", "").replaceAll("\\]", "")
+ ':' + request.getTime()
+ ':' + type;
+ this.getInfo().setPaths(paths);
+ this.getInfo().setRequestType(requestType);
}
public static VoidDistributionPackage fromStream(InputStream stream) throws IOException {
@@ -73,14 +75,14 @@ public class VoidDistributionPackage ext
String timeString = parts[2];
String typeString = parts[3];
- DistributionActionType distributionActionType = DistributionActionType.fromName(actionString);
+ DistributionRequestType distributionRequestType = DistributionRequestType.fromName(actionString);
VoidDistributionPackage distributionPackage = null;
- if (distributionActionType != null) {
+ if (distributionRequestType != null) {
pathsString = Text.unescape(pathsString);
String[] paths = pathsString.split(", ");
- DistributionRequest request = new DistributionRequest(distributionActionType, paths);
+ DistributionRequest request = new DistributionRequest(distributionRequestType, paths);
distributionPackage = new VoidDistributionPackage(request, typeString);
}
@@ -96,19 +98,6 @@ public class VoidDistributionPackage ext
}
@Nonnull
- public String[] getPaths() {
- return paths;
- }
-
- public long getLength() {
- try {
- return id.getBytes("UTF-8").length;
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Unsupported UTF-8 encoding");
- }
- }
-
- @Nonnull
public InputStream createInputStream() throws IOException {
return new ByteArrayInputStream(id.getBytes("UTF-8"));
}
@@ -118,24 +107,17 @@ public class VoidDistributionPackage ext
return id;
}
- @Nonnull
- public String getActionType() {
- return action;
- }
-
-
public void delete() {
-
+ // there's nothing to delete
}
-
@Override
public String toString() {
return "VoidDistributionPackage{" +
"type='" + type + '\'' +
", paths=" + Arrays.toString(paths) +
", id='" + id + '\'' +
- ", action='" + action + '\'' +
+ ", requestType='" + requestType + '\'' +
'}';
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java Fri Nov 21 16:34:28 2014
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.vault.fs.ap
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.serialization.impl.AbstractDistributionPackage;
@@ -44,30 +44,25 @@ public class FileVaultDistributionPackag
private final String id;
- private final String[] paths;
-
private final VaultPackage pkg;
- private final String action;
-
public FileVaultDistributionPackage(VaultPackage pkg) {
this.pkg = pkg;
MetaInf metaInf = pkg.getMetaInf();
- String[] paths = new String[0];
if (metaInf != null) {
WorkspaceFilter filter = metaInf.getFilter();
if (filter == null) {
filter = new DefaultWorkspaceFilter();
}
List<PathFilterSet> filterSets = filter.getFilterSets();
- paths = new String[filterSets.size()];
+ String[] paths = new String[filterSets.size()];
for (int i = 0; i < paths.length; i++) {
paths[i] = filterSets.get(i).getRoot();
}
+ this.getInfo().setPaths(paths);
+ this.getInfo().setRequestType(DistributionRequestType.ADD);
}
- this.paths = paths;
this.id = pkg.getFile().getAbsolutePath();
- this.action = DistributionActionType.ADD.toString();
}
@Nonnull
@@ -76,29 +71,15 @@ public class FileVaultDistributionPackag
}
@Nonnull
- public String[] getPaths() {
- return paths;
- }
-
- @Nonnull
public InputStream createInputStream() throws IOException {
return new FileInputStream(pkg.getFile());
}
- public long getLength() {
- return pkg.getFile().length();
- }
-
@Nonnull
public String getType() {
return FileVaultDistributionPackageBuilder.PACKAGING_TYPE;
}
- @Nonnull
- public String getActionType() {
- return action;
- }
-
public void close() {
pkg.close();
}
@@ -118,9 +99,7 @@ public class FileVaultDistributionPackag
public String toString() {
return "FileVaultDistributionPackage{" +
"id='" + id + '\'' +
- ", paths=" + Arrays.toString(paths) +
", pkg=" + pkg +
- ", action='" + action + '\'' +
'}';
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java Fri Nov 21 16:34:28 2014
@@ -118,14 +118,14 @@ public class DistributionAgentQueueServl
StringBuilder builder = new StringBuilder();
builder.append("\"id\":\"").append(item.getId().replace("\\", "\\\\"));
builder.append("\",\"paths\":[");
- for (int i = 0; i < item.getPaths().length; i++) {
+ for (int i = 0; i < item.getPackageInfo().getPaths().length; i++) {
builder.append("\"");
- builder.append(item.getPaths()[i]);
+ builder.append(item.getPackageInfo().getPaths()[i]);
builder.append("\",");
}
builder.deleteCharAt(builder.length() - 1);
builder.append(']');
- builder.append(",\"action\":\"").append(item.getAction());
+ builder.append(",\"action\":\"").append(item.getPackageInfo().getRequestType());
builder.append("\",\"type\":\"").append(item.getType());
builder.append("\"");
return builder.toString();
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentRootServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentRootServlet.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentRootServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentRootServlet.java Fri Nov 21 16:34:28 2014
@@ -28,7 +28,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.distribution.agent.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentException;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.resources.DistributionConstants;
import org.slf4j.Logger;
@@ -56,7 +56,7 @@ public class DistributionAgentRootServle
String a = request.getParameter(ACTION_PARAMETER);
String[] paths = request.getParameterValues(PATH_PARAMETER);
- DistributionActionType action = DistributionActionType.fromName(a);
+ DistributionRequestType action = DistributionRequestType.fromName(a);
DistributionRequest distributionRequest = new DistributionRequest(action, paths);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java Fri Nov 21 16:34:28 2014
@@ -49,7 +49,6 @@ public class DistributionPackageImporter
.getResource()
.adaptTo(DistributionPackageImporter.class);
- boolean success = false;
final long start = System.currentTimeMillis();
response.setContentType("text/plain");
response.setCharacterEncoding("utf-8");
@@ -59,9 +58,10 @@ public class DistributionPackageImporter
try {
DistributionPackage distributionPackage = distributionPackageImporter.importStream(resourceResolver, stream);
if (distributionPackage != null) {
+ log.info("Package {} imported successfully", distributionPackage);
distributionPackage.delete();
} else {
- log.warn("cannot import distribution package from request {}", request);
+ log.warn("Cannot import distribution package from request {}", request);
response.setStatus(400);
response.getWriter().print("error: could not import a package from the request stream");
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java Fri Nov 21 16:34:28 2014
@@ -106,11 +106,11 @@ public class DistributionTriggerServlet
// write the actual data
// this could be simple text or could be JSON-encoded text that the
// client then decodes
- writer.write("data: " + distributionRequest.getActionType() + " " + Arrays.toString(distributionRequest.getPaths()) + "\n\n");
+ writer.write("data: " + distributionRequest.getRequestType() + " " + Arrays.toString(distributionRequest.getPaths()) + "\n\n");
// flush the buffers to make sure the container sends the bytes
writer.flush();
- log.debug("SSE event {}: {} {}", new Object[]{distributionRequest.getTime(), distributionRequest.getActionType(),
+ log.debug("SSE event {}: {} {}", new Object[]{distributionRequest.getTime(), distributionRequest.getRequestType(),
distributionRequest.getPaths()});
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandler.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandler.java Fri Nov 21 16:34:28 2014
@@ -147,7 +147,8 @@ public class AdvancedHttpDistributionTra
Request req = Request.Post(distributionEndpoint.getUri()).useExpectContinue();
if (useCustomHeaders) {
- String[] customizedHeaders = getCustomizedHeaders(customHeaders, distributionPackage.getActionType(), distributionPackage.getPaths());
+ String[] customizedHeaders = getCustomizedHeaders(customHeaders, distributionPackage.getInfo().getRequestType().name(),
+ distributionPackage.getInfo().getPaths());
for (String header : customizedHeaders) {
addHeader(req, header);
}
@@ -173,7 +174,7 @@ public class AdvancedHttpDistributionTra
if (response != null) {
Content content = response.returnContent();
log.info("Distribution content of type {} for {} delivered: {}", new Object[]{
- type, Arrays.toString(distributionPackage.getPaths()), content});
+ type, Arrays.toString(distributionPackage.getInfo().getPaths()), content});
} else {
throw new IOException("response is empty");
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandler.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandler.java Fri Nov 21 16:34:28 2014
@@ -114,7 +114,7 @@ public class SimpleHttpDistributionTrans
Content content = response.returnContent();
log.info("distribution content of type {} for {} delivered: {}", new Object[]{
distributionPackage.getType(),
- Arrays.toString(distributionPackage.getPaths()),
+ Arrays.toString(distributionPackage.getInfo().getPaths()),
content
});
} else {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java Fri Nov 21 16:34:28 2014
@@ -24,7 +24,7 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.component.ManagedDistributionComponent;
import org.apache.sling.distribution.event.DistributionEventType;
@@ -118,7 +118,7 @@ public class ChainDistributeDistribution
if (p.startsWith(path)) {
log.info("triggering chain distribution from event {}", event);
- DistributionActionType action = DistributionActionType.valueOf(String.valueOf(actionProperty));
+ DistributionRequestType action = DistributionRequestType.valueOf(String.valueOf(actionProperty));
requestHandler.handle(new DistributionRequest(action, paths));
break;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java Fri Nov 21 16:34:28 2014
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.tr
import javax.jcr.RepositoryException;
import javax.jcr.observation.Event;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.trigger.DistributionTrigger;
import org.apache.sling.jcr.api.SlingRepository;
@@ -51,7 +51,7 @@ public class JcrEventDistributionTrigger
replicatingPath = replicatingPath.substring(0, replicatingPath.lastIndexOf('/'));
}
distributionRequest = new DistributionRequest(Event.NODE_REMOVED ==
- type ? DistributionActionType.DELETE : DistributionActionType.ADD, replicatingPath);
+ type ? DistributionRequestType.DELETE : DistributionRequestType.ADD, replicatingPath);
log.info("distributing {}", distributionRequest);
}
return distributionRequest;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java Fri Nov 21 16:34:28 2014
@@ -27,7 +27,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.component.ManagedDistributionComponent;
import org.apache.sling.distribution.trigger.DistributionTrigger;
@@ -87,7 +87,7 @@ public class PersistingJcrEventDistribut
createdNode.setProperty("info", values.toArray(new String[values.size()]));
session.save();
log.info("event persisted at {}", path);
- distributionRequest = new DistributionRequest(DistributionActionType.ADD, path);
+ distributionRequest = new DistributionRequest(DistributionRequestType.ADD, path);
} else {
log.warn("could not create node {}", nuggetsPath + "/" + nodeName);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java Fri Nov 21 16:34:28 2014
@@ -40,7 +40,7 @@ import org.apache.http.nio.protocol.Basi
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.transport.authentication.TransportAuthenticationContext;
import org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider;
@@ -125,11 +125,11 @@ public class RemoteEventDistributionTrig
log.debug("content {} received {},{}", new Object[]{buffer, decoder, ioctrl});
// TODO : currently it always triggers pull request on /, should this be configurable?
- DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.PULL, "/");
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionRequestType.PULL, "/");
handler.handle(distributionRequest);
log.info("distribution request to agent {} sent ({} {})", new Object[]{
handler,
- distributionRequest.getActionType(),
+ distributionRequest.getRequestType(),
distributionRequest.getPaths()});
super.onContentReceived(decoder, ioctrl);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java Fri Nov 21 16:34:28 2014
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.sling.api.SlingConstants;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.component.ManagedDistributionComponent;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
@@ -112,8 +112,8 @@ public class ResourceEventDistributionTr
}
public void handleEvent(Event event) {
- DistributionActionType action = SlingConstants.TOPIC_RESOURCE_REMOVED.equals(event.getTopic()) ?
- DistributionActionType.DELETE : DistributionActionType.ADD;
+ DistributionRequestType action = SlingConstants.TOPIC_RESOURCE_REMOVED.equals(event.getTopic()) ?
+ DistributionRequestType.DELETE : DistributionRequestType.ADD;
log.info("triggering distribution from event {}", event);
for (String pn : event.getPropertyNames()) {
log.info("property {} : {}", pn, event.getProperty(pn));
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java Fri Nov 21 16:34:28 2014
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.apache.sling.distribution.trigger.DistributionTrigger;
@@ -40,7 +40,7 @@ public class ScheduledDistributionTrigge
private final Logger log = LoggerFactory.getLogger(getClass());
- private final DistributionActionType distributionAction;
+ private final DistributionRequestType distributionAction;
private final String path;
private final int secondsInterval;
@@ -48,7 +48,7 @@ public class ScheduledDistributionTrigge
public ScheduledDistributionTrigger(String distributionActionName, String path, int secondsInterval, Scheduler scheduler) {
- this.distributionAction = DistributionActionType.fromName(distributionActionName);
+ this.distributionAction = DistributionRequestType.fromName(distributionActionName);
this.path = path;
this.secondsInterval = secondsInterval;
this.scheduler = scheduler;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java Fri Nov 21 16:34:28 2014
@@ -23,7 +23,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.apache.http.client.utils.URIBuilder;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionParameter;
import org.apache.sling.distribution.communication.DistributionRequest;
@@ -36,12 +36,12 @@ public class RequestUtils {
String action = request.getParameter(DistributionParameter.ACTION.toString());
String[] paths = request.getParameterValues(DistributionParameter.PATH.toString());
- return new DistributionRequest(DistributionActionType.fromName(action), paths);
+ return new DistributionRequest(DistributionRequestType.fromName(action), paths);
}
public static URI appendDistributionRequest(URI uri, DistributionRequest distributionRequest) throws URISyntaxException {
URIBuilder uriBuilder = new URIBuilder(uri);
- uriBuilder.addParameter(DistributionParameter.ACTION.toString(), distributionRequest.getActionType().name());
+ uriBuilder.addParameter(DistributionParameter.ACTION.toString(), distributionRequest.getRequestType().name());
for (String path : distributionRequest.getPaths()) {
uriBuilder.addParameter(DistributionParameter.PATH.toString(), path);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java?rev=1640955&r1=1640954&r2=1640955&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java Fri Nov 21 16:34:28 2014
@@ -23,13 +23,14 @@ import java.util.Arrays;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.distribution.agent.DistributionRequestAuthorizationStrategy;
-import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequestType;
import org.apache.sling.distribution.communication.DistributionRequest;
import org.apache.sling.distribution.communication.DistributionResponse;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.queue.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
@@ -68,11 +69,11 @@ public class SimpleDistributionAgentTest
packageExporter, packageExporterStrategy,
queueProvider, distributionHandler,
distributionEventFactory, resolverFactory, null);
- DistributionRequest request = new DistributionRequest(DistributionActionType.ADD, "/");
+ DistributionRequest request = new DistributionRequest(DistributionRequestType.ADD, "/");
DistributionPackage distributionPackage = mock(DistributionPackage.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- when(distributionPackage.getPaths()).thenReturn(new String[]{"/"});
+ when(distributionPackage.getInfo()).thenReturn(new DistributionPackageInfo());
when(packageExporter.exportPackages(any(ResourceResolver.class), any(DistributionRequest.class)))
.thenReturn(Arrays.asList(distributionPackage));
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(
@@ -97,11 +98,11 @@ public class SimpleDistributionAgentTest
packageExporter, packageExporterStrategy,
queueProvider,
distributionHandler, distributionEventFactory, resolverFactory, null);
- DistributionRequest request = new DistributionRequest(DistributionActionType.ADD, "/");
+ DistributionRequest request = new DistributionRequest(DistributionRequestType.ADD, "/");
DistributionPackage distributionPackage = mock(DistributionPackage.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- when(distributionPackage.getPaths()).thenReturn(new String[]{"/"});
+ when(distributionPackage.getInfo()).thenReturn(new DistributionPackageInfo());
Iterable<DistributionQueueItemState> states = Arrays.asList(new DistributionQueueItemState(DistributionQueueItemState.ItemState.QUEUED,
DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME));
when(distributionHandler.add(any(DistributionPackage.class), any(DistributionQueueProvider.class))).thenReturn(states);
@@ -130,11 +131,12 @@ public class SimpleDistributionAgentTest
packageExporter, packageExporterStrategy,
queueProvider, distributionHandler,
distributionEventFactory, resolverFactory, null);
- DistributionRequest request = new DistributionRequest(DistributionActionType.ADD, "/");
+ DistributionRequest request = new DistributionRequest(DistributionRequestType.ADD, "/");
DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionPackageInfo packageInfo = new DistributionPackageInfo();
+ when(distributionPackage.getInfo()).thenReturn(packageInfo);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- when(distributionPackage.getPaths()).thenReturn(new String[]{"/"});
when(packageExporter.exportPackages(resourceResolver, request)).thenReturn(Arrays.asList(distributionPackage));
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(
new SimpleDistributionQueue(name, "name"));