From fdeeab339762bd5a11ac73931e70931a6d6c71b7 Mon Sep 17 00:00:00 2001
From: N Smith <left@alfresco.com>
Date: Fri, 17 Jun 2011 12:46:17 +0000
Subject: [PATCH] Created channels.get Rest Api webscript. Tested in
 PublishingRestApiTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-scripts-application-context.xml   | 11 +++++++++++
 .../scripts/workflow/AbstractWorkflowWebscript.java   |  7 +++----
 .../repo/web/scripts/workflow/TaskInstancesGet.java   |  2 +-
 .../web/scripts/workflow/WorkflowInstancesGet.java    |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 948937adb5..c59654d1cf 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -1023,6 +1023,17 @@
           class="org.alfresco.repo.web.scripts.workflow.WorkflowInstanceDelete"
           parent="abstractWorkflowWebScript"></bean>
 
+    <!--                                   -->
+    <!--      Publishing Service REST API    -->
+    <!--                                   -->
+
+    <!-- Get Channels web script -->
+    <bean id="webscript.org.alfresco.repository.publishing.channels.get"
+          class="org.alfresco.repo.web.scripts.publishing.ChannelsGet"
+          parent="webscript">
+        <property name="channelService" ref="channelService" />
+    </bean>
+
     <!--                                   -->
     <!--      Audit Service REST API    -->
     <!--                                   -->
diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java b/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java
index 2fad449290..c666fe49a3 100644
--- a/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java
+++ b/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java
@@ -218,15 +218,14 @@ public abstract class AbstractWorkflowWebscript extends DeclarativeWebScript
     
     /**
      * Builds the results model, applying pagination to the results if necessary.
-     * 
-     * @param modelBuilder WorkflowModelBuilder instance to use
      * @param req The WebScript request
      * @param dataPropertyName The name of the property to use in the model
      * @param results The full set of results
+     * 
      * @return List of results to return to the callee
      */
-    protected Map<String, Object> createResultModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, 
-                String dataPropertyName, List<Map<String, Object>> results)
+    protected Map<String, Object> createResultModel(WebScriptRequest req, String dataPropertyName, 
+                List<Map<String, Object>> results)
     {
         int totalItems = results.size();
         int maxItems = getIntParameter(req, PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS);
diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java b/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java
index 12b351ee60..724167962d 100644
--- a/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java
@@ -170,7 +170,7 @@ public class TaskInstancesGet extends AbstractWorkflowWebscript
         }
 
         // create and return results, paginated if necessary
-        return createResultModel(modelBuilder, req, "taskInstances", results);
+        return createResultModel(req, "taskInstances", results);
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java
index f7e1e6bd30..065f353789 100644
--- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java
@@ -148,7 +148,7 @@ public class WorkflowInstancesGet extends AbstractWorkflowWebscript
         }
 
         // create and return results, paginated if necessary
-        return createResultModel(modelBuilder, req, "workflowInstances", results);
+        return createResultModel(req, "workflowInstances", results);
     }
 
     /**