Merged 1.4 to HEAD (Repo changes associated with Records Management)

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4227 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4228 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4242 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4243 .
   svn resolved source\java\org\alfresco\repo\jscript\RhinoScriptService.java
   svn resolved config\alfresco\script-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 16:47:27 +00:00
parent b3a235b6eb
commit ae7c03d291

View File

@@ -34,6 +34,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.ScriptException;
import org.alfresco.service.cmr.repository.ScriptImplementation;
import org.alfresco.service.cmr.repository.ScriptLocation;
import org.alfresco.service.cmr.repository.ScriptImplementation;
import org.alfresco.service.cmr.repository.ScriptService;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.namespace.QName;