From 3214b12e753a13b7859175990bff9d62c7614a3e Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 17 Aug 2006 10:55:46 +0000
Subject: [PATCH] . Fix to RSS Folder Patch to also apply the Guest user
 privileges to the new folder . Fix to bootstrap of content templates to NOT
 apply the uifacets aspect - as this means the properties they cannot be
 edited in the UI!  - problem is that the dynamic properties framework is only
 expecting to see the uifacets aspect on a Space not Content, and so tried to
 show icons for it which blows up  - will provide a patch shortly to correct
 the content templates on an installed system

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/patch/patch-services-context.xml |   3 +++
 .../templates/content_template_examples.xml   |  22 +++++++++---------
 config/alfresco/templates/rss_templates.acp   | Bin 1782 -> 1749 bytes
 .../patch/impl/RSSTemplatesFolderPatch.java   |  14 +++++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 0b535459fa..20cd126753 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -405,6 +405,9 @@
         <property name="importerService">
             <ref bean="importerComponent" />
         </property>
+        <property name="permissionService">
+            <ref bean="permissionService"/>
+        </property>
     </bean>
     
 </beans>
diff --git a/config/alfresco/templates/content_template_examples.xml b/config/alfresco/templates/content_template_examples.xml
index 161081c032..f993d5a5fe 100644
--- a/config/alfresco/templates/content_template_examples.xml
+++ b/config/alfresco/templates/content_template_examples.xml
@@ -2,7 +2,7 @@
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:doc_info.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -16,7 +16,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:localizable.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -30,7 +30,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:my_docs.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -44,7 +44,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:my_spaces.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -58,7 +58,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:my_summary.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -72,7 +72,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:translatable.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -86,7 +86,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:RSS_2.0_recent_docs.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -100,7 +100,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:recent_docs.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -114,7 +114,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:general_example.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -128,7 +128,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:my_docs_inline.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
@@ -142,7 +142,7 @@
   </cm:content>
   <cm:content 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:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:xpath_search.ftl">
     <view:aspects>
-      <app:uifacets></app:uifacets>
+      <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
     </view:aspects>
     <view:properties>
