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 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4296 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4301 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4302 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4303 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 14:33:46 +00:00
parent f24f43a98b
commit c890a3d2c4
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project-build.xml
View File

@@ -39,7 +39,6 @@
<fileset dir="${dir.common.lib}/jmagick" includes="*.jar" /> <fileset dir="${dir.common.lib}/jmagick" includes="*.jar" />
<fileset dir="${dir.common.lib}/commons" includes="*.jar" /> <fileset dir="${dir.common.lib}/commons" includes="*.jar" />
<fileset dir="${dir.common.lib}/jgroups" includes="*.jar" /> <fileset dir="${dir.common.lib}/jgroups" includes="*.jar" />
<fileset dir="${dir.common.lib}/treecache" includes="*.jar" />
<fileset dir="${dir.common.lib}/swarmcache" includes="*.jar" /> <fileset dir="${dir.common.lib}/swarmcache" includes="*.jar" />
<fileset dir="${dir.common.lib}/jbpm" includes="*.jar" /> <fileset dir="${dir.common.lib}/jbpm" includes="*.jar" />
<fileset dir="${dir.common.lib}/fop" includes="*.jar"/> <fileset dir="${dir.common.lib}/fop" includes="*.jar"/>

9
source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
View File

@@ -47,8 +47,6 @@ import org.alfresco.web.bean.repository.User;
import org.alfresco.web.ui.common.SortableSelectItem; import org.alfresco.web.ui.common.SortableSelectItem;
import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.UIGenericPicker; import org.alfresco.web.ui.common.component.UIGenericPicker;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSender;
/** /**
@@ -58,8 +56,6 @@ import org.springframework.mail.javamail.JavaMailSender;
*/ */
public abstract class InviteUsersWizard extends BaseWizardBean public abstract class InviteUsersWizard extends BaseWizardBean
{ {
private static Log logger = LogFactory.getLog(InviteUsersWizard.class);
/** I18N message strings */ /** I18N message strings */
protected static final String MSG_USERROLES = "invite_users_summary"; protected static final String MSG_USERROLES = "invite_users_summary";
private static final String MSG_USERS = "users"; private static final String MSG_USERS = "users";
@@ -70,6 +66,7 @@ public abstract class InviteUsersWizard extends BaseWizardBean
protected static final String STEP_NOTIFY = "notify"; protected static final String STEP_NOTIFY = "notify";
private static final String NOTIFY_YES = "yes"; private static final String NOTIFY_YES = "yes";
private static final String NOTIFY_NO = "no";
/** NamespaceService bean reference */ /** NamespaceService bean reference */
protected NamespaceService namespaceService; protected NamespaceService namespaceService;
@@ -99,7 +96,7 @@ public abstract class InviteUsersWizard extends BaseWizardBean
protected boolean allowDuplicateAuthorities = true; protected boolean allowDuplicateAuthorities = true;
/** dialog state */ /** dialog state */
private String notify = NOTIFY_YES; private String notify = NOTIFY_NO;
/** /**
* @return a cached list of available permissions for the type being dealt with * @return a cached list of available permissions for the type being dealt with
@@ -159,7 +156,7 @@ public abstract class InviteUsersWizard extends BaseWizardBean
{ {
super.init(parameters); super.init(parameters);
notify = NOTIFY_YES; notify = NOTIFY_NO;
userGroupRoles = new ArrayList<UserGroupRole>(8); userGroupRoles = new ArrayList<UserGroupRole>(8);
mailHelper = new TemplateMailHelperBean(); mailHelper = new TemplateMailHelperBean();
mailHelper.setMailSender(mailSender); mailHelper.setMailSender(mailSender);