inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Web Scripts:

Browse Source 
- default authentication is now Basic HTTP Authentication
- alternative entry point for Alfresco Web Client authentication now provided via /alfresco/wcservice
- updated opensearch engines list to be servlet mapping independent

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2007-06-07 11:49:09 +00:00
parent bd0b9c5fcd
commit 1a89cb5e9f
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.atom.ftl
View File

@@ -11,9 +11,9 @@
<#list engines as engine>
<entry>
<title>${engine.label}</title>
<link rel="alternate" type="${engine.type}" href="${absurl(url.context)}${engine.url)?xml}" title="${engine.label}"/>
<link rel="alternate" type="${engine.type}" href="${absurl(url.serviceContext)}${engine.url?xml}" title="${engine.label}"/>
<summary><#if engine.urlType == "description">OpenSearch Description<#else>Template URL</#if> - ${engine.type}</summary>
<id>${absurl(url.context)}${engine.url)?xml}</id>
<id>${absurl(url.serviceContext)}${engine.url?xml}</id>
<updated>${xmldate(date)}</updated>
</entry>
</#list>

4
config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.html.ftl
View File

@@ -6,7 +6,7 @@
<title>Alfresco Registered Search Engines</title>
<#list engines as engine>
<#if engine.urlType == "description">
<link rel="search" type="${engine.type}" href="${url.context}${engine.url}" title="${engine.label}">
<link rel="search" type="${engine.type}" href="${url.serviceContext}${engine.url}" title="${engine.label}">
</#if>
</#list>
</head>
@@ -22,7 +22,7 @@
<tr align="left"><td><b>Engine<td><b>URL Type<td><b>Response Format</tr>
<#list engines as engine>
<tr align="left">
<td><a href="${url.context}${engine.url}">${engine.label}</a>
<td><a href="${url.serviceContext}${engine.url}">${engine.label}</a>
<td><#if engine.urlType == "description">OpenSearch Description<#else>Template URL</#if>
<td>${engine.type}
</tr>

10
config/alfresco/web-scripts-config.xml
View File

@@ -26,16 +26,16 @@
<engine label-id="current_repo" label="Alfresco Keyword Search">
<url type="application/opensearchdescription+xml">
/service/api/search/keyword/description.xml
/api/search/keyword/description.xml
</url>
<url type="application/atom+xml">
/service/api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
/api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
</url>
<url type="application/rss+xml">
/service/api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
/api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
</url>
<url type="text/html">
/service/api/search/keyword?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
/api/search/keyword?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
</url>
</engine>
@@ -43,7 +43,7 @@
<proxy>
<!-- URL of Search Engine proxy -->
<url>/service/api/search/engine</url>
<url>/api/search/engine</url>
</proxy>
</opensearch>

2
source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
View File

@@ -303,7 +303,7 @@ public class UIOpenSearch extends SelfRenderingComponent
{
if (url.startsWith("/"))
{
url = context.getExternalContext().getRequestContextPath() + url;
url = context.getExternalContext().getRequestContextPath() + "/wcservice" + url;
}
// add the engine

19
source/web/WEB-INF/web.xml
View File

@@ -255,6 +255,15 @@
<servlet>
<servlet-name>apiServlet</servlet-name>
<servlet-class>org.alfresco.web.scripts.WebScriptServlet</servlet-class>
<init-param>
<param-name>authenticator</param-name>
<param-value>webscripts.authenticator.basic</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>wcapiServlet</servlet-name>
<servlet-class>org.alfresco.web.scripts.WebScriptServlet</servlet-class>
<init-param>
<param-name>authenticator</param-name>
<param-value>webscripts.authenticator.webclient</param-value>
@@ -381,6 +390,16 @@
<url-pattern>/s/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>wcapiServlet</servlet-name>
<url-pattern>/wcservice/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>wcapiServlet</servlet-name>
<url-pattern>/wcs/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>proxyServlet</servlet-name>
<url-pattern>/proxy</url-pattern>