diff --git a/config/alfresco/templates/rss_templates.acp b/config/alfresco/templates/rss_templates.acp
index 6a9fcd3e4e07258cfdbff5408d26b3bb95c2234d..6ca240207fdf9d1d50d4d1a42737440d8960bfca 100644
GIT binary patch
delta 719
zcmV;=0x<pd4b=^>LIVvjT@f|r!nuu=0ssJjlTQO0e@$<kFc7`xS6JK&NqcC!TF9+Z
zrM8EBNIg_qIrflsYHZ6MmZi#%?_k)CNlTG>0W^N^&5U_tZ?BJyW(V*=SyN_L`DMny
z2rHF&EVKK&Pj5bC*VV=LprG3f4@P(s;%Axd5#6RJx~|K)t~~@{bL$_AVYTq!Y*1)@
zUktL<e+6S((QJe@2nHt|gEN&U;iABk@P)z1n}DRhnD2y<%M~?Nf-a;INPY6Dr2p>a
zRFlB9j65bxN!@ZE6Q{HOXRU2FOXb{ZD(AEk{B^!I_%&u5z|S@WRw<KX0&NMTRMD(4
zr~jXl!eP+_;gABGzRa3Fk3#2|IxezlEu~Xve-WCN(}%St2!hbe8s`EO@y7R9Vm|en
zCph0~SW_P`sdl}(skQa(tegk8${|R?D6@>kAs2h4<u~3?l{Bq4x3{~u`Q^@ophkAm
zijdc+<22JeM+OfL1cos*4mm2+AggWh@_kw*n{JfR$^b}({6Pc3{t_G$6n|zIlR9r5
ze|S_7X37Koa}=u3w=gOv!K6k>`{9)v=B2s;BgxT>vjf*kGHRQ;X5YVlVbpTl3<p-&
z+m22}hI=>%15+jjMC*M7Ir{%hc;E<<S<h&%RjufI0%{(Ry=Rj5A!m0KARjqR=s~~L
zl06XJnp!=!o>*uZO=o0MC)Bf75euFse~@t_nX?{=L=J!fn#Vm)drMjlw)Fz4xGBOm
zj+=hBw++NVayX9b(Yw1-eW6&kL(DmeC+Q}MYI@&$UHTAS6n{($mpLBsxls*Z@1R6D
zVnGOHo`d=Y<<-ZlchBcbDc(sj;Yt3r?<%U2jTH_*D!jNbg&MMW^{;*+Aa&tu7|Wg9
zAFNRE*bUX$uSsmU_h#izpy5&d29q5IkPR?h5jEz*xs8<q004lKx&}4|`~?620002f
BRJ;HH

delta 752
zcmV<M0uTMw4fYMNLIVvJgb+1s^9RJX0ssKslTQO0e@k!NAP~OiS0LYOC+(r_YVF)A
zRcdp{L+YW@iiL5O6axahURU|?9b>$~Te+5c@niVDZywCR_V(0Bas=yyR%LdRUuOgq
z(_E<MGJAUb^6pc1TU~9B0=mucAc$8ke3se4d$TEuuIq9tYYUF)T-)bjSS>6V?S$91
zF9zA_e~OSTYc@<P56VX!<!34{%mjfKW((y5F9K12(cgsO%Mmr2gDkjU9`mFzr2o!k
zii!C(k2E+;N!@ZDk<)4WtCqT(xiV(el`&E<dg-rqc8%FOu(N`|DkXM|!;(NsWz8Bh
z?te;h$HgXa#}wG~W!Ch05IWn$X_1X<DIHCVf6z3X-mN8p5D(2Pamqj-Z+wp-<}uei
z!P!>An)-lAwd>WQ*4nnSaQ0@EgOG$#W*G@X&JIHIJKA8BIIZ^&54-pI_09srM0Q*=
zm)Bl~X~uaD4C)Lp??w|Eu@N_|sId@e+!nLn6eE-r3V;hw_YxxV!Z^Aq{`NDvHdY(3
ze_p^`d7ys{LY22IjLL~|76oq7WSC@+RJJgdL%6$E$}$^tvMNRr*3T-%rOa^5ajdo#
zW|+q69u&uUA(S9daDqj}nvx&izY#2G+YHB{JLnG2T;dOKHaa3yFtFCz05Vub!Yoh^
zoM=mMCq*srI|3zjo_r*n_AV!nXuvKte-hDyek(cIBVDUnJhv8EUK5=Cz{DJ|mR1BT
zSe$P{6(>epk0k6b7@+yKxX3L@+3D6Ys6siIZVXlZ?w}h8hUDlS*TZD&ruba3+-$*T
z6i?hmi7LLItSqf_Z;C(T!gcOX{<RSe_})P2;p7WM2=(g3Zzyj*-+XvIUwPriISURa
z`NX3a9$ONlBx8ibM!5hUR}!eg0jmC$PXMIdec8&>Y&p$DIMiKro`b|T+^Vy1rxwLW
i^#_yu1&|FEgb+1s^9RJX0ssKslbHrK1|0?f0000EHDn9`

diff --git a/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java
index 2292bfd091..e952e74bb5 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java
@@ -32,6 +32,7 @@ import org.alfresco.service.cmr.admin.PatchException;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.view.ImporterService;
 import org.alfresco.service.cmr.view.Location;
 import org.alfresco.service.namespace.QName;
@@ -66,6 +67,7 @@ public class RSSTemplatesFolderPatch extends AbstractPatch
     private ImporterBootstrap importerBootstrap;
     private ImporterService importerService;
     private MessageSource messageSource;
+    private PermissionService permissionService;
     
     protected NodeRef dictionaryNodeRef;
     protected Properties configuration;
@@ -73,6 +75,11 @@ public class RSSTemplatesFolderPatch extends AbstractPatch
     
     private String rssTemplatesACP;
     
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+    
     public void setImporterBootstrap(ImporterBootstrap importerBootstrap)
     {
         this.importerBootstrap = importerBootstrap;
@@ -212,6 +219,13 @@ public class RSSTemplatesFolderPatch extends AbstractPatch
             // create it
             createFolder();
             
+            // apply Guest permission to the folder
+            permissionService.setPermission(
+                rssFolderNodeRef,
+                PermissionService.GUEST_AUTHORITY,
+                PermissionService.CONSUMER,
+                true);
+            
             // import the content
             try
             {