From 58c074e7160d6aac78cee2724554be7c67a7a714 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 18 Aug 2009 15:09:08 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15506: Fix for ALFCOM-3274 - removed double-encoding of webview dashlet title when set from Configure dialog. 15543: Fixes for ETHREEOH-2596 and ETHREEOH-2392. Any Admin user now forced to enter old password when editing themselves in the Share User Admin console. 15620:Merged V3.1 to V3.2 15595: Merged DEV-TEMPORARY to V3.1 15446: Appropriate JSP page was modified to align radio buttons. 15597: Fix for ETHREEOH-2575 - all PNG files now appear in IE6, note that PNG transparency is not supported in IE6. 15598: Merged DEV-TEMPORARY to V3.1 15593: ETHREEOH-2445: Localization Issues [Email Templates and RSS Templates ACPs I18N] 15599: Merged DEV-TEMPORARY to V3.1 15491: ETHREEOH-2460: Localization Issues - Email template 15601: *RECORD ONLY* Merged V3.2 to V3.1 15504: ETHREEOH-2447: My Content page localisation failing. [backport from V3.2] 15613: *RECORD ONLY* Removed reference to portlets message bundle - as per CHK-8518 15784: Minor performance improvements to data dictionary classes relating to Permission evaluations. 15791: Merged V3.1 to V3.2 15693: Merged DEV-TEMPORARY to V3.1 15648: ETHREEOH-2549: Templates in 3.1 will need localising 15743: ETHREEOH-2586: JP:Layout error, the word "....." (cancel) should be in the same line 15745: ETHREEOH-2493 - HTML and XML encoding fixes to Alfresco OpenSearch keyword and person search HTML/ATOM/RSS feed templates. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../bootstrap/customMessagesSpace.xml | 6 +- .../alfresco/bootstrap/customModelsSpace.acp | Bin 2068 -> 2033 bytes .../customWebClientExtensionSpace.xml | 6 +- .../bootstrap/customWorkflowDefsSpace.acp | Bin 2094 -> 2059 bytes .../bootstrap/example_javascripts.acp | Bin 4221 -> 4107 bytes .../bootstrap/invite/invite-email.xml | 8 +- config/alfresco/bootstrap/spaces.xml | 2 +- config/alfresco/bootstrap/webScripts.xml | 48 ++++++++++ .../bootstrap/webscripts/readme_de.html | 24 +++++ .../bootstrap/webscripts/readme_fr.html | 24 +++++ .../bootstrap/webscripts/readme_ja.html | 24 +++++ config/alfresco/core-services-context.xml | 2 + config/alfresco/import-export-context.xml | 6 ++ .../bootstrap-example-javascripts.properties | 14 +++ .../messages/bootstrap-javascripts.properties | 17 ++++ .../bootstrap-readme-template.properties | 2 + .../messages/bootstrap-spaces.properties | 30 +++++- .../messages/content-model.properties | 5 + .../messages/email-server-model.properties | 5 + .../messages/templates-messages.properties | 89 ++++++++++++++++++ .../alfresco/patch/patch-services-context.xml | 5 + .../templates/content/examples/doc_info.ftl | 24 ++--- .../content/examples/general_example.ftl | 24 ++--- .../content/examples/localizable.ftl | 10 +- .../templates/content/examples/my_docs.ftl | 10 +- .../templates/content/examples/my_summary.ftl | 10 +- .../content/examples/recent_docs.ftl | 8 +- .../templates/content/examples/show_audit.ftl | 68 ++++++------- .../content/examples/translatable.ftl | 8 +- config/alfresco/templates/email_templates.acp | Bin 1541 -> 1738 bytes config/alfresco/templates/readme.ftl | 21 ++++- config/alfresco/templates/readme_template.xml | 4 +- config/alfresco/templates/rss_templates.acp | Bin 1749 -> 1653 bytes .../dictionary/M2AnonymousTypeDefinition.java | 9 ++ .../repo/dictionary/M2ClassDefinition.java | 17 ++++ .../impl/model/PermissionModel.java | 19 ++-- .../cmr/dictionary/ClassDefinition.java | 6 ++ 37 files changed, 446 insertions(+), 109 deletions(-) create mode 100755 config/alfresco/bootstrap/webscripts/readme_de.html create mode 100755 config/alfresco/bootstrap/webscripts/readme_fr.html create mode 100755 config/alfresco/bootstrap/webscripts/readme_ja.html create mode 100755 config/alfresco/messages/bootstrap-example-javascripts.properties create mode 100755 config/alfresco/messages/bootstrap-javascripts.properties create mode 100755 config/alfresco/messages/bootstrap-readme-template.properties create mode 100755 config/alfresco/messages/email-server-model.properties create mode 100755 config/alfresco/messages/templates-messages.properties diff --git a/config/alfresco/bootstrap/customMessagesSpace.xml b/config/alfresco/bootstrap/customMessagesSpace.xml index b284b8b270..0417b57a47 100755 --- a/config/alfresco/bootstrap/customMessagesSpace.xml +++ b/config/alfresco/bootstrap/customMessagesSpace.xml @@ -6,10 +6,10 @@ - Customized Messages + ${spaces.messages.description} space-icon-default - Customized Messages - Messages + ${spaces.messages.title} + ${spaces.messages.name} \ No newline at end of file diff --git a/config/alfresco/bootstrap/customModelsSpace.acp b/config/alfresco/bootstrap/customModelsSpace.acp index b83c561a3194296b32e843862f5e4fd5690aaa3d..46e73a8a0d7f53da86a1e858ac555d94e8087dbc 100644 GIT binary patch literal 2033 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 diff --git a/config/alfresco/bootstrap/customWebClientExtensionSpace.xml b/config/alfresco/bootstrap/customWebClientExtensionSpace.xml index 3c9d6d86a6..3a9f5bcb5f 100755 --- a/config/alfresco/bootstrap/customWebClientExtensionSpace.xml +++ b/config/alfresco/bootstrap/customWebClientExtensionSpace.xml @@ -6,10 +6,10 @@ - Customized Web Client + ${spaces.web.client.extension.description} space-icon-default - Customized Web Client - Web Client Extension + ${spaces.web.client.extension.title} + ${spaces.web.client.extension.name} \ No newline at end of file diff --git a/config/alfresco/bootstrap/customWorkflowDefsSpace.acp b/config/alfresco/bootstrap/customWorkflowDefsSpace.acp index e0750a50376593d431c44dbfc45a69d3917f22db..7f31412f1a4d3632227a5d8d55c30e3587ef738b 100644 GIT binary patch delta 2028 zcmV@6aWGM2mlgz1Uu*ZR0(qj006=@000}4?gt)!?OI!J+cp$_ z@2@a~y$!Y`-)$r+wiSKs1~ls)3q_(EcDhZZk{Ct*`$&nh4kb~fYzOOryf`s+Zag~Y z`*>vCynT+N$s@`MPLo^9ojKM7B|#eE`qbwu^%{E4(wzQ! z^!zZ!$&D>9b_Cz~6nS&U*-V|?)OGLN^?teDFV?f=eDSm6?j1)mQHpnrp!`#{Z%-0# zmOC21A3WR7vVD-onV%d#Kcq1#7eX9Rrs1=_@~=;6{`VnDpFW3w=s+an%mUAY-ATkv z5bqCZ6r%j>3=73jtre#sifj-pP-B8h#abqzlE~K}E6silayy}tv4HBL@XH{e(vvy> zp;PBoa+PITS6LR}z;F92NUqZ?2+E-fYZRS|=q18#3xcXatkVqAgd#bQjSwtNzYPsZ-GCi`t&Z50k-!%I(dJ3~pDbR$>Hb-dfhA zM62KdN8txQW=1*~XF;s=NrnPSs-+6q{368EzmE`uTIp+lEyLWitsPL#$Oj3*?piI) z{TKM)2Z*`3v8AuI48L>bE#?y7OBJZyjkF3r%hL?y6eA*e!>lHwmkOX;I+Nb5^UJ6NJum z?Q9U^zA%`7`iJFqy1jQDXE9$L=I*A-U8B>n6yCGd&1zsfh167WrzoDhnPYq^$JW_ ziR4pO7c>ph$m5A9b5iB5bro1oSgUCA$3?32mBL+ruQ+6cP;L8TY3CzfhMs{0tn79f z*PThy0GCAA(74%RGbxL|%BQ>7N4l%ngt$yl+Futp# z;_9z|A$5m=Y_SubkK0#Z52|~NxM=CD7Q6eQy<2U|gN@h(R-$+4HAo(+B+VKZqFhP^MV}>R)o%|&rdGbe|vLYapcPD68adBsN5HgldunmH< zA){?o0LN|+I9j*xoNY?X-L^UeN=w((fl_0C$QYW0N?G?ICcHvI@8CxSiDTSpaoCdr z*OqfFuE7ZS=y<$Kf8!0wDpm@leQhX(dWZzK|9qf?p`&LM6cqhJj!E#4r%76n=qPQV zUqWe+fAFH}lc<~W(T|G$hHS}rIJr-YBow_~t@RtWHI~8gUKJi75R)$LB@kihavG6; zwl#!eI!X~zRWSxCoZ=HqK+9)V{Am%YB>Rb`y4J%YazIKhX|g?rCqQP;U<;wG;S9Ke zVdeli8*Cx9z_8IO$M1&8MGm;E{pyZk@}Y>LTZ`revOInFRJj@Hw?l32*59n$3#qMb zyCS%iV?c01RYOQ?cWp*Ujk%Gu)KOG_u*}vqWEo+wxj%O*Ha^K-yCO6mM^hNsQZwsv zjPXtoG_5>WQM81H3+Ga5Z1yDRz@)MV=%5qYWuzd?>8U{o8W9AzA#4B%u|`lT$CE<$ z8K7iNNf~mW8sZSbXVHhyy@*7F4I?Un8#5sk5FbR=c^HPy{3^)W_8{=pHO5zeVL*qn zyUiGsZH%6UwHO#ptk9BwQu}H6Ow{KP9JBZj^}M5Rt#D7#GqpVaX+Ou2*^x^! zZl4>NyrU9LO1~|OCNLumwh3vo4Bh$WiiFhmBWP(pl9q%S4LNPr1HUZkO1hehf*X6Y}+_LYN*$7(%H_8z($7rxJO820JybmVxXs z6f`m}7}4oyuNxvwMhZZKrh`W>O9~UO!-nCo@e7A}*Rk|JANc;^C2o0t-;Cb;{9eE71%GJ&Pe(+)jVa&4^~S{QHVD_(`9-MTkKoSb zi;Rieo#Cqs{ia`fOk_pmp2McC&Hu<_qDlR{j){{WeM~g_iBbInmZ|4@)|B31=zSZ) z9(*0bz#({@M7~tDQO_%UgGNg&_!@0}3HX6;-YSfhW@-a9ov;rq?_W?$0Rj{N6aWGM z2mlgz1Uu*ZR0(qj006=@000{R0000000000AOHXWlkEo|7EntC1^@s60096207(D< K0IUZ90002zKEUVz delta 2064 zcmV+r2=Dic5Uvm%P)h>@6aWYS2mk|yD>ncD0000000000000{R5Rn}me^pov0KT~9 zMzy%+M)m>r0qt5_lbbdae$TJ)@Y=Bf-|g8Y(M-|s$5x7J(l z&CMghPka6`Ve%0z{=Kyxf3hsu+xFAb)65SKDW*X@i_@<*ziOvAi7CnA^kj3h-kZs! zG;_q6kNnK%E7cl)PU1BC<>dM3NTM5CUhD|I_cQFx9cMFjc2n2AbJzRjdcRoDmh;6= zj=Ogp$wVREF@n?2<-R>hxLNLK{CeVzP3&IB~8D|!F9_&scZi3_f5Qhk-XJ=R_BDK~rMmV%Vut1FoDitf4D3e6K1xaD{ zTaemOCK(GdT@-#11XOxb2OxB+yh^T;MC&R^LK66Ge>qKcnmNTORAG&xQxUyH*=@m4 zH8|=tgE-2toJaboe@r-ign~!%tdwNepeS2Xio(00515IR|43@Sff~Cb9Zhpz&9=J&_+K zLue+qH#0K0U7=cvQJ{HiS(5^-f(H_!kN%Mv>0q1%vC^jre-1KQE|tjU=ZIwfeTW&< zN?$7(=ALcsfKx_3SO|94DrxRNCkH>k%*~B0eXV5pohxoJmjGYNK<#d%W$;NFCpgUr zrjj?pn$x2Rb1~)rPT8jYJj_bp#YM1N#Il-_gyW6(uDFNfZ;U2?h>T5sOXC1jI(d%| zBqCgl7HNTce=so-D}ZU96XZFo)y@f!GhI6y%!m&KQ~$8sPPg~2<1FT@!`$7JiEDH^ zme4(0T`r+uu>^LIk&LB#OzfowFcGAfu`X(}^lCrf&en^XrGX?+W@ShY1gF(;04{aK zI!@Mm*O~2{4RBJ6wnL1elWGO#tU&T9tBWiS;?U!De_s?rnZDLlU_D~3;?;R;=c~Bd zbwdzifO4OoxD)z`FGE*A0+w>SZmU+LaX<>@>*gKyLq^-G0FK=taI|jWIop(|x@~m`f0UN4s{^IRkTEm~m7?wup}aznckn}s z#ks9s9QLHZwdGukYcK*nE1vG+cf284#Y%y+uMMS850T*ZpAVEUbo`8iJi|ZJQxrU; zaTMn?JV_hqmrxqyAH1mgB&w!-^uxTrAzLyYiSFY(LZa8pwSL34#xgk1tHJ{WV$!9( ze*_{dT}~s?wuVqlM=3(8EXF{EQ+#9zvf?2Xe>{Xs$$p|Kul2Bq9FUSrnrx5Z36R+{ z*g|M)I0J5Am^nbs23triFl@BU@%v$NkpnJjzr16Fe$2!0*2>ZxTb{mq%G`|f+o3jh z>u*->h1AxzT@u{NF(5dhsv)GcyEY@Ff5zNMTIwh&SZ3=QvWzg;+@CuY8`rYet_Y3C z(G&)@gzA$9#~81MplRv3jG`qpTsW6fW3wkg2PTz0KnI=BE+YkDPEQR&(1;+w4PgTa zA{s%d9BYN{LqEx!k}~8#HN+u=&!P{Zdl88U8%9(DH)cX8AU=q!bA*sHzY4Ope?16% zb&c^=7|@~YZZigD8>44oZAV>&xXV$9+uG_lY!k`~g!5UCAIT9yTNRO8BVq05|Y+xy-3;^ z)gY-Hx)GiVl?zZ+ShxbV3QHppe^zLW#95&wrS|jinW)bpIA-x*=6OfoT4 zr~P~k&5m4>ar@lBTBe-+oHfzQ}3^006T!000{R3;+NC00000 u06>6&0FfIWB2`!j0KT~9Mzy%+Mo>!y1^@s600962096100K*3W0000Fk;*p! diff --git a/config/alfresco/bootstrap/example_javascripts.acp b/config/alfresco/bootstrap/example_javascripts.acp index 4aea5d40480fb825735c096515b4132f9c3c1ed1..45332799ab9852cb7ac41f3841df89b96fe26dde 100644 GIT binary patch delta 1029 zcmV+g1p52^Ad4W7JrV){2mlpw_&Pf#{Z4rU00507kxwIkm|JhtFcg5__bZ}`2M}s5 z9UWWMW)eb32ni&#@q~mt=X7;RV#{{27PkM6W2dXr%SuJc`rwx)JvkSji@#VIUe2=A zD}f6_^HC@A!;S|zrU}V!N1f}d58d<5WqdL$3ET~;A5ZD$Lf?)$6Dips2=4Cge3Xtk z2uyv-Z-eT8X~2O|K_un#pmH0Zc%E^SfkX+CsFEyXFk_Ut}8Oeu1Q@E!19!ZFM zVR+UJ``xH_6pJJMQROLS zy1-M+gIwym){3hBTl=xlNw#+^qY0#ewRX$({=HtT3Cmp(kq+1}Vr-`oV=2LC)v^$L zmt`Sy$F>>oEXM*h71(>*&(2ALWVMv94p%=fWs6;hWe3+q(rQp}auoNHk3T;cv zVLg{|eZA)CsP^P7y?bMlg7{wRgsRf_8Bwg7GZ@+XZ`NJf+zavxM*WMk`^Q&^euL=6 zETXRV=INZY%EPjI8=CP6N|JkDDH3w6FGev}QxiW&)jszh+0{};KO~0xlhva#*2hV%Gw^0i~*D1A!^Ubs4*zVZw z*nSLbH^(gx<%yTlTZeV)P^)TEmE?eU@9ly2C_HNe?~T;jKDAq8=h_be~gy{6*LTbUe2ea1U$zox2h%wr2LzGzP+FJTcCV1wH6t_GDZ&Y4)6}}#{hW!6_tZ5 zcl-w;y+LWO9KRx zfesq8dIY}-5&{4S02OlhIy)x)PI&_W0F5M*OAcBB>I0KO5F(Sw4lV*b1(QJ#B9j{r zE&{g*lR*$7lWh+!0+kArK@cL7zYi_~cMFq25F(Qi5H14W43j|+HU@YN00000%sB3E delta 1157 zcmV;01bX|6ApIbaJrV!_2msq+QZ*zTW+LkY0093ZkxwIkn%j=sHV}sI^Av=yS`@Y< zZ@kSKwu0Rr(4gr7*-fqr6bv=Cxs^nMq_lRi58n}WUd3>gsD**mjSr)LIGh>sGeLOu zdLM-(1*N%&*As8%P6)(I1U%lZC-3imoW7d8_Ft@04iC%hg`hsx_Tzf8Ge#~Q=i%XD zM#GH)&BRQ9sI8MdbreXUxe@B%WW)L|2+4eJa6BdUCdnaRRHPNnO|4Y zb^dMRJ5KvO^ zmG7Cf1-@s>iH)smA;kJ0?MJBzj(02)0fbIHcRTcF_qv=DGp8a_8?fahJsGPAUoElvk!{`fN@XW+PP63d0gCFS_OLGpov<;hZPL?i04-Vel)Ba6Y(8K2r8q zB4_t{(%hOT?m^ zX~(apB$be$3_LHSDP!?4G7H_aPe|g8rk>xLDoCh$Ej464uQ&4aOWA(FP ze>GN49ktUB|0bXJZ87i4-Yxadkn)(k6I7d4)oWplYr?PA1B!A})tGJ<>gA#Z<2EOM zjXiy8v)X1JBcew{kBI)ah%WhJK%0V4&yLqW6g3bVl2XM*qRDkpY;yhk8^UN9>VdiK z_2Bk={;k&w++{*{*wg{>{fV_QvV3Iu$nrB`d2!C9aX><`eRdenkE=Om%OVi7!-F_p zELej<-VV(1c@K_z?qxrY-?SRKMXv#WY2IEfBgjXPk03u2kmC{n+?GtpgW}uW^E;7W z=LPt#EC9*G#0Wfk?hO%&{B-xrTMOc$&*c|Acs{>!d*S?PR+x|tJ_OC5ESd3OKJt9z z`PuNi7&W^R)?WtmPr~{0Q2&3y{1&KUyXr)amnpUmBwKNm#|Y2zy2bK+=o|8XmpzES zxLEWfdO7d62?P9v%2OSL=glQE!hD4J2=g<6xxM{VU=kJMb#a)$mjV4Ok^L@DkLC%I zjS>-lDd;*SSVeoWf`6-sGOXj$PD20LI_PkfUz+EKx!KPPSm)G6t(74m{|D4E$ zD0}h$0Z>Z=1QY-O00;o4O{_GN84eJ$2n4?g5&!@Q0NY|xH6$EnBI^SH0RJPC*$r9( zTm+M`3L=wN4lV+&1(UG~B9o~OE&?eDld%dSllu-X0tX9|u?i-WQ4cBt=?jyw3L=xA X4=w^x4U@47B9rkC6b9-I00000A!sg% diff --git a/config/alfresco/bootstrap/invite/invite-email.xml b/config/alfresco/bootstrap/invite/invite-email.xml index 698e0abfb6..8138f23988 100644 --- a/config/alfresco/bootstrap/invite/invite-email.xml +++ b/config/alfresco/bootstrap/invite/invite-email.xml @@ -7,10 +7,10 @@ - Invite email templates + ${spaces.templates.email.invite.description} space-icon-default - invite - invite + ${spaces.templates.email.invite.name} + ${spaces.templates.email.invite.name} @@ -25,7 +25,7 @@ true - Email template used to generate the invite email for Alfresco Share + ${spaces.templates.email.generate_the_invite_email.description} contentUrl=classpath:alfresco\bootstrap\invite\invite-email.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_ invite-email.ftl diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml index 13adb72acd..b5b5078609 100644 --- a/config/alfresco/bootstrap/spaces.xml +++ b/config/alfresco/bootstrap/spaces.xml @@ -70,7 +70,7 @@ true - Email template used to generate the invite email for Alfresco Share + ${spaces.templates.email.generate_the_invite_email.description} contentUrl=classpath:alfresco/bootstrap/invite/invite-email.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_ invite-email.ftl diff --git a/config/alfresco/bootstrap/webScripts.xml b/config/alfresco/bootstrap/webScripts.xml index 7042587e0c..19d6422120 100644 --- a/config/alfresco/bootstrap/webScripts.xml +++ b/config/alfresco/bootstrap/webScripts.xml @@ -28,6 +28,54 @@ + + + + + + + + true + ${webscripts.what_are_web_scripts} + contentUrl=classpath:alfresco/bootstrap/webscripts/readme_ja.html|mimetype=text/html|size=|encoding=UTF-8|locale=ja + + + readme_ja.html + + + + + + + + + + + true + ${webscripts.what_are_web_scripts} + contentUrl=classpath:alfresco/bootstrap/webscripts/readme_de.html|mimetype=text/html|size=|encoding=UTF-8|locale=de + + + readme_de.html + + + + + + + + + + + true + ${webscripts.what_are_web_scripts} + contentUrl=classpath:alfresco/bootstrap/webscripts/readme_fr.html|mimetype=text/html|size=|encoding=UTF-8|locale=fr + + + readme_fr.html + + + diff --git a/config/alfresco/bootstrap/webscripts/readme_de.html b/config/alfresco/bootstrap/webscripts/readme_de.html new file mode 100755 index 0000000000..1c3417a753 --- /dev/null +++ b/config/alfresco/bootstrap/webscripts/readme_de.html @@ -0,0 +1,24 @@ +

