Now when InviteWebsiteUsersWizard invites a user,

the update message that the virtualization server
  gets is the path to the newly added webapp,
  not the path to that webapp in the staging area.

  For example, if 'bob' is added to the 'ROOT' 
  webapp of 'mysite', the virt server now 
  gets:  mysite--bob:/www/avm_webapps/ROOT
  not:   mysite:/www/avm_webapps/ROOT

  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jon Cox
2007-01-02 05:33:48 +00:00
parent ae1c4f0a39
commit 9af9d0e6be
4 changed files with 110 additions and 42 deletions

View File

@@ -20,6 +20,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -150,14 +151,18 @@ public class InviteWebsiteUsersWizard extends InviteUsersWizard
}
// build the sandboxes now we have the manager list and complete user list
List<SandboxInfo> sandboxInfoList = new LinkedList<SandboxInfo>();
for (UserGroupRole userRole : this.userGroupRoles)
{
String authority = userRole.getAuthority();
if (excludeUsers.contains(authority) == false)
{
SandboxFactory.createUserSandbox(
SandboxInfo info =
SandboxFactory.createUserSandbox(
getAvmStore(), this.managers, userRole.getAuthority(), userRole.getRole());
sandboxInfoList.add( info );
}
}
@@ -179,12 +184,20 @@ public class InviteWebsiteUsersWizard extends InviteUsersWizard
}
}
// reload virtualisation server for the web project
// reload virtualisation server for webapp in this web project
if (isStandalone())
{
String stagingStore = AVMConstants.buildStagingStoreName(getAvmStore());
String path = AVMConstants.buildStoreWebappPath(stagingStore, this.avmBrowseBean.getWebapp());
AVMConstants.updateVServerWebapp(path, true);
for (SandboxInfo sandboxInfo : sandboxInfoList )
{
String newlyInvitedStoreName =
AVMConstants.buildStagingStoreName( sandboxInfo.getMainStoreName() );
String path =
AVMConstants.buildStoreWebappPath( newlyInvitedStoreName,
this.avmBrowseBean.getWebapp());
AVMConstants.updateVServerWebapp(path, true);
}
}
return outcome;