From 4b30804f200b32ee42f9be49b7b5286e1b0d1656 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Thu, 8 Mar 2007 14:51:33 +0000 Subject: [PATCH] Merge Web Scripts from BRANCHES/DEV/DAVE git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repository/keywordsearch_get_atom.ftl | 20 +- .../repository/keywordsearch_get_html.ftl | 16 +- .../repository/keywordsearch_get_rss.ftl | 18 +- ...hdescription_get_opensearchdescription.ftl | 8 +- .../repository/searchengines_get_atom.ftl | 8 +- .../repository/searchengines_get_html.ftl | 8 +- .../alfresco/sample/samplesearch_get_atom.ftl | 6 +- .../alfresco/sample/samplesearch_get_html.ftl | 6 +- .../org/alfresco/service/index_get_html.ftl | 28 +- .../org/alfresco/service/index_post_desc.xml | 5 + .../org/alfresco/service/index_post_html.ftl | 24 + .../alfresco/web-api-application-context.xml | 21 +- .../org/alfresco/web/api/IndexUpdate.java | 69 +++ .../org/alfresco/web/api/SearchProxy.java | 2 +- .../web/api/framework/APIRegistry.java | 5 + .../web/api/framework/APIRequest.java | 58 +- .../web/api/framework/APIScriptProcessor.java | 8 + .../api/framework/APITemplateProcessor.java | 11 + .../web/api/framework/AbstractAPIService.java | 6 +- .../web/api/framework/ClassPathAPIStore.java | 23 +- .../api/framework/DeclarativeAPIRegistry.java | 12 +- .../web/api/framework/RepoPathAPIStore.java | 578 ++++++++++++++++++ .../web/api/framework/TestAPIServer.java | 7 +- .../{PathModel.java => URLModel.java} | 58 +- 24 files changed, 882 insertions(+), 123 deletions(-) create mode 100644 config/alfresco/templates/web/api/org/alfresco/service/index_post_desc.xml create mode 100644 config/alfresco/templates/web/api/org/alfresco/service/index_post_html.ftl create mode 100644 source/java/org/alfresco/web/api/IndexUpdate.java create mode 100644 source/java/org/alfresco/web/api/framework/RepoPathAPIStore.java rename source/java/org/alfresco/web/api/framework/{PathModel.java => URLModel.java} (71%) diff --git a/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_atom.ftl b/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_atom.ftl index 41dd75c3db..81c4bf313a 100644 --- a/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_atom.ftl +++ b/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_atom.ftl @@ -3,7 +3,7 @@ Alfresco (${server.edition}) Alfresco Keyword Search: ${search.searchTerms} ${xmldate(date)} - ${absurl("/images/logo/AlfrescoLogo16.ico")} + ${absurl(url.context)}/images/logo/AlfrescoLogo16.ico <#if person??>${person.properties.userName}<#else>unknown @@ -12,22 +12,22 @@ ${search.startIndex} ${search.itemsPerPage} - - + + <#if search.startPage > 1> - - + + <#if search.startPage < search.totalPages> - - + + - + <#list search.results as row> ${row.name} - - ${absurl(row.icon16)} <#comment>TODO: What's the standard for entry icons? + + ${absurl(url.context)}${row.icon16} <#comment>TODO: What's the standard for entry icons? urn:uuid:${row.id} ${xmldate(row.properties.modified)} ${row.properties.description!""} diff --git a/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_html.ftl b/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_html.ftl index baa135d8c7..7cda0032cc 100644 --- a/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_html.ftl +++ b/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_html.ftl @@ -4,7 +4,7 @@ Alfresco Keyword Search: ${search.searchTerms} - + @@ -12,7 +12,7 @@ - +
AlfrescoAlfresco Alfresco Keyword Search
@@ -26,7 +26,7 @@ <#list search.results as row> - + <#if row.properties.description?? == true> @@ -39,15 +39,15 @@
${row.name}${row.name}
- + <#if search.startPage > 1> - + - + <#if search.startPage < search.totalPages> - + - +
firstfirstpreviousprevious ${search.startPage}${search.startPage}nextnext lastlast
diff --git a/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_rss.ftl b/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_rss.ftl index 8eb0591bce..80e84069eb 100644 --- a/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_rss.ftl +++ b/config/alfresco/templates/web/api/org/alfresco/repository/keywordsearch_get_rss.ftl @@ -2,7 +2,7 @@ Alfresco Keyword Search: ${search.searchTerms} - ${path.serviceContext}/search/keyword?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}&guest=${guest?string("true","")}&format=rss + ${absurl(url.service)}?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}&guest=${guest?string("true","")}&format=rss Alfresco Keyword Search: ${search.searchTerms} ${search.localeId} ${xmldate(date)} @@ -12,26 +12,26 @@ Alfresco Search: ${search.searchTerms} 16 16 - ${absurl("/images/logo/AlfrescoLogo16.ico")} + ${absurl(url.context)}/images/logo/AlfrescoLogo16.ico)} ${search.totalResults} ${search.startIndex} ${search.itemsPerPage} - + <#if search.startPage > 1> - - + + <#if search.startPage < search.totalPages> -