Please translate me!

+

Web Scripts

+

+

Web Scripts allow you to bind new LiveCycle Content Services ES based functionality to a HTTP method and custom URL. A library of URLs may be built up to provide a complete API accessible via HTTP.  They are ideal for building data access & update APIs and simple UI components such as Portlets.  Development of Web Scripts may be performed within LiveCycle Contentspace ES.  Knowledge of Java is not required.
+

+

+For example, you could create the following API for your particular application... +

+
Execute a search
+

+GET http://<host>:<port>/contentspace/service/blog/category/{category} +

+
Retrieve meta-data for an item in the repository
+

+GET http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release +

+
Update meta-data for an item in the repository
+

+POST http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release?status=Draft +

+
Delete an item in the repository
+

+DELETE http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release +

diff --git a/config/alfresco/bootstrap/webscripts/readme_fr.html b/config/alfresco/bootstrap/webscripts/readme_fr.html new file mode 100755 index 0000000000..1c3417a753 --- /dev/null +++ b/config/alfresco/bootstrap/webscripts/readme_fr.html @@ -0,0 +1,24 @@ +

Please translate me!

+

Web Scripts

+

+

Web Scripts allow you to bind new LiveCycle Content Services ES based functionality to a HTTP method and custom URL. A library of URLs may be built up to provide a complete API accessible via HTTP.  They are ideal for building data access & update APIs and simple UI components such as Portlets.  Development of Web Scripts may be performed within LiveCycle Contentspace ES.  Knowledge of Java is not required.
+

