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

Merged DEV/BELARUS/HEAD-2010_03_17 to HEAD

Browse Source 
19398: SAIL-298: Create New subsystems and modify identified modules to use properties from newly created subsystems 
      - Remove web.application.context.url from repository.properties and action-services-context.xml.
      - Expose mailService outside of the OutboundSMTP subsystem because it is needed for email space/invited users actions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-03-23 12:03:15 +00:00
parent 557c9e5cfa
commit e9474e4764
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java
View File

@@ -24,6 +24,7 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.ParameterDefinitionImpl;
import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.repo.jscript.ScriptAction;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.action.Action;
@@ -48,11 +49,11 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase
public static final String PARAM_SCRIPTREF = "script-ref";
private ServiceRegistry serviceRegistry;
private SysAdminParams sysAdminParams;
private PersonService personService;
private String companyHomePath;
private StoreRef storeRef;
private ScriptLocation scriptLocation;
private String webApplicationContextUrl;
/**
* @param serviceRegistry The serviceRegistry to set.
@@ -62,6 +63,14 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase
this.serviceRegistry = serviceRegistry;
}
/**
* @param sysAdminParams The sysAdminParams to set.
*/
public void setSysAdminParams(SysAdminParams sysAdminParams)
{
this.sysAdminParams = sysAdminParams;
}
/**
* @param personService The personService to set.
*/
@@ -90,16 +99,6 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase
this.scriptLocation = scriptLocation;
}
/**
* Set the web application context url
*
* @param webApplicationContextUrl web application context url
*/
public void setWebApplicationContextUrl(String webApplicationContextUrl)
{
this.webApplicationContextUrl = webApplicationContextUrl;
}
/**
* Allow adhoc properties to be passed to this action
*
@@ -155,7 +154,7 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase
ScriptAction scriptAction = new ScriptAction(this.serviceRegistry, action, this.actionDefinition);
model.put("action", scriptAction);
model.put("webApplicationContextUrl", webApplicationContextUrl);
model.put("webApplicationContextUrl", sysAdminParams.getAlfrescoProtocol() + "://" + sysAdminParams.getAlfrescoHost() + ":" + sysAdminParams.getAlfrescoPort() + "/" + sysAdminParams.getAlfrescoContext());
Object result = null;
if (this.scriptLocation == null)