From dc85ccc8cfe2ae83e1674272dc1f3d9293a5a690 Mon Sep 17 00:00:00 2001
From: Paul Holmes-Higgin <paulhh@alfresco.com>
Date: Fri, 4 Jul 2008 15:51:03 +0000
Subject: [PATCH] Removed most Project Space related pieces, added in Sites
 container (subtype of folder) in Company Home

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/application-context.xml       |   1 -
 config/alfresco/bootstrap-context.xml         |   6 +-
 config/alfresco/bootstrap/projectsSpace.xml   |  16 --
 config/alfresco/bootstrap/sitesSpace.xml      |  16 ++
 config/alfresco/import-export-context.xml     |   2 +-
 .../messages/bootstrap-spaces.properties      |   4 +-
 config/alfresco/model/applicationModel.xml    |   6 -
 config/alfresco/model/siteModel.xml           |   7 +-
 config/alfresco/projects-context.xml          |  27 ---
 config/alfresco/repository.properties         |   2 +-
 .../templates/collaboration_project.xml       | 190 ------------------
 11 files changed, 27 insertions(+), 250 deletions(-)
 delete mode 100644 config/alfresco/bootstrap/projectsSpace.xml
 create mode 100644 config/alfresco/bootstrap/sitesSpace.xml
 delete mode 100644 config/alfresco/projects-context.xml
 delete mode 100644 config/alfresco/templates/collaboration_project.xml

diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index adc5ffc7ac..84266c7f75 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -39,7 +39,6 @@
     <import resource="classpath:alfresco/linkvalidation-service-context.xml"/>
     <import resource="classpath:alfresco/remote-services-context.xml"/>
     <import resource="classpath*:alfresco/office-addin-context.xml"/>
-    <import resource="classpath:alfresco/projects-context.xml"/>
     <import resource="classpath:alfresco/blog-context.xml"/>
     <import resource="classpath:alfresco/thumbnail-service-context.xml"/>
     <import resource="classpath:alfresco/preference-service-context.xml"/>
diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 206e9ef26a..b4fdd9b2a4 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -239,10 +239,6 @@
                     <prop key="location">alfresco/templates/software_engineering_project.xml</prop>
                     <prop key="messages">alfresco/messages/bootstrap-templates</prop>
                 </props>
-                <props>
-                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</prop>
-                    <prop key="location">alfresco/templates/collaboration_project.xml</prop>
-                </props>
                 <props>
                     <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</prop>
                     <prop key="location">alfresco/templates/content_template_examples.xml</prop>
@@ -306,7 +302,7 @@
 
                 <props>
                     <prop key="path">/${spaces.company_home.childname}</prop>
-                    <prop key="location">alfresco/bootstrap/projectsSpace.xml</prop>
+                    <prop key="location">alfresco/bootstrap/sitesSpace.xml</prop>
                     <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
                 </props>
             </list>
diff --git a/config/alfresco/bootstrap/projectsSpace.xml b/config/alfresco/bootstrap/projectsSpace.xml
deleted file mode 100644
index 0bcd035c50..0000000000
--- a/config/alfresco/bootstrap/projectsSpace.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-   <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:wcmwf="http://www.alfresco.org/model/wcmworkflow/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" view:childName="${spaces.projects.childname}">
-   	<view:acl>
-   		<view:ace view:access="ALLOWED">
-   			<view:authority>GROUP_EVERYONE</view:authority>
-   			<view:permission>Contributor</view:permission>
-   		</view:ace>
-   	</view:acl>
-   	<app:uifacets/>
-   	<cm:name>${spaces.projects.name}</cm:name>
-   	<app:icon>space-icon-default</app:icon>
-   	<cm:title>${spaces.projects.name}</cm:title>
-   	<cm:description>${spaces.projects.description}</cm:description>
-   </cm:folder>
-</view:view>
\ No newline at end of file
diff --git a/config/alfresco/bootstrap/sitesSpace.xml b/config/alfresco/bootstrap/sitesSpace.xml
new file mode 100644
index 0000000000..f751200ad6
--- /dev/null
+++ b/config/alfresco/bootstrap/sitesSpace.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
+   <st:sites xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="${spaces.sites.childname}">
+   	<view:acl>
+   		<view:ace view:access="ALLOWED">
+   			<view:authority>GROUP_EVERYONE</view:authority>
+   			<view:permission>Contributor</view:permission>
+   		</view:ace>
+   	</view:acl>
+   	<app:uifacets/>
+   	<cm:name>${spaces.sites.name}</cm:name>
+   	<app:icon>space-icon-default</app:icon>
+   	<cm:title>${spaces.sites.name}</cm:title>
+   	<cm:description>${spaces.sites.description}</cm:description>
+   </st:sites>
+</view:view>
\ No newline at end of file
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index ad61a362e8..4a26ae8442 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -324,7 +324,7 @@
                 <prop key="spaces.wcm_content_forms.childname">${spaces.wcm_content_forms.childname}</prop>
                 <prop key="spaces.content_forms.childname">${spaces.content_forms.childname}</prop>
                 <prop key="spaces.user_homes.childname">${spaces.user_homes.childname}</prop>