+

+For example, you could create the following API for your particular application... +

+
Execute a search
+

+GET http://<host>:<port>/contentspace/service/blog/category/{category} +

+
Retrieve meta-data for an item in the repository
+

+GET http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release +

+
Update meta-data for an item in the repository
+

+POST http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release?status=Draft +

+
Delete an item in the repository
+

+DELETE http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release +

diff --git a/config/alfresco/bootstrap/webscripts/readme_ja.html b/config/alfresco/bootstrap/webscripts/readme_ja.html new file mode 100755 index 0000000000..1c3417a753 --- /dev/null +++ b/config/alfresco/bootstrap/webscripts/readme_ja.html @@ -0,0 +1,24 @@ +

Please translate me!

+

Web Scripts

+

+

Web Scripts allow you to bind new LiveCycle Content Services ES based functionality to a HTTP method and custom URL. A library of URLs may be built up to provide a complete API accessible via HTTP.  They are ideal for building data access & update APIs and simple UI components such as Portlets.  Development of Web Scripts may be performed within LiveCycle Contentspace ES.  Knowledge of Java is not required.
+

+

+For example, you could create the following API for your particular application... +

+
Execute a search
+

+GET http://<host>:<port>/contentspace/service/blog/category/{category} +

+
Retrieve meta-data for an item in the repository
+

