From cdbeba0cd0fd9da3fe5877b0567d3ac0cd4f88c4 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Thu, 18 Feb 2010 14:50:06 +0000 Subject: [PATCH] Merged V3.2 to HEAD 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 --- .../alfresco/web/bean/wcm/ReleaseTestServerDialog.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java b/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java index 88ebf58b4f..697fba40ca 100644 --- a/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java @@ -31,11 +31,14 @@ import javax.faces.context.FacesContext; import org.alfresco.model.WCMAppModel; 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.Application; import org.alfresco.web.bean.dialog.BaseDialogBean; import org.apache.commons.logging.Log; 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 @@ -71,10 +74,14 @@ public class ReleaseTestServerDialog extends BaseDialogBean protected String finishImpl(FacesContext context, String outcome) throws Exception { + + WebApplicationContext wac = FacesContextUtils.getRequiredWebApplicationContext(context); + NodeService unprotectedNodeService = (NodeService)wac.getBean("nodeService"); + List testServers = DeploymentUtil.findAllocatedTestServers(this.store); for(NodeRef testServer : testServers) { - getNodeService().setProperty(testServer, + unprotectedNodeService.setProperty(testServer, WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO, null); if (logger.isDebugEnabled())