From 8fe97f509edbc4a825d54bc9f2d8b8e508fbb5e9 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 6 Jan 2010 17:09:10 +0000 Subject: [PATCH] Merged DEV/TEMPORARY to HEAD 17804: Branch for SpringSurf integration 2 to RemoteAPI - from HEAD r17789 17808: Part 3 of SpringSurf integration - RemoteAPI, Web-Client, Mobile and DOD5015 java code refactored to use SpringSurf Webscripts libraries, removed dependancies on existing WebScriptFramework project. 17812: Removed web-framework and webscript-framework projects. Updated build scripts to use SpringSurf dependencies for remote API and client projects and also removal of wf and wsf projects from builds. 17818: Various Spring app context and config changes to integration SpringSurf at the RemoteAPI and Web-Client project level. - Build scripts fixed up - Temporary web.xml changes until spring mvc dispatcher is hooked into /service urls - The server starts up! No nothing else works yet, you know how this goes... 17819: Fix to incremental-webclient-tomcat-exploded build target to work on first deploy to a clean tomcat (affects HEAD also, not SpringSurf related). 17872: Refactor Web-Client web.xml to use Spring WebScripts Dispatcher Servlet - servlet is configured to use the existing Spring application context instance as loaded by the ContextLoaderListener Share web.xml TODOs for JBoss app-server support (currently missing from SpringSurf extraction) 17892: Upgraded Repository Spring dependant libraries to 3.0.0 release. Upgraded to latest SpringSurf release (also running against Spring 3.0.0) Various related fixes. 17893: Additional Spring3.0.0 migration fixes and libraries. 17899: Integrated another SpringSurf bug fix - to correctly add ClassPathStore instances to SearchPath objects. 17901: Fixes to handling of merging of models returned from the new Script Processors. Share now works against a Repository that is running SpringSurf WebScripts and Spring 3.0.0. 17904: Latest SpringSurf libraries after latest changes. TODO: - NTLM filter needs moving to Share (not present in SpringSurf) - MessagesWebScript - community tracking image needs adding to Share specific version (not present in SpringSurf) - feedController - for rss feed service urls - needs testing - Clustering config overrides - no longer work in SpringSurf, needs a rethink - Mobile project is not working - PHP module project - JBossEnabledWebApplicationContext required for Share - currently missing from SpringSurf git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/application-context.xml | 4 +++- .../java/org/alfresco/repo/jscript/RhinoScriptProcessor.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml index 5bf10fb2e7..b1194fce7e 100644 --- a/config/alfresco/application-context.xml +++ b/config/alfresco/application-context.xml @@ -70,8 +70,10 @@ --> + + + -