-                <prop key="spaces.projects.childname">${spaces.projects.childname}</prop>
+                <prop key="spaces.sites.childname">${spaces.sites.childname}</prop>
             </props>
         </property>
     </bean>
diff --git a/config/alfresco/messages/bootstrap-spaces.properties b/config/alfresco/messages/bootstrap-spaces.properties
index 8abe0e8454..d6db271fb7 100644
--- a/config/alfresco/messages/bootstrap-spaces.properties
+++ b/config/alfresco/messages/bootstrap-spaces.properties
@@ -39,5 +39,5 @@ spaces.user_homes.description=User Homes
 spaces.content_forms.name=Forms
 spaces.content_forms.description=Content Forms
 
-spaces.projects.name=Projects
-spaces.projects.description=Project Collaboration Spaces
\ No newline at end of file
+spaces.sites.name=Sites
+spaces.sites.description=Site Collaboration Spaces
diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml
index b9712765fc..5bd3bc616f 100644
--- a/config/alfresco/model/applicationModel.xml
+++ b/config/alfresco/model/applicationModel.xml
@@ -52,12 +52,6 @@
          <parent>cm:link</parent>
       </type>
       
-      <!-- project model -->
-      <type name="app:projectfolder">
-         <title>Project Folder</title>
-         <parent>cm:folder</parent>
-      </type>
-      
 	</types>
 
 	<aspects>
diff --git a/config/alfresco/model/siteModel.xml b/config/alfresco/model/siteModel.xml
index f8861a534e..fc11b7fc0f 100644
--- a/config/alfresco/model/siteModel.xml
+++ b/config/alfresco/model/siteModel.xml
@@ -19,7 +19,7 @@
       <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys" />
    </imports>
 
-   <!-- Records Management Namespace -->
+   <!-- Sites Namespace -->
    <namespaces>
       <namespace uri="http://www.alfresco.org/model/site/1.0" prefix="st"/>
    </namespaces>
@@ -43,6 +43,11 @@
             <aspect>cm:titled</aspect>
          </mandatory-aspects>
       </type>
+
+      <type name="st:sites">
+         <title>Sites</title>
+         <parent>cm:folder</parent>         
+      </type>
      
    </types>
    
diff --git a/config/alfresco/projects-context.xml b/config/alfresco/projects-context.xml
deleted file mode 100644
index bd70ab97b0..0000000000
--- a/config/alfresco/projects-context.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<!-- Project bean definitions -->
-<beans>
-    <!-- Project behaviour registration -->
-    <bean id="emailserver_aliasable_onAddAspect" class="org.alfresco.repo.policy.registration.ClassPolicyRegistration" parent="policyRegistration">
-        <property name="policyName">
-            <value>{http://www.alfresco.org}onAddAspect</value>
-        </property>
-        <property name="className">
-            <value>{http://www.alfresco.org/model/emailserver/1.0}aliasable</value>
-        </property>
-        <property name="behaviour">
-            <bean class="org.alfresco.repo.jscript.ScriptBehaviour" parent="scriptBehaviour">
-                <property name="notificationFrequency"><value>TRANSACTION_COMMIT</value></property>
-                <property name="location">
-                    <bean class="org.alfresco.repo.jscript.ClasspathScriptLocation">
-                        <constructor-arg>
-                            <value>alfresco/module/projects/script/onAddAspect_emailserver_aliasable.js</value>
-                        </constructor-arg>
-                    </bean>
-                </property>
-            </bean>
-        </property>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index a55fa22303..bff5db14d0 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -183,7 +183,7 @@ spaces.wcm.childname=app:wcm
 spaces.wcm_content_forms.childname=app:wcm_forms
 spaces.content_forms.childname=app:forms
 spaces.user_homes.childname=app:user_homes
-spaces.projects.childname=app:projects
+spaces.sites.childname=st:sites
 
 # Folders for storing people
 system.system_container.childname=sys:system
diff --git a/config/alfresco/templates/collaboration_project.xml b/config/alfresco/templates/collaboration_project.xml
deleted file mode 100644
index 3792a6ce40..0000000000
--- a/config/alfresco/templates/collaboration_project.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <view:metadata>
-    <view:exportBy>admin</view:exportBy>
-    <view:exportDate>2007-12-04T13:25:22.829Z</view:exportDate>
-    <view:exporterVersion>2.9.0 (dev r7521)</view:exporterVersion>
-    <view:exportOf>/app:company_home/app:projects</view:exportOf>
-  </view:metadata>
-  <app:projectfolder xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wcmwf="http://www.alfresco.org/model/wcmworkflow/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:ia="com.infoaxon.alfresco.calendar" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns="" view:childName="cm:New Project">
-    <view:aspects>
-      <cm:auditable></cm:auditable>
-      <sys:referenceable></sys:referenceable>
-      <app:uifacets></app:uifacets>
-    </view:aspects>
-    <view:properties>
-      <cm:description></cm:description>
-      <app:icon>project</app:icon>
-      <sys:node-uuid>b4e91bed-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-      <sys:node-dbid>472</sys:node-dbid>
-      <cm:title></cm:title>
-      <cm:created>2007-12-03T21:50:04.921Z</cm:created>
-      <cm:modifier>admin</cm:modifier>
-      <cm:modified>2007-12-03T21:50:04.937Z</cm:modified>
-      <cm:creator>admin</cm:creator>
-      <sys:store-protocol>workspace</sys:store-protocol>
-      <cm:name>New Project</cm:name>
-      <sys:store-identifier>SpacesStore</sys:store-identifier>
-    </view:properties>
-    <view:associations>
-      <cm:contains>
-        <cm:folder view:childName="cm:Image Gallery">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-            <app:uifacets></app:uifacets>
-            <cm:webscriptable></cm:webscriptable>
-            <cm:projectsummary></cm:projectsummary>
-          </view:aspects>
-          <view:properties>
-            <cm:description></cm:description>
-            <app:icon>project-icon-gallery</app:icon>
-            <sys:node-uuid>725495c6-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-            <sys:node-dbid>466</sys:node-dbid>
-            <cm:title></cm:title>
-            <cm:created>2007-12-03T21:48:13.203Z</cm:created>
-            <cm:webscript>/wcs/collaboration/gallery/view/{noderef}</cm:webscript>
-            <cm:summaryWebscript>/wcs/collaboration/gallerySummary</cm:summaryWebscript>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2007-12-03T21:48:13.234Z</cm:modified>
-            <cm:creator>admin</cm:creator>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>Image Gallery</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-          </view:properties>
-          <view:associations></view:associations>
-        </cm:folder>
-        <cm:folder view:childName="cm:Blog Posts">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-            <app:uifacets></app:uifacets>
-            <cm:webscriptable></cm:webscriptable>
-            <cm:projectsummary></cm:projectsummary>
-            <blg:blogDetails></blg:blogDetails>
-          </view:aspects>
-          <view:properties>
-            <cm:description></cm:description>
-            <app:icon>project-icon-blog</app:icon>
-            <sys:node-uuid>79f7b1a5-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-            <sys:node-dbid>467</sys:node-dbid>
-            <cm:title></cm:title>
-            <cm:created>2007-12-03T21:48:26.031Z</cm:created>
-            <cm:webscript>/wcs/collaboration/blogSpace?nodeRef={noderef}</cm:webscript>
-            <cm:summaryWebscript>/wcs/collaboration/blogSummary</cm:summaryWebscript>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2007-12-03T21:48:26.093Z</cm:modified>
-            <cm:creator>admin</cm:creator>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>Blog Posts</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-          </view:properties>
-          <view:associations></view:associations>
-        </cm:folder>
-        <ia:calendar view:childName="cm:Calendar">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-            <app:uifacets></app:uifacets>
-            <cm:projectsummary></cm:projectsummary>
-            <cm:webscriptable></cm:webscriptable>
-          </view:aspects>
-          <view:properties>
-            <cm:webscript>/wcs/collaboration/calendar?nodeRef={noderef}</cm:webscript>
-            <cm:summaryWebscript>/wcs/collaboration/calendarSummary</cm:summaryWebscript>
-            <cm:description></cm:description>
-            <app:icon>project-icon-calendar</app:icon>
-            <sys:node-uuid>7ff24daa-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-            <sys:node-dbid>468</sys:node-dbid>
-            <cm:title></cm:title>
-            <cm:created>2007-12-03T21:48:36.125Z</cm:created>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2007-12-03T21:48:36.140Z</cm:modified>
-            <cm:creator>admin</cm:creator>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>Calendar</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-          </view:properties>
-          <view:associations></view:associations>
-        </ia:calendar>
-        <cm:folder view:childName="cm:Document Library">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-            <app:uifacets></app:uifacets>
-            <cm:webscriptable></cm:webscriptable>
-            <cm:projectsummary></cm:projectsummary>
-          </view:aspects>
-          <view:properties>
-            <cm:description></cm:description>
-            <app:icon>project-icon-doclibrary</app:icon>
-            <sys:node-uuid>8741cb52-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-            <sys:node-dbid>469</sys:node-dbid>
-            <cm:title></cm:title>
-            <cm:created>2007-12-03T21:48:48.328Z</cm:created>
-            <cm:webscript>/wcs/collaboration/docLibrary?nodeRef={noderef}</cm:webscript>
-            <cm:summaryWebscript>/wcs/collaboration/docSummary</cm:summaryWebscript>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2007-12-03T21:48:48.343Z</cm:modified>
-            <cm:creator>admin</cm:creator>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>Document Library</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-          </view:properties>
-          <view:associations></view:associations>
-        </cm:folder>
-        <cm:folder view:childName="cm:Email Archive">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-            <app:uifacets></app:uifacets>
-            <cm:projectsummary></cm:projectsummary>
-            <cm:webscriptable></cm:webscriptable>
-            <emailserver:aliasable></emailserver:aliasable>
-          </view:aspects>
-          <view:properties>
-            <cm:description></cm:description>
-            <app:icon>project-icon-emailarchive</app:icon>
-            <sys:node-uuid>90b365ad-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-            <sys:node-dbid>470</sys:node-dbid>
-            <cm:title></cm:title>
-            <cm:created>2007-12-03T21:49:04.156Z</cm:created>
-            <cm:webscript>/wcs/collaboration/docLibrary?nodeRef={noderef}</cm:webscript>
-            <cm:summaryWebscript>/wcs/collaboration/emailSummary</cm:summaryWebscript>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2007-12-03T21:49:04.171Z</cm:modified>
-            <cm:creator>admin</cm:creator>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>Email Archive</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-          </view:properties>
-          <view:associations></view:associations>
-        </cm:folder>
-        <fm:forums view:childName="cm:Forums">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-            <app:uifacets></app:uifacets>
-            <cm:projectsummary></cm:projectsummary>
-          </view:aspects>
-          <view:properties>
-            <cm:description></cm:description>
-            <app:icon>project-icon-forums</app:icon>
-            <sys:node-uuid>a3cd60c2-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
-            <sys:node-dbid>471</sys:node-dbid>
-            <cm:title></cm:title>
-            <cm:created>2007-12-03T21:49:36.218Z</cm:created>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2007-12-03T21:49:36.250Z</cm:modified>
-            <cm:creator>admin</cm:creator>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>Forums</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-            <cm:summaryWebscript>/wcs/collaboration/forumSummary</cm:summaryWebscript>
-          </view:properties>
-          <view:associations></view:associations>
-        </fm:forums>
-      </cm:contains>
-    </view:associations>
-  </app:projectfolder>
-</view:view>
\ No newline at end of file