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 V3.2 to HEAD

Browse Source 
17850 : Addition of AVM - DM deployment.
    17905 : ETHREEOH-3809 - WCM - First test server deploy fails.     
	- added yet another transaction to read the previous snapshot transaction.    
	 - added a new system test based upon the WCM services.    The beginnings of testing against layered authored sandboxes.
    17907 : ETHREEOH-3806 - WCM Contributor cant release test server.   
	 -  release test server now runs without permissions checks (like the deploy action does)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-02-18 14:50:06 +00:00
parent 7cbb3a0daf
commit cdbeba0cd0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java
View File

@@ -31,11 +31,14 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.WCMAppModel; import org.alfresco.model.WCMAppModel;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.AlfrescoNavigationHandler;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean; import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.jsf.FacesContextUtils;
/** /**
* Bean implementation for the "Release Test Server" dialog * Bean implementation for the "Release Test Server" dialog
@@ -71,10 +74,14 @@ public class ReleaseTestServerDialog extends BaseDialogBean
protected String finishImpl(FacesContext context, String outcome) protected String finishImpl(FacesContext context, String outcome)
throws Exception throws Exception
{ {
WebApplicationContext wac = FacesContextUtils.getRequiredWebApplicationContext(context);
NodeService unprotectedNodeService = (NodeService)wac.getBean("nodeService");
List<NodeRef> testServers = DeploymentUtil.findAllocatedTestServers(this.store); List<NodeRef> testServers = DeploymentUtil.findAllocatedTestServers(this.store);
for(NodeRef testServer : testServers) for(NodeRef testServer : testServers)
{ {
getNodeService().setProperty(testServer, unprotectedNodeService.setProperty(testServer,
WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO, null); WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO, null);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())