Merged V2.2 to HEAD

7386: JSF component to view, add, edit and remove deployment server configuration
            Added new step to create/edit website wizard to collect and edit deployment server configuration 
            Enabled the copying of deployment server config when creating one web project from another
            Added new icons to tell apart Alfresco Server vs. File System deployments
            Updated UI to use 'friendly' server name when possible

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-21 14:35:30 +00:00
parent 9b838b82c4
commit 338914016b
16 changed files with 1732 additions and 53 deletions

View File

@@ -88,8 +88,8 @@ public class EditWebsiteWizard extends CreateWebsiteWizard
getNodeService().setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, this.description);
getNodeService().setProperty(nodeRef, WCMAppModel.PROP_ISSOURCE, this.isSource);
// clear the existing settings for forms, template and workflows - then the existing methods
// can be used to apply the modified and previous settings from scratch
// clear the existing settings for forms, template, workflows and deployment - then
// the existing methods can be used to apply the modified and previous settings from scratch
clearWebProjectModel(nodeRef);
// change/create the root webapp name for the website
@@ -106,7 +106,8 @@ public class EditWebsiteWizard extends CreateWebsiteWizard
// TODO: allow change of dns name - via store rename functionality
// persist the forms, templates, workflows and workflow defaults to the model for this web project
// persist the forms, templates, workflows, workflow defaults and deployment config
// to the model for this web project
saveWebProjectModel(nodeRef);
return AlfrescoNavigationHandler.CLOSE_WIZARD_OUTCOME;
@@ -133,5 +134,12 @@ public class EditWebsiteWizard extends CreateWebsiteWizard
{
getNodeService().removeChild(nodeRef, ref.getChildRef());
}
List<ChildAssociationRef> serverRefs = getNodeService().getChildAssocs(
nodeRef, WCMAppModel.ASSOC_DEPLOYMENTSERVER, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef ref : serverRefs)
{
getNodeService().removeChild(nodeRef, ref.getChildRef());
}
}
}