+GET http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release +

+
Update meta-data for an item in the repository
+

+POST http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release?status=Draft +

+
Delete an item in the repository
+

+DELETE http://<host>:<port>/contentspace/service/blog/2007/03/04/new-release +

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml index 14d1875a70..34396a9a69 100644 --- a/config/alfresco/core-services-context.xml +++ b/config/alfresco/core-services-context.xml @@ -394,6 +394,7 @@ alfresco.messages.coci-service alfresco.messages.discussion-messages alfresco.messages.template-service + alfresco.messages.templates-messages alfresco.messages.lock-service alfresco.messages.patch-service alfresco.messages.period-provider @@ -1065,6 +1066,7 @@ alfresco/messages/bpm-messages alfresco/messages/application-model alfresco/messages/forum-model + alfresco/messages/email-server-model diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml index 175789d4f0..60b40b4cc9 100644 --- a/config/alfresco/import-export-context.xml +++ b/config/alfresco/import-export-context.xml @@ -447,6 +447,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname} alfresco/templates/readme_template.xml + alfresco/messages/bootstrap-readme-template /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.email.childname} @@ -461,6 +462,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.scripts.childname} alfresco/bootstrap/example_javascripts.acp + alfresco/messages/bootstrap-example-javascripts /${spaces.company_home.childname}/${spaces.dictionary.childname} @@ -480,19 +482,23 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customModelsSpace.acp + alfresco/messages/bootstrap-spaces /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customMessagesSpace.xml + alfresco/messages/bootstrap-spaces /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customWebClientExtensionSpace.xml + alfresco/messages/bootstrap-spaces /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customWorkflowDefsSpace.acp + alfresco/messages/bootstrap-spaces diff --git a/config/alfresco/messages/bootstrap-example-javascripts.properties b/config/alfresco/messages/bootstrap-example-javascripts.properties new file mode 100755 index 0000000000..961eb89f5c --- /dev/null +++ b/config/alfresco/messages/bootstrap-example-javascripts.properties @@ -0,0 +1,14 @@ +# Javascript Exapmples Localization + +javascripts.example.backup.title=Backup Script +javascripts.example.backup.description=Simple document backup script +javascripts.example.test.title=Example Test Script +javascripts.example.test.description=Example of various API calls +javascripts.example.backupandlog.title=Backup and logging Script +javascripts.example.backupandlog.description=Backup files and log the date and time +javascripts.example.appendcopyright.title=Append Copyright to file +javascripts.example.appendcopyright.description=Append Copyright line to text or HTML files +javascripts.example.testreturnvalue.title=Return Value Example +javascripts.example.testreturnvalue.description=Return a value from a script - for the command servlet +javascripts.example.livecycledocs.title=LiveCycle Lucene Search +javascripts.example.livecycledocs.description=Search and log all docs containing LiveCycle text diff --git a/config/alfresco/messages/bootstrap-javascripts.properties b/config/alfresco/messages/bootstrap-javascripts.properties new file mode 100755 index 0000000000..42db02c543 --- /dev/null +++ b/config/alfresco/messages/bootstrap-javascripts.properties @@ -0,0 +1,17 @@ +javascripts.backup.description=Simple document backup script +javascripts.backup.title=Backup Script + +javascripts.examle_test.description=Example of various Alfresco API calls +javascripts.examle_test.title=Example Test Script + +javascripts.backup_and_log.description=Backup files and log the date and time +javascripts.backup_and_log.title=Backup and logging Script + +javascripts.append_copyright.description=Append Copyright line to text or HTML files +javascripts.append_copyright.title=Append Copyright to file + +javascripts.lucene_search.description=Search and log all docs containing Alfresco text +javascripts.lucene_search.title=Alfresco Lucene Search + +javascripts.return_value.description=Return a value from a script - for the command servlet +javascripts.return_value.title=Return Value Example \ No newline at end of file diff --git a/config/alfresco/messages/bootstrap-readme-template.properties b/config/alfresco/messages/bootstrap-readme-template.properties new file mode 100755 index 0000000000..4cba806f0d --- /dev/null +++ b/config/alfresco/messages/bootstrap-readme-template.properties @@ -0,0 +1,2 @@ +readme.template.description=Display the contents of a readme file (named readme.html or readme.ftl) +readme.template.title=readme.ftl diff --git a/config/alfresco/messages/bootstrap-spaces.properties b/config/alfresco/messages/bootstrap-spaces.properties index 289b89d3db..af8d4fb3e6 100644 --- a/config/alfresco/messages/bootstrap-spaces.properties +++ b/config/alfresco/messages/bootstrap-spaces.properties @@ -58,4 +58,32 @@ spaces.templates.email.invite.name=invite spaces.templates.email.invite.description=Invite email templates spaces.imap_home.name=IMAP Home -spaces.imap_home.description=IMAP Home \ No newline at end of file +spaces.imap_home.description=IMAP Home + +spaces.templates.email.invite1.name=Invite Email Templates +spaces.templates.email.invite1.description=Invite Email Templates + +spaces.templates.email.notify.name=Notify Email Templates +spaces.templates.email.notify.description=Notify Email Templates + +spaces.templates.email.generate_the_invite_email.description=Email template used to generate the invite email for Alfresco Share + +email.template.email_template_for_notifying_users=Email template for notifying users from a rule or action +email.template.email_template_for_notifying_users_of_an_Invite=Email template for notifying users of an Invite to a space or document + +spaces.web.client.extension.name=Web Client Extension +spaces.web.client.extension.title=Customized Web Client +spaces.web.client.extension.description=Customized Web Client + +spaces.models.name=Models +spaces.models.title=Customized Models +spaces.models.description=Customized Models + +spaces.messages.name=Messages +spaces.messages.title=Customized Messages +spaces.messages.description=Customized Messages + +spaces.workflow.definitions.name=Workflow Definitions +spaces.workflow.definitions.title=Customized Workflow Process Definitions +spaces.workflow.definitions.description=Customized Workflow Process Definitions + diff --git a/config/alfresco/messages/content-model.properties b/config/alfresco/messages/content-model.properties index f7884c101e..43459a598f 100644 --- a/config/alfresco/messages/content-model.properties +++ b/config/alfresco/messages/content-model.properties @@ -212,6 +212,11 @@ cm_contentmodel.aspect.cm_generalclassifiable.description=Classifiable cm_contentmodel.property.cm_categories.title=Categories cm_contentmodel.property.cm_categories.description=Categories +cm_contentmodel.aspect.cm_taggable.title=Taggable +cm_contentmodel.aspect.cm_taggable.description=Taggable +cm_contentmodel.property.cm_taggable.title=Tags +cm_contentmodel.property.cm_taggable.description=Tags + cm_contentmodel.aspect.cm_attachable.title=Attachable cm_contentmodel.aspect.cm_attachable.description=Allows other repository objects to be attached cm_contentmodel.association.cm_attachments.title=Attachments diff --git a/config/alfresco/messages/email-server-model.properties b/config/alfresco/messages/email-server-model.properties new file mode 100755 index 0000000000..07297392e4 --- /dev/null +++ b/config/alfresco/messages/email-server-model.properties @@ -0,0 +1,5 @@ +emailserver_emailserverModel.aspect.emailserver_aliasable.title=Email Alias +emailserver_emailserverModel.aspect.emailserver_aliasable.description=Email Alias +emailserver_emailserverModel.property.emailserver_alias.title=Alias +emailserver_emailserverModel.property.emailserver_alias.description=Alias + diff --git a/config/alfresco/messages/templates-messages.properties b/config/alfresco/messages/templates-messages.properties new file mode 100755 index 0000000000..5e08c27f22 --- /dev/null +++ b/config/alfresco/messages/templates-messages.properties @@ -0,0 +1,89 @@ +#translatable.ftl +templates.translatable.translatable=Translatable: +templates.translatable.yes=Yes +templates.translatable.no=No +templates.translatable.no_document_found=No document found + +#show_audit.ftl +templates.show_audit.current_document_audit_info=Current Document Audit Info +templates.show_audit.name=Name: +templates.show_audit.user_name=User Name +templates.show_audit.application=Application +templates.show_audit.service=Service +templates.show_audit.method=Method +templates.show_audit.timestamp=Timestamp +templates.show_audit.failed=Failed +templates.show_audit.message=Message +templates.show_audit.arg_1=Arg 1 +templates.show_audit.arg_2=Arg 2 +templates.show_audit.arg_3=Arg 3 +templates.show_audit.arg_4=Arg 4 +templates.show_audit.arg_5=Arg 5 +templates.show_audit.return=Return +templates.show_audit.thowable=Throwable +templates.show_audit.tx=TX +templates.show_audit.current_space_audit_info=Current Space Audit Info: + +#recent_docs.ftl +templates.recent_docs.documents_created_or_modified_in_the_last_week=Documents created or modified in the last week +templates.recent_docs.name=Name +templates.recent_docs.created_date=Created Date +templates.recent_docs.modified_date=Modified Date + +#my_summary.ftl +templates.my_summary.name=Name: +templates.my_summary.user=User: +templates.my_summary.home_space_location=Home Space location: +templates.my_summary.items_in_home_space=Items in Home Space: +templates.my_summary.items_in_company_space=Items in Company Space: + +#my_docs.ftl +templates.my_docs.name=Name +templates.my_docs.size=Size +templates.my_docs.modified.date=Modified Date +templates.my_docs.locked=Locked +templates.my_docs.kb=KB +templates.my_docs.yes=Yes + +#localizable.ftl +templates.localizable.localisable=Localisable: +templates.localizable.yes=Yes +templates.localizable.locale=Locale: +templates.localizable.no=No +templates.localizable.no_document_found=No document found! + +#general_example.ftl +templates.general_example.example_template_start======Example Template Start===== +templates.general_example.company_home_space=Company Home Space: +templates.general_example.my_home_space=My Home Space: +templates.general_example.company_home_children_count=Company Home children count: +templates.general_example.company_home_first_child_node_name=Company Home first child node name: +templates.general_example.current_document_name=Current Document Name: +templates.general_example.current_space_name=Current Space Name: +templates.general_example.list_of_child_spaces_in_my_home_space=List of child spaces in my Home Space: +templates.general_example.path=Path: +templates.general_example.list_of_docs_in_my_home_space=List of docs in my Home Space (text only content shown inline, JPG images shown as thumbnails): +templates.general_example.assoc_example=Assoc example: +templates.general_example.example_template_end======Example Template End===== + +#doc_info.ftl +templates.doc_info.current_document_info=Current Document Info: +templates.doc_info.name=Name: +templates.doc_info.ref=Ref: +templates.doc_info.type=Type: +templates.doc_info.dbid=DBID: +templates.doc_info.content_url=Content URL: +templates.doc_info.locked=Locked: +templates.doc_info.counter=Counter: +templates.doc_info.aspects=Aspects: +templates.doc_info.assocs=Assocs: +templates.doc_info.properties=Properties: +templates.doc_info.no_document_found=No document found! + + + + + + + + diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index 7115662906..efb2ebde60 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -767,6 +767,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname} alfresco/templates/readme_template.xml + alfresco/messages/bootstrap-readme-template @@ -845,6 +846,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customModelsSpace.acp + alfresco/messages/bootstrap-spaces @@ -866,6 +868,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customMessagesSpace.xml + alfresco/messages/bootstrap-spaces @@ -887,6 +890,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customWebClientExtensionSpace.xml + alfresco/messages/bootstrap-spaces @@ -954,6 +958,7 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/customWorkflowDefsSpace.acp + alfresco/messages/bootstrap-spaces diff --git a/config/alfresco/templates/content/examples/doc_info.ftl b/config/alfresco/templates/content/examples/doc_info.ftl index e22792aa1e..e7f50a2725 100644 --- a/config/alfresco/templates/content/examples/doc_info.ftl +++ b/config/alfresco/templates/content/examples/doc_info.ftl @@ -1,22 +1,22 @@ <#-- Shows some general info about the current document, including NodeRef and aspects applied --> <#if document?exists> -

