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

Merge Web Scripts from BRANCHES/DEV/DAVE

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2007-03-08 19:02:48 +00:00
parent 55e9a1fbaf
commit 27b8639a52
7 changed files with 208 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,10 @@ import javax.faces.context.ResponseWriter;
import org.alfresco.config.Config;
import org.alfresco.config.ConfigService;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.web.api.SearchProxy;
import org.alfresco.web.app.Application;
import org.alfresco.web.config.OpenSearchConfigElement;
import org.alfresco.web.config.OpenSearchConfigElement.EngineConfig;
import org.alfresco.web.scripts.bean.SearchProxy;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.SelfRenderingComponent;
import org.springframework.web.jsf.FacesContextUtils;
@@ -266,9 +266,9 @@ public class UIOpenSearch extends SelfRenderingComponent
// get the web api config service object from spring
ConfigService cfgSvc = (ConfigService)FacesContextUtils.
getRequiredWebApplicationContext(context).getBean("web.api.framework.config");
getRequiredWebApplicationContext(context).getBean("webscripts.config");
SearchProxy searchProxy = (SearchProxy)FacesContextUtils.
getRequiredWebApplicationContext(context).getBean("web.api.org.alfresco.repository.searchproxy_get");
getRequiredWebApplicationContext(context).getBean("webscript.org.alfresco.repository.searchproxy_get");
if (cfgSvc != null)
{
// get the OpenSearch configuration

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

@@ -63,10 +63,10 @@
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
classpath:alfresco/web-client-application-context.xml
classpath:web-services-application-context.xml
classpath:alfresco/web-api-application-context.xml
classpath:alfresco/application-context.xml
classpath:alfresco/web-client-application-context.xml
classpath:alfresco/web-scripts-application-context.xml
classpath:web-services-application-context.xml
</param-value>
<description>Spring config file locations</description>
</context-param>
@@ -249,7 +249,7 @@
<servlet>
<servlet-name>apiServlet</servlet-name>
<servlet-class>org.alfresco.web.api.framework.APIServlet</servlet-class>
<servlet-class>org.alfresco.web.scripts.WebScriptServlet</servlet-class>
</servlet>
<servlet>