From a58e074a8e73bbd3a3212993ef249c1a3b1e8ab4 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Wed, 5 Dec 2007 15:59:28 +0000
Subject: [PATCH] Calendar View contribution integrated

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/bootstrap-context.xml         |  10 +++
 .../alfresco/bootstrap/calendar_templates.acp | Bin 0 -> 3017 bytes
 .../bootstrap/calendar_webscripts.acp         | Bin 0 -> 24057 bytes
 config/alfresco/core-services-context.xml     |   3 +
 .../messages/patch-service.properties         |   9 +-
 config/alfresco/model/calendarModel.xml       |  84 ++++++++++++++++++
 .../alfresco/patch/patch-services-context.xml |  43 ++++++++-
 config/alfresco/version.properties            |   2 +-
 8 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 config/alfresco/bootstrap/calendar_templates.acp
 create mode 100644 config/alfresco/bootstrap/calendar_webscripts.acp
 create mode 100644 config/alfresco/model/calendarModel.xml

diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index a224899a39..30625695d7 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -240,6 +240,16 @@
                     <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
                 </props>
                 
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:webscripts/cm:org/cm:alfresco</prop>
+                    <prop key="location">alfresco/bootstrap/calendar_webscripts.acp</prop>
+                </props>
+                
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</prop>
+                    <prop key="location">alfresco/bootstrap/calendar_templates.acp</prop>
+                </props>
+                
             </list>
         </property>
     </bean>
diff --git a/config/alfresco/bootstrap/calendar_templates.acp b/config/alfresco/bootstrap/calendar_templates.acp
new file mode 100644
index 0000000000000000000000000000000000000000..84765d0a2b8d9a2f5194625f268ece56a848f037
GIT binary patch
literal 3017
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

literal 0
HcmV?d00001

diff --git a/config/alfresco/bootstrap/calendar_webscripts.acp b/config/alfresco/bootstrap/calendar_webscripts.acp
new file mode 100644
index 0000000000000000000000000000000000000000..4efab5f03e490c39187e81693827e87601d6413b
GIT binary patch
literal 24057
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

literal 0
HcmV?d00001

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index ac3c832015..cdc7bb94e3 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -690,6 +690,9 @@
                 
                 <!-- Email model -->
                 <value>alfresco/model/emailServerModel.xml</value>
+                
+                <!-- Calendar model -->
+                <value>alfresco/model/calendarModel.xml</value>
 
                 <!-- Deprecated types -->
                 <value>alfresco/model/deprecated/deprecated_contentModel.xml</value>
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index d97c213656..af2b169430 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -187,7 +187,12 @@ patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore a
 patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
 patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
 
-patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary
+patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
 
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root
+patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
 
+patch.projectsFolder.description=Adds 'Projects' folder to Company Home.
+
+patch.calendarWebscripts.description=Add the Calendar space webscripts to Data Dictionary.
+
+patch.calendarTemplates.description=Add the Calendar templates to the Data Dictionary.
\ No newline at end of file
diff --git a/config/alfresco/model/calendarModel.xml b/config/alfresco/model/calendarModel.xml
new file mode 100644
index 0000000000..c495c2bb10
--- /dev/null
+++ b/config/alfresco/model/calendarModel.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<model name="ia:CalendarEventModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+   <!-- Optional meta-data about the model -->   
+   <description>Calendar Event Model</description>
+   <author>Snig Bhaumik</author>
+   <version>1.0</version>
+
+   <imports>
+   	  <!-- Import Alfresco Dictionary Definitions -->
+      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+      <!-- Import Alfresco Content Domain Model Definitions -->
+      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+   </imports>
+
+   <!-- Introduction of new namespaces defined by this model -->
+   <namespaces>
+      <namespace uri="com.infoaxon.alfresco.calendar" prefix="ia"/>
+   </namespaces>
+
+   <types>
+      <type name="ia:calendarEvent">
+         <title>Calendar Event</title>
+         <parent>cm:content</parent>
+         <properties>
+            <property name="ia:whatEvent">
+               <type>d:text</type>
+            </property>
+            <property name="ia:fromDate">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:toDate">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:whereEvent">
+               <type>d:text</type>
+            </property>
+            <property name="ia:descriptionEvent">
+               <type>d:text</type>
+            </property>
+            <property name="ia:colorEvent">
+               <type>d:text</type>
+            </property>
+         </properties>
+      </type>
+      
+      <type name="ia:calendar">
+         <title>Calendar Space</title>
+         <parent>cm:folder</parent>
+         <properties>
+            <property name="ia:whatEventDefault">
+               <type>d:text</type>
+            </property>
+            <property name="ia:fromDateDefault">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:toDateDefault">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:whereEventDefault">
+               <type>d:text</type>
+            </property>
+            <property name="ia:colorEventDefault">
+               <type>d:text</type>
+            </property>
+		   </properties>
+         <associations>
+   			<association name="ia:subscribedCalendarList">
+   				<source>
+   					<mandatory>false</mandatory>
+   					<many>true</many>
+   				</source>
+   				<target>
+   					<class>ia:calendar</class>
+   					<mandatory>false</mandatory>
+   					<many>true</many>
+   				</target>
+   			</association>
+   		</associations>
+      </type>
+   </types>
+   
+</model>
\ No newline at end of file
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index f6106a21d7..bcdc936a90 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1168,7 +1168,7 @@
     
     <bean id="patch.projectsFolder" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.projectsFolder</value></property>
-        <property name="description"><value>patch.formsFolder.description</value></property>
+        <property name="description"><value>patch.projectsFolder.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>114</value></property>
         <property name="targetSchema"><value>115</value></property>
@@ -1188,4 +1188,43 @@
         </property>
     </bean>
     
-</beans>
+    <bean id="patch.calendarWebscripts" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.calendarWebscripts</value></property>
+        <property name="description"><value>patch.calendarWebscripts.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>115</value></property>
+        <property name="targetSchema"><value>116</value></property>
+        <!-- bootstrap view -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="checkPath">
+            <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:webscripts/cm:org/cm:alfresco/cm:calendar</value>
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:webscripts/cm:org/cm:alfresco</prop>
+                <prop key="location">alfresco/bootstrap/calendar_webscripts.acp</prop>
+            </props>
+        </property>
+    </bean>
+    
+    <bean id="patch.calendarTemplates" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.calendarTemplates</value></property>
+        <property name="description"><value>patch.calendarTemplates.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>116</value></property>
+        <property name="targetSchema"><value>117</value></property>
+        <!-- bootstrap view -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</prop>
+                <prop key="location">alfresco/bootstrap/calendar_templates.acp</prop>
+            </props>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 6f435a81bc..0efe5e7624 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=115
+version.schema=117