From c890a3d2c40ca47677f9bd42835884f2b215c563 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 18 Dec 2006 14:33:46 +0000
Subject: [PATCH] Merged 1.4 to HEAD    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
---
 project-build.xml                                        | 1 -
 .../org/alfresco/web/bean/wizard/InviteUsersWizard.java  | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/project-build.xml b/project-build.xml
index 91169a4601..2dadb725ee 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -39,7 +39,6 @@
          <fileset dir="${dir.common.lib}/jmagick" includes="*.jar" />
          <fileset dir="${dir.common.lib}/commons" 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}/jbpm" includes="*.jar" />
 	 <fileset dir="${dir.common.lib}/fop" includes="*.jar"/>
diff --git a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
index eb37440258..03648f6618 100644
--- a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
@@ -47,8 +47,6 @@ import org.alfresco.web.bean.repository.User;
 import org.alfresco.web.ui.common.SortableSelectItem;
 import org.alfresco.web.ui.common.Utils;
 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;
 
 /**
@@ -58,8 +56,6 @@ import org.springframework.mail.javamail.JavaMailSender;
  */
 public abstract class InviteUsersWizard extends BaseWizardBean
 {
-   private static Log logger = LogFactory.getLog(InviteUsersWizard.class);
-   
    /** I18N message strings */
    protected static final String MSG_USERROLES = "invite_users_summary";
    private static final String MSG_USERS  = "users";
@@ -70,6 +66,7 @@ public abstract class InviteUsersWizard extends BaseWizardBean
    protected static final String STEP_NOTIFY = "notify";
    
    private static final String NOTIFY_YES = "yes";
+   private static final String NOTIFY_NO = "no";
    
    /** NamespaceService bean reference */
    protected NamespaceService namespaceService;
@@ -99,7 +96,7 @@ public abstract class InviteUsersWizard extends BaseWizardBean
    protected boolean allowDuplicateAuthorities = true;
    
    /** 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
@@ -159,7 +156,7 @@ public abstract class InviteUsersWizard extends BaseWizardBean
    {
       super.init(parameters);
       
-      notify = NOTIFY_YES;
+      notify = NOTIFY_NO;
       userGroupRoles = new ArrayList<UserGroupRole>(8);
       mailHelper = new TemplateMailHelperBean();
       mailHelper.setMailSender(mailSender);