Removed all references to Site from publishing REST API. Replaced publishing-events-query.post with publishing-events-for-node.get.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/publishing/PublishingEvent.java

@@ -25,9 +25,9 @@ import java.util.Date;
 
 /**
  * @author Brian
- *
+ * @author Nick Smith
  */
-public interface PublishingEvent
+public interface PublishingEvent extends Comparable<PublishingEvent>
 {
     enum Status {SCHEDULED, IN_PROGRESS, CANCEL_REQUESTED, COMPLETED, FAILED}
     

source/java/org/alfresco/service/cmr/publishing/PublishingQueue.java

@@ -21,7 +21,6 @@ package org.alfresco.service.cmr.publishing;
 
 import java.util.Calendar;
 import java.util.Collection;
-import java.util.List;
 
 import org.alfresco.service.cmr.repository.NodeRef;
 
@@ -47,18 +46,4 @@ public interface PublishingQueue
      * @return The identifier of the newly scheduled event
      */
     String scheduleNewEvent(PublishingPackage publishingPackage, String channelId, Calendar schedule, String comment, StatusUpdate statusUpdate);
-    
-    /**
-     * Retrieve a list of publishing events associated with this publishing environment, filtering them using the
-     * supplied PublishingEventFilter object (optional - may be <code>null</code>)
-     * @param filter The filter that is to be applied to the publishing events on this environment
-     * @return A list of PublishingEvent objects representing the publishing events that matched the supplied filter on this publishing environment
-     */
-    List<PublishingEvent> getPublishingEvents(PublishingEventFilter filter);
-    
-    /**
-     * A factory method that creates a {@link PublishingEventFilter} object.
-     * @return a new {@link PublishingEventFilter}.
-     */
-    PublishingEventFilter createPublishingEventFilter();
 }

source/java/org/alfresco/service/cmr/publishing/PublishingService.java

@@ -19,6 +19,7 @@
 package org.alfresco.service.cmr.publishing;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -26,7 +27,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 
 public interface PublishingService
 {
-
     /**
      * Retrieve the publishing event that has the specified identifier
      * 
@@ -37,6 +37,20 @@ public interface PublishingService
      */
     PublishingEvent getPublishingEvent(String id);
 
+    /**
+     * Retrieve a list of publishing events for which the specified <code>node</code> was published.
+     * @param publishedNode The node that was published.
+     * @return A list of {@link PublishingEvent}s.
+     */
+    List<PublishingEvent> getEventsForPublishedNode(NodeRef publishedNode);
+    
+    /**
+     * Retrieve a list of publishing events for which the specified <code>node</code> was unpublished.
+     * @param unpublishedNode The node that was unpublished.
+     * @return A list of {@link PublishingEvent}s.
+     */
+    List<PublishingEvent> getEventsForUnpublishedNode(NodeRef unpublishedNode);
+
     /**
      * Request that the specified publishing event be cancelled. This call will
      * cancel the identified publishing event immediately if it hasn't been
@@ -51,7 +65,7 @@ public interface PublishingService
      * Retrieve the publishing queue associated with this publishing environment
      * @return A PublishingQueue object corresponding tho this environment's publishing queue
      */
-    PublishingQueue getPublishingQueue(String siteId);
+    PublishingQueue getPublishingQueue();
     
     /**
      * Discover the publishing status of each of the specified nodes