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

More fall out from Template/Script refactoring:

Browse Source 
- fix to missing annotated service method (caused script command servlet to fail)
 - spelling mistakes in annotated service method parameters
 - cleanup in AbstractWebScript

Added ValueConverter concept to Template API - similar to JavaScript API ValueConverter, for a consistent mechanism to recursively convert Alfresco node properties to template accessable objects.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-04-24 13:11:25 +00:00
parent 89875c8037
commit 5121e99d54
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/scripts/AbstractWebScript.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.ScriptLocation;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.repository.TemplateService;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.web.scripts.WebScriptDescription.RequiredAuthentication;
import org.alfresco.web.scripts.WebScriptDescription.RequiredTransaction;
@@ -56,11 +57,11 @@ public abstract class AbstractWebScript implements WebScript
private ServiceRegistry serviceRegistry;
private DescriptorService descriptorService;
//
// Initialisation
//
/**
* @param scriptContext
*/
@@ -160,7 +161,6 @@ public abstract class AbstractWebScript implements WebScript
}
//
// Scripting Support
//
@@ -242,9 +242,7 @@ public abstract class AbstractWebScript implements WebScript
final protected Map<String, Object> createTemplateModel(WebScriptRequest req, WebScriptResponse res, Map<String, Object> customModel)
{
// create template model
Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
TemplateImageResolver tr = getWebScriptRegistry().getTemplateImageResolver();
Map<String, Object> model = new HashMap<String, Object>(8, 1.0f);
// add repository context
if (getDescription().getRequiredAuthentication() != RequiredAuthentication.none &&
@@ -272,6 +270,7 @@ public abstract class AbstractWebScript implements WebScript
// add template support
model.put("absurl", new AbsoluteUrlMethod(req.getServerPath()));
model.put("date", new Date());
model.put(TemplateService.KEY_IMAGE_RESOLVER, getWebScriptRegistry().getTemplateImageResolver());
// add custom model
if (customModel != null)