Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:08:20 +00:00
parent 5cf4251421
commit 34d911b025
35 changed files with 1176 additions and 3862 deletions

View File

@@ -428,8 +428,10 @@ public class XSLTRenderingEngine
{
LOGGER.debug("request to resolve href " + href +
" using base " + base);
final RenderingEngine.TemplateResourceResolver trr = (RenderingEngine.TemplateResourceResolver)
model.get(RenderingEngineTemplateImpl.PROP_RESOURCE_RESOLVER);
// // WCM
// final RenderingEngine.TemplateResourceResolver trr = (RenderingEngine.TemplateResourceResolver)
// model.get(RenderingEngineTemplateImpl.PROP_RESOURCE_RESOLVER);
final RenderingEngine.TemplateResourceResolver trr = null;
InputStream in = null;
try