From 660dc6922297d029bbffe89b624b75675378f70d Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 26 Sep 2008 12:01:05 +0000 Subject: [PATCH] =?UTF-8?q?-=20Added=20a=20new=20=E2=80=98catch=20all?= =?UTF-8?q?=E2=80=99=20FormatReader=20that=20populates=20a=20requestbody?= =?UTF-8?q?=20script=20variable=20when=20no=20other=20FormatReaders=20are?= =?UTF-8?q?=20configured=20to=20handle=20a=20given=20request=20type.=20Thi?= =?UTF-8?q?s=20was=20added=20to=20help=20the=20processing=20of=20posts=20f?= =?UTF-8?q?rom=20Orbeon=20XForms.=20-=20Modified=20AbstractWebScript.execu?= =?UTF-8?q?te()=20so=20that=20request-type=20specific=20script=20parameter?= =?UTF-8?q?s=20(e.g.=20json,=20feed)=20are=20only=20available=20to=20those?= =?UTF-8?q?=20scripts=20that=20declare=20a=20type=20specific=20suffix,=20e?= =?UTF-8?q?.g.=20*.post.json.js,=20*.put.atomfeed.js.=20All=20non=20reques?= =?UTF-8?q?t=20type=20specific=20JS=20scripts=20will=20see=20requestbody?= =?UTF-8?q?=20(or=20formData=20if=20the=20request=20was=20multipart=20form?= =?UTF-8?q?=20data).This=20is=20so=20that=20scripts=20relying=20on=20reque?= =?UTF-8?q?stBody=20being=20available=20at=20the=20moment=20don=E2=80=99t?= =?UTF-8?q?=20later=20get=20broken=20if=20we=20later=20map=20their=20reque?= =?UTF-8?q?st=20types=20to=20new=20FormatReaders.=20-=20Moved=20getExecute?= =?UTF-8?q?Script=20from=20DeclarativeWebScript=20into=20AbstractWebScript?= =?UTF-8?q?=20and=20made=20other=20subclasses=20use=20it,=20therefore=20us?= =?UTF-8?q?ing=20consistent=20path=20resolution=20rules=20across=20all=20w?= =?UTF-8?q?eb=20scripts.=20-=20Removed=20FormatReader.createTemplateParame?= =?UTF-8?q?ters()=20=E2=80=93=20Dave=20said=20this=20is=20not=20needed=20a?= =?UTF-8?q?nd=20the=20scripts=20themselves=20should=20copy=20over=20script?= =?UTF-8?q?=20parameters=20that=20are=20required=20by=20the=20templates.?= =?UTF-8?q?=20-=20Renamed=20*.post.js=20and=20*.put.js=20expecting=20JSON?= =?UTF-8?q?=20input=20to=20*.post.json.js=20and=20*.put.json.js=20-=20Exte?= =?UTF-8?q?nsive=20manual=20testing=20of=20share=20-=20Added=20unit=20test?= =?UTF-8?q?s=20=20=20-=20Ensure=20requestbody=20available=20to=20*.post.js?= =?UTF-8?q?t=20and=20*.put.js=20for=20unmapped=20request=20types=20=20=20-?= =?UTF-8?q?=20Ensure=20json=20variable=20available=20to=20*.json.post.js?= =?UTF-8?q?=20and=20*.json.put.js=20scripts=20handling=20application/json?= =?UTF-8?q?=20requests=20=20=20-=20Ensure=20entry=20variable=20available?= =?UTF-8?q?=20to=20*.atom.post.js=20and=20*.=20atom.put.js=20scripts=20han?= =?UTF-8?q?dling=20application/atom;type=3Dentry=20requests=20=20=20-=20En?= =?UTF-8?q?sure=20error=20raised=20for=20bogus=20script=20with=20extension?= =?UTF-8?q?=20corresponding=20to=20format=20with=20no=20FormatReader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ....post.js => userfeed-control.post.json.js} | 0 .../blog/{blog.put.js => blog.put.json.js} | 0 ...t.js => blog-post-publishing.post.json.js} | 0 ...blog-post.put.js => blog-post.put.json.js} | 0 ...-posts.post.js => blog-posts.post.json.js} | 0 .../{comment.put.js => comment.put.json.js} | 0 ...comments.post.js => comments.post.json.js} | 0 ...posts.post.js => forum-posts.post.json.js} | 0 ...ost.js => forum-post-replies.post.json.js} | 0 ...rum-post.put.js => forum-post.put.json.js} | 0 ...metadata.post.js => metadata.post.json.js} | 0 .../{people.post.js => people.post.json.js} | 0 ...ences.post.js => preferences.post.json.js} | 0 ...mbership.put.js => membership.put.json.js} | 0 ...ships.post.js => memberships.post.json.js} | 0 .../site/{site.put.js => site.put.json.js} | 0 .../{sites.post.js => sites.post.json.js} | 0 ...de.tags.post.js => node.tags.post.json.js} | 0 ...bnails.post.js => thumbnails.post.json.js} | 0 .../{revert.post.js => revert.post.json.js} | 0 .../{event.post.js => event.post.json.js} | 0 .../{event.put.js => event.put.json.js} | 0 ...w.post.js => assign-workflow.post.json.js} | 0 ...t.post.js => cancel-checkout.post.json.js} | 0 .../{checkin.post.js => checkin.post.json.js} | 0 ...checkout.post.js => checkout.post.json.js} | 0 .../{copy-to.post.js => copy-to.post.json.js} | 0 .../{folder.post.js => folder.post.json.js} | 0 .../{move-to.post.js => move-to.post.json.js} | 0 ...sions.post.js => permissions.post.json.js} | 0 ...activity.post.js => activity.post.json.js} | 0 ...ofile.post.js => userprofile.post.json.js} | 0 .../wiki/{move.post.js => move.post.json.js} | 0 .../wiki/{page.put.js => page.put.json.js} | 0 .../repo/cmis/rest/CMISQueryReader.java | 13 +-------- .../web/scripts/content/StreamContent.java | 28 +++---------------- 36 files changed, 5 insertions(+), 36 deletions(-) rename config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/{userfeed-control.post.js => userfeed-control.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/{blog.put.js => blog.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/{blog-post-publishing.post.js => blog-post-publishing.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/{blog-post.put.js => blog-post.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/{blog-posts.post.js => blog-posts.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/comments/{comment.put.js => comment.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/comments/{comments.post.js => comments.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/{forum-posts.post.js => forum-posts.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/{forum-post-replies.post.js => forum-post-replies.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/{forum-post.put.js => forum-post.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/metadata/{metadata.post.js => metadata.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/person/{people.post.js => people.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/preference/{preferences.post.js => preferences.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/{membership.put.js => membership.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/{memberships.post.js => memberships.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/site/{site.put.js => site.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/site/{sites.post.js => sites.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/tagging/{node.tags.post.js => node.tags.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/{thumbnails.post.js => thumbnails.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/repository/version/{revert.post.js => revert.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/{event.post.js => event.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/{event.put.js => event.put.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{assign-workflow.post.js => assign-workflow.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{cancel-checkout.post.js => cancel-checkout.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{checkin.post.js => checkin.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{checkout.post.js => checkout.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{copy-to.post.js => copy-to.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{folder.post.js => folder.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{move-to.post.js => move-to.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/{permissions.post.js => permissions.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/{activity.post.js => activity.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/{userprofile.post.js => userprofile.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/{move.post.js => move.post.json.js} (100%) rename config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/{page.put.js => page.put.json.js} (100%) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.js rename to config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.js diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.json.js similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.json.js diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java index c33e863b06..873b8d61fe 100644 --- a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java +++ b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java @@ -121,18 +121,7 @@ public class CMISQueryReader implements FormatReader public Map createScriptParameters(WebScriptRequest req, WebScriptResponse res) { Map params = new HashMap(); - params.put("query", req.parseContent()); + params.put("query", read(req)); return params; } - - /* (non-Javadoc) - * @see org.alfresco.web.scripts.FormatReader#createTemplateParameters(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse) - */ - public Map createTemplateParameters(WebScriptRequest req, WebScriptResponse res) - { - Map params = new HashMap(); - params.put("query", req.parseContent()); - return params; - } - } diff --git a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java index f2798de14d..899dbb3078 100644 --- a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java +++ b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java @@ -53,9 +53,6 @@ import org.alfresco.service.namespace.QName; import org.alfresco.util.TempFileProvider; import org.alfresco.web.scripts.AbstractWebScript; import org.alfresco.web.scripts.Cache; -import org.alfresco.web.scripts.Container; -import org.alfresco.web.scripts.Description; -import org.alfresco.web.scripts.ScriptContent; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.WebScriptException; import org.alfresco.web.scripts.WebScriptRequest; @@ -86,10 +83,6 @@ public class StreamContent extends AbstractWebScript protected ContentService contentService; protected MimetypeService mimetypeService; - // Script Context - private String basePath; - private ScriptContent executeScript; - /** Cached file modified date */ private Date resouceFileModifiedDate; @@ -125,20 +118,6 @@ public class StreamContent extends AbstractWebScript this.contentService = contentService; } - /* (non-Javadoc) - * @see org.alfresco.web.scripts.AbstractWebScript#init(org.alfresco.web.scripts.WebScriptRegistry) - */ - @Override - public void init(Container container, Description description) - { - super.init(container, description); - - // Test for "execute" script - basePath = getDescription().getId(); - String scriptPath = basePath + ".js"; - executeScript = container.getScriptProcessor().findScript(scriptPath); - } - /** * @see org.alfresco.web.scripts.WebScript#execute(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse) */ @@ -161,16 +140,17 @@ public class StreamContent extends AbstractWebScript model.put("cache", cache); // execute script if it exists + ScriptDetails executeScript = getExecuteScript(req.getContentType()); if (executeScript != null) { if (logger.isDebugEnabled()) - logger.debug("Executing script " + executeScript.getPathDescription()); + logger.debug("Executing script " + executeScript.getContent().getPathDescription()); Map scriptModel = createScriptParameters(req, res, model); // add return model allowing script to add items to template model Map returnModel = new HashMap(8, 1.0f); scriptModel.put("model", returnModel); - executeScript(executeScript, scriptModel); + executeScript(executeScript.getContent(), scriptModel); mergeScriptModelIntoTemplateModel(returnModel, model); } @@ -317,7 +297,7 @@ public class StreamContent extends AbstractWebScript final protected void renderFormatTemplate(String format, Map model, Writer writer) { format = (format == null) ? "" : format; - String templatePath = basePath + "." + format + ".ftl"; + String templatePath = getDescription().getId() + "." + format + ".ftl"; if (logger.isDebugEnabled()) logger.debug("Rendering template '" + templatePath + "'");