Merged V3.1 to HEAD

12911: Fix for Share calendar toolbar after regression from site membership refactoring
   12940: Refactoring of the Repository ScriptService to support compilation of Rhino JavaScript (from iDay work).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-10 14:55:21 +00:00
parent 292c0d92f2
commit 3b8d0f0fa4
6 changed files with 158 additions and 54 deletions

View File

@@ -55,8 +55,8 @@ public class ScriptServiceImpl implements ScriptService
private String defaultScriptProcessor;
/** Maps containing the script processors */
private Map<String, ScriptProcessor> scriptProcessors = new HashMap<String, ScriptProcessor>(5);
private Map<String, String> scriptProcessorNamesByExtension = new HashMap<String, String>(5);
private Map<String, ScriptProcessor> scriptProcessors = new HashMap<String, ScriptProcessor>(8);
private Map<String, String> scriptProcessorNamesByExtension = new HashMap<String, String>(8);
/** The node service */
private NodeService nodeService;
@@ -92,6 +92,17 @@ public class ScriptServiceImpl implements ScriptService
this.scriptProcessorNamesByExtension.put(scriptProcessor.getExtension(), scriptProcessor.getName());
}
/**
* Reset all registered script processors
*/
public void resetScriptProcessors()
{
for (ScriptProcessor p : this.scriptProcessors.values())
{
p.reset();
}
}
/**
* @see org.alfresco.service.cmr.repository.ScriptService#executeScript(java.lang.String, java.util.Map)
*/