From 5c1e37bb5c6f1c64c16b68c427a0b862de4b0b7a Mon Sep 17 00:00:00 2001
From: Nick Burch <nick.burch@quanticate.com>
Date: Wed, 6 Jul 2011 15:55:15 +0000
Subject: [PATCH] ALF-9156 Flesh out more of the Calendar API, and start on
 using it for the rest API

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web-scripts-application-context.xml       | 22 ++++++++++++++++++-
 .../calendar/AbstractCalendarWebScript.java   |  8 +------
 .../scripts/calendar/CalendarEntryGet.java    |  8 ++++---
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 395211d0b5..6e5c4237b9 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -1429,4 +1429,24 @@
          parent="webscript">
    </bean>
 
-</beans>
\ No newline at end of file
+
+   <!--                                        -->
+   <!--      Slingshot Calendar REST API       -->
+   <!--                                        -->
+   
+   <!-- abstract calendar web script -->
+   <bean id="abstractCalendarWebScript"
+          class="org.alfresco.repo.web.scripts.calendar.AbstractCalendarWebscript"
+          parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="siteService" ref="SiteService"/>
+        <property name="calendarService" ref="CalendarService"/>
+   </bean>
+
+   <!-- Fetches the details of one Calendar Event -->
+   <bean id="webscript.org.alfresco.repository.slingshot.calendar.event.get"
+         class="org.alfresco.repo.web.scripts.calendar.CalendarEntryGet"
+         parent="abstractCalendarWebScript">
+   </bean>
+   
+</beans>
diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
index c44b5db8fd..d67127b70d 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
@@ -21,7 +21,6 @@ package org.alfresco.repo.web.scripts.calendar;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.repo.model.Repository;
 import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.site.SiteInfo;
@@ -38,16 +37,10 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
 public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
 {
     // Injected services
-    protected Repository repository;
     protected NodeService nodeService;
     protected SiteService siteService;
     protected CalendarService calendarService;
     
-    public void setRepository(Repository repository)
-    {
-        this.repository = repository;
-    }
-    
     public void setNodeService(NodeService nodeService)
     {
         this.nodeService = nodeService;
@@ -108,4 +101,5 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
     
     protected abstract Map<String, Object> executeImpl(SiteInfo site, 
           String eventName, WebScriptRequest req, Status status, Cache cache);
+    
 }
diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
index b65a08acef..c6beaa1c68 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import org.alfresco.repo.model.Repository;
 import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
@@ -59,10 +60,11 @@ public class CalendarEntryGet extends AbstractCalendarWebScript
       model.put("from", entry.getStart());
       model.put("to", entry.getEnd());
       model.put("tags", entry.getTags());
-      model.put("allday", null); // TODO
-      model.put("docfolder", null); // TODO
+      model.put("isoutlook", entry.isOutlook());
+      model.put("outlookuid", entry.getOutlookUID());
+      model.put("allday", CalendarEntryDTO.isAllDay(entry));
       model.put("recurrence", null); // TODO
-      model.put("isoutlook", null); // TODO
+      model.put("docfolder", null); // TODO
       return model;
    }
 }