Current Document Info:

- Name: ${document.name}
- Ref: ${document.nodeRef}
- Type: ${document.type}
- DBID: ${document.properties["sys:node-dbid"]}
- Content URL: ${url.context}${document.url}
- Locked: <#if document.isLocked>Yes<#else>No
+

${message("templates.doc_info.current_document_info")}

+ ${message("templates.doc_info.name")} ${document.name}
+ ${message("templates.doc_info.ref")} ${document.nodeRef}
+ ${message("templates.doc_info.type")} ${document.type}
+ ${message("templates.doc_info.dbid")} ${document.properties["sys:node-dbid"]}
+ ${message("templates.doc_info.content_url")} /contentspace${document.url}
+ ${message("templates.doc_info.locked")} <#if document.isLocked>Yes<#else>No
<#if hasAspect(document, "cm:countable") == 1 && document.properties['cm:counter']?exists> - Counter: ${document.properties['cm:counter']}
+ ${message("templates.doc_info.counter")} ${document.properties['cm:counter']}
- Aspects: + ${message("templates.doc_info.aspects")} <#list document.aspects as aspect>
${aspect}
- Assocs: + ${message("templates.doc_info.assocs")} <#list document.assocs?keys as key>
${key} @@ -26,7 +26,7 @@
- Properties: + ${message("templates.doc_info.properties")} <#-- Get a list of all the property names for the document --> <#assign props = document.properties?keys> @@ -53,5 +53,5 @@
<#else> - No document found! + ${message("templates.doc_info.no_document_found")} diff --git a/config/alfresco/templates/content/examples/general_example.ftl b/config/alfresco/templates/content/examples/general_example.ftl index 566c62ffd5..be48a56d67 100644 --- a/config/alfresco/templates/content/examples/general_example.ftl +++ b/config/alfresco/templates/content/examples/general_example.ftl @@ -1,33 +1,33 @@ -

=====Example Template Start=====

+

${message("templates.general_example.example_template_start")}

-Company Home Space: ${companyhome.properties.name} +${message("templates.general_example.company_home_space")} ${companyhome.properties.name}
-My Home Space: ${userhome.properties.name} +${message("templates.general_example.my_home_space")} ${userhome.properties.name}
-Company Home children count: ${companyhome.children?size} +${message("templates.general_example.company_home_children_count")} ${companyhome.children?size}
-Company Home first child node name: ${companyhome.children[0].properties.name} +${message("templates.general_example.company_home_first_child_node_name")} ${companyhome.children[0].properties.name}
<#if document?exists> -Current Document Name: ${document.name} +${message("templates.general_example.current_document_name")} ${document.name}
-Current Space Name: ${space.name} +${message("templates.general_example.current_space_name")} ${space.name} -

List of child spaces in my Home Space:

+

${message("templates.general_example.list_of_child_spaces_in_my_home_space")}

<#list userhome.children as child> <#if child.isContainer> - +
${child.properties.name} (${child.children?size})Path: ${child.displayPath}${message("templates.general_example.path")} ${child.displayPath}
-

List of docs in my Home Space (text only content shown inline, JPG images shown as thumbnails):

+

${message("templates.general_example.list_of_docs_in_my_home_space")}

<#list userhome.children as child> <#if child.isDocument> @@ -41,9 +41,9 @@
-

Assoc example:

+

${message("templates.general_example.assoc_example")}

<#if userhome.children[0].assocs["cm:contains"]?exists> ${userhome.children[0].assocs["cm:contains"][0].name} -

=====Example Template End=====

\ No newline at end of file +

${message("templates.general_example.example_template_end")}

\ No newline at end of file diff --git a/config/alfresco/templates/content/examples/localizable.ftl b/config/alfresco/templates/content/examples/localizable.ftl index 5b634a08e2..cd252f76fc 100644 --- a/config/alfresco/templates/content/examples/localizable.ftl +++ b/config/alfresco/templates/content/examples/localizable.ftl @@ -1,14 +1,14 @@ <#-- Shows if a document is localizable and the locale if set --> -Localisable: +${message("templates.localizable.localisable")} <#if document?exists> <#if hasAspect(document, "cm:localizable") = 1> - Yes
+ ${message("templates.localizable.yes")}
<#if document.properties.locale?exists> - Locale: ${document.properties.locale.properties.name} + ${message("templates.localizable.locale")} ${document.properties.locale.properties.name} <#else> - No
+ ${message("templates.localizable.no")}
<#else> - No document found! + ${message("templates.localizable.no_document_found")} \ No newline at end of file diff --git a/config/alfresco/templates/content/examples/my_docs.ftl b/config/alfresco/templates/content/examples/my_docs.ftl index c7cb2a43ab..8351b4a13b 100644 --- a/config/alfresco/templates/content/examples/my_docs.ftl +++ b/config/alfresco/templates/content/examples/my_docs.ftl @@ -3,17 +3,17 @@ - - - + + + <#list userhome.children as child> <#if child.isDocument> - - + + diff --git a/config/alfresco/templates/content/examples/my_summary.ftl b/config/alfresco/templates/content/examples/my_summary.ftl index 583556207a..200e33f3f5 100644 --- a/config/alfresco/templates/content/examples/my_summary.ftl +++ b/config/alfresco/templates/content/examples/my_summary.ftl @@ -1,8 +1,8 @@ <#-- Table of some summary details about the current user -->
NameSizeLocked${message("templates.my_docs.name")}${message("templates.my_docs.size")}${message("templates.my_docs.locked")}
${child.properties.name}${(child.size / 1000)?string("0.##")} KB <#if child.isLocked>Yes${(child.size / 1000)?string("0.##")} ${message("templates.my_docs.kb")} <#if child.isLocked>${message("templates.my_docs.yes")}
- - - - - + + + + +
Name: ${person.properties.firstName?html} ${person.properties.lastName?html}
User: ${person.properties.userName}
Home Space location: ${userhome.displayPath}/${userhome.name}
Items in Home Space: ${userhome.children?size}
Items in Company Space: ${companyhome.children?size}
${message("templates.my_summary.name")} ${person.properties.firstName?html} ${person.properties.lastName?html}
${message("templates.my_summary.user")} ${person.properties.userName}
${message("templates.my_summary.home_space_location")} ${userhome.displayPath}/${userhome.name}
${message("templates.my_summary.items_in_home_space")} ${userhome.children?size}
${message("templates.my_summary.items_in_company_space")} ${companyhome.children?size}
\ No newline at end of file diff --git a/config/alfresco/templates/content/examples/recent_docs.ftl b/config/alfresco/templates/content/examples/recent_docs.ftl index ece6127202..be239000ae 100644 --- a/config/alfresco/templates/content/examples/recent_docs.ftl +++ b/config/alfresco/templates/content/examples/recent_docs.ftl @@ -1,11 +1,11 @@ <#-- Table of docs in a specific folder, that have been created or modified in the last week --> -

Documents created or modified in the last week

+

${message("templates.recent_docs.documents_created_or_modified_in_the_last_week")}

- - - + + + <#list space.childrenByXPath[".//*[subtypeOf('cm:content')]"] as child> <#if (dateCompare(child.properties["cm:modified"], date, 1000*60*60*24*7) == 1) || (dateCompare(child.properties["cm:created"], date, 1000*60*60*24*7) == 1)> diff --git a/config/alfresco/templates/content/examples/show_audit.ftl b/config/alfresco/templates/content/examples/show_audit.ftl index 73a12ccdd6..a72b90a80d 100644 --- a/config/alfresco/templates/content/examples/show_audit.ftl +++ b/config/alfresco/templates/content/examples/show_audit.ftl @@ -1,24 +1,24 @@ <#-- Shows some general audit info about the current document --> <#if document?exists> -

Current Document Audit Info

- Name: ${document.name}
+

${message("templates.show_audit.current_document_audit_info")}

+ ${message("templates.show_audit.name")} ${document.name}
NameCreated DateModified Date${message("templates.recent_docs.name")}${message("templates.recent_docs.created_date")}${message("templates.recent_docs.modified_date")}
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <#list document.auditTrail as t> @@ -85,25 +85,25 @@
User NameApplicationServiceMethodTimestampFailedMessageArg 1Arg 2Arg 3Arg 4Arg 5ReturnThowableTX${message("templates.show_audit.user_name")}${message("templates.show_audit.application")}${message("templates.show_audit.service")}${message("templates.show_audit.method")}${message("templates.show_audit.timestamp")}${message("templates.show_audit.failed")}${message("templates.show_audit.message")}${message("templates.show_audit.arg_1")}${message("templates.show_audit.arg_2")}${message("templates.show_audit.arg_3")}${message("templates.show_audit.arg_4")}${message("templates.show_audit.arg_5")}${message("templates.show_audit.return")}${message("templates.show_audit.thowable")}${message("templates.show_audit.tx")}
<#elseif space?exists> -

Current Space Audit Info:

- Name: ${space.name}
+

${message("templates.show_audit.current_space_audit_info")}

+ ${message("templates.show_audit.name")} ${space.name}
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <#list space.auditTrail as t> diff --git a/config/alfresco/templates/content/examples/translatable.ftl b/config/alfresco/templates/content/examples/translatable.ftl index 6d6e692a28..970463e74c 100644 --- a/config/alfresco/templates/content/examples/translatable.ftl +++ b/config/alfresco/templates/content/examples/translatable.ftl @@ -1,8 +1,8 @@ <#-- Shows the translations applied to a doc through the translatable aspect --> -Translatable: +${message("templates.translatable.translatable")} <#if document?exists> <#if hasAspect(document, "cm:translatable") = 1> - Yes
+ ${message("templates.translatable.yes")}
User NameApplicationServiceMethodTimestampFailedMessageArg 1Arg 2Arg 3Arg 4Arg 5ReturnThowableTX${message("templates.show_audit.user_name")}${message("templates.show_audit.application")}${message("templates.show_audit.service")}${message("templates.show_audit.method")}${message("templates.show_audit.timestamp")}${message("templates.show_audit.failed")}${message("templates.show_audit.message")}${message("templates.show_audit.arg_1")}${message("templates.show_audit.arg_2")}${message("templates.show_audit.arg_3")}${message("templates.show_audit.arg_4")}${message("templates.show_audit.arg_5")}${message("templates.show_audit.return")}${message("templates.show_audit.thowable")}${message("templates.show_audit.tx")}
<#if document.assocs["cm:translations"]?exists> <#list document.assocs["cm:translations"] as t> @@ -11,8 +11,8 @@
<#else> - No
+ ${message("templates.translatable.no")}
<#else> - No document found! + ${message("templates.translatable.no_document_found")}
diff --git a/config/alfresco/templates/email_templates.acp b/config/alfresco/templates/email_templates.acp index 75006346e6ffd684374312ff5793eec5b6c11992..5b1348edee77d00e5bf883872bedd9ac5b259978 100644 GIT binary patch literal 1738 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 HVg>O4#XFLv diff --git a/config/alfresco/templates/readme.ftl b/config/alfresco/templates/readme.ftl index 9b9b3bf73f..f2c5ae1fe0 100644 --- a/config/alfresco/templates/readme.ftl +++ b/config/alfresco/templates/readme.ftl @@ -1,5 +1,5 @@ <#-- Displays the contents of readme.html and/or the evaluated readme.ftl if they exist in the current space. --> - +<#-- Old template <#assign htmlFilename = "readme.html"/> <#assign ftlFilename = "readme.ftl"/> @@ -11,3 +11,22 @@ <#include space.childByNamePath["${ftlFilename}"].nodeRef> +--> +<#assign filename = "readme"/> +<#assign htmlExt = "html"/> +<#assign suffix = .lang /> +<#assign ftlExt = "ftl"/> +<#assign htmlFilename = "${filename}_${suffix}.${htmlExt}"/> +<#assign ftlFilename = "${filename}.${ftlExt}"/> +<#assign messageError="File ${htmlFilename} does not exist!"/> + +<#if space?exists> + <#if space.childByNamePath["${htmlFilename}"]?exists> + ${space.childByNamePath[htmlFilename].content} + <#else> + ${messageError} + + <#if space.childByNamePath["${ftlFilename}"]?exists> + <#include space.childByNamePath["${ftlFilename}"].nodeRef> + + diff --git a/config/alfresco/templates/readme_template.xml b/config/alfresco/templates/readme_template.xml index 8bfab61f76..3f604bb2de 100644 --- a/config/alfresco/templates/readme_template.xml +++ b/config/alfresco/templates/readme_template.xml @@ -8,9 +8,9 @@ true - Display the contents of a readme file (named readme.html or readme.ftl) + ${readme.template.description} contentUrl=/alfresco/templates/readme.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_ - readme.ftl + ${readme.template.title} Mike Farman readme.ftl diff --git a/config/alfresco/templates/rss_templates.acp b/config/alfresco/templates/rss_templates.acp index 6ca240207fdf9d1d50d4d1a42737440d8960bfca..40babcb63733327f2998d8dfa7e85340cdd91791 100644 GIT binary patch delta 632 zcmV-;0*C$84fPDLJ_8a000;oChWk2EeAg>A0ssK$29r<&8GlQUn=lZ*@2^0p*Fw@> z+9{6s&0L^@l8GCHDw@1N~0~pJcEYfwh zN)wP&)l5DW>BG;vk6+T;@@9Kr&~Exi;_%Y?&m!F;>P?=vZJQCkGhnI8lzGbgY;Hg+ z%TSpv?`6xIB!Agbv7t&LNDMj>Co0cWdx2+aa*3W7fKGqbZ^YE|6$w=X&ud1}^+`fW z|J}=26U8M*;tgX`JKsm(w935fxN0X>S}$5@%^4-vevLIt%*KM5EC?)8!o*m&BoI@n zSYn3#k4g40I|TL+14UP)qRYI{ImV8&Y?q7aE;I{`%YW(YQWFk>ASR6y3e53__fTRM zdd(u7X*evY_n26Fx45V~WtvGjk9v{gAQ7WT)5ITgx@WxpPK2w{oz@@s_tmFtRT-eJ zk*ZeIW;^8mG`sWc8N_O!Xot{n$dMt3y4>cM?=kDfbi*WP5};;C9yvJJJHf#qf9o)q zYNIq5WPe~M%02y?7b?*-FepdCsK(l@hhe%uFXe|n#@ftnspbSBGazd>;1#J3gtNMG z$yeV?%!#C|Y7B+an^7e+kzKV{0(>C4bcVd2iE1>n`TR0_&mbPz1&K1e9}F*Cg%`zN zA+gHvh$q1WV5gx#IAZP)Or9+J4aNHF`t#|0**E*U-W!hc*ZcWqm7Hf(@atu_W2$tc zRQ{_!4~TdBdTYlivx+i*z1i|S7g4PLzf8&xp#D+*1(W;*j1mF>2mr2z`#Mp4*DEyw S008I)lbQxK2Al-|0002|;xzsM delta 729 zcmV;~0w(?S4Al*=J_8Z}00;muT@f|r!nuu=0ssJj2a`|(8GlW0oG=i*=T}(V3rTxu zyIRPtQl++sd`LZ1S~>QRb!u$O9+subkMCgEjY&(9dI2TH@CODxB2DH zgP=xs(u$DRsN*!#JVyo(4g`iVG!8i`)F7*E@$!9IC7W)P(aHcwh5SJS!Tu5)6BK`D z7?V109e;RK5N65){c{wm(6=xuC&8pfN&DfI8|J0D0VB!LjI#sRN-}Djx@OPkT#R4z~3I zs<+%Kyo;a>(RTrQ+=UWwnNN0i6`kMiE4V^dtLevUKD>!3zs<_@wrhA zVDF$rIATEvWuAlj1?APpt9Q@mODWz-G2u!6weKpbl8qG(KPtSqFohbjc=fM-A|Q3) zYZ%L&+#jq^@z@R3*{?}#xc6q|PN3mY{RWeq1&k5^00;muT@f|r!nuu=0ssJj2a`Gm LH3s|z00000&kj`A diff --git a/source/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java b/source/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java index 812206898b..65c2d277f2 100644 --- a/source/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java +++ b/source/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java @@ -30,6 +30,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.AssociationDefinition; @@ -101,6 +102,14 @@ import org.alfresco.service.namespace.QName; return type.getDefaultAspects(inherited); } + /* (non-Javadoc) + * @see org.alfresco.service.cmr.dictionary.ClassDefinition#getDefaultAspectNames() + */ + public Set getDefaultAspectNames() + { + return type.getDefaultAspectNames(); + } + /* (non-Javadoc) * @see org.alfresco.repo.dictionary.ClassDefinition#getName() */ diff --git a/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java b/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java index a212968d8e..1996e43c04 100644 --- a/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java +++ b/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java @@ -29,8 +29,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.AssociationDefinition; @@ -65,6 +67,7 @@ import org.alfresco.service.namespace.QName; private List defaultAspects = new ArrayList(); private List defaultAspectNames = new ArrayList(); private List inheritedDefaultAspects = new ArrayList(); + private Set inheritedDefaultAspectNames = new HashSet(); private Boolean archive = null; private Boolean inheritedArchive = null; @@ -299,6 +302,12 @@ import org.alfresco.service.namespace.QName; } } + // Convert to set of names + for (AspectDefinition aspDef : inheritedDefaultAspects) + { + inheritedDefaultAspectNames.add(aspDef.getName()); + } + // resolve archive inheritance if (parentClass != null && archive == null) { @@ -436,6 +445,14 @@ import org.alfresco.service.namespace.QName; { return inherited ? getDefaultAspects() : defaultAspects; } + + /** + * @see org.alfresco.service.cmr.dictionary.ClassDefinition#getDefaultAspectNames() + */ + public Set getDefaultAspectNames() + { + return inheritedDefaultAspectNames; + } /* (non-Javadoc) * @see org.alfresco.service.cmr.dictionary.ClassDefinition#isContainer() diff --git a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java index 6cd47881c5..7b2f53a179 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java @@ -491,26 +491,19 @@ public class PermissionModel implements ModelDAO, InitializingBean private Set getAllPermissionsImpl(QName typeName, Set aspects, boolean exposedOnly) { - Set permissions = new LinkedHashSet(256, 1.0f); + Set permissions = new LinkedHashSet(128, 1.0f); ClassDefinition cd = dictionaryService.getClass(typeName); permissions.addAll(getAllPermissionsImpl(typeName, exposedOnly)); - if (cd != null) + if (cd != null && aspects != null) { - Set defaultAspects = new HashSet(); - for (AspectDefinition aspDef : cd.getDefaultAspects()) + Set defaultAspects = cd.getDefaultAspectNames(); + for (QName aspect : aspects) { - defaultAspects.add(aspDef.getName()); - } - if (aspects != null) - { - for (QName aspect : aspects) + if (!defaultAspects.contains(aspect)) { - if (!defaultAspects.contains(aspect)) - { - addAspectPermissions(aspect, permissions, exposedOnly); - } + addAspectPermissions(aspect, permissions, exposedOnly); } } } diff --git a/source/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java b/source/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java index bdf7383223..b0e2510955 100644 --- a/source/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java +++ b/source/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java @@ -27,6 +27,7 @@ package org.alfresco.service.cmr.dictionary; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.Set; import org.alfresco.service.namespace.QName; @@ -115,6 +116,11 @@ public interface ClassDefinition */ public List getDefaultAspects(); + /** + * @return the set of default aspects names associated with this type + */ + public Set getDefaultAspectNames(); + /** * @param inherited include default aspects inherited from super types * @return the default aspects