Index: site-manage-tool/tool/pom.xml
===================================================================
--- site-manage-tool/tool/pom.xml	(revision 307287)
+++ site-manage-tool/tool/pom.xml	(working copy)
@@ -122,22 +122,9 @@
 
         <!-- bjones86 - SAK-24423 - joinable site settings -->
         <dependency>
-			<groupId>org.sakaiproject.emailtemplateservice</groupId>
-			<artifactId>emailtemplateservice-api</artifactId>
-        </dependency>
-        <dependency>
 			<groupId>org.sakaiproject.entitybroker</groupId>
 			<artifactId>entitybroker-api</artifactId>
         </dependency>
-        <dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-			<groupId>jdom</groupId>
-			<artifactId>jdom</artifactId>
-			<version>1.0</version>
-        </dependency>
 
     </dependencies>
     
Index: site-manage-tool/tool/src/java/org/sakaiproject/site/tool/JoinableSiteSettings.java
===================================================================
--- site-manage-tool/tool/src/java/org/sakaiproject/site/tool/JoinableSiteSettings.java	(revision 307287)
+++ site-manage-tool/tool/src/java/org/sakaiproject/site/tool/JoinableSiteSettings.java	(working copy)
@@ -52,7 +52,6 @@
 	
 	// State variable names
 	private static final String STATE_JOIN_SITE_GROUP_ID				= "state_join_site_group";
-	private static final String STATE_JOIN_SITE_NOTIFICATION 			= "state_join_site_notification";
 	private static final String STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST		= "state_join_site_exclude_public_list";
 	private static final String STATE_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE	= "state_join_site_limit_by_account_type";
 	private static final String STATE_JOIN_SITE_ACCOUNT_TYPES 			= "state_join_site_account_types";
@@ -62,7 +61,6 @@
 	// Site property names
 	private static final String SITE_PROP_JOIN_SITE_GROUP_ID 				= "joinerGroup";
 	private static final String SITE_PROP_JOIN_SITE_GROUP_NO_SEL			= "noSelection";
-	private static final String SITE_PROP_JOIN_SITE_NOTIFACTION				= "joinNotification";
 	private static final String SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST		= "joinExcludeFromPublicList";
 	private static final String SITE_PROP_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE 	= "joinLimitByAccountType";
 	private static final String SITE_PROP_JOIN_SITE_ACCOUNT_TYPES 			= "joinLimitedAccountTypes";
@@ -70,18 +68,15 @@
 	// Context variable/element names
 	private static final String CONTEXT_JOIN_SITE_GROUPS										= "siteGroups";
 	private static final String CONTEXT_JOIN_SITE_GROUP_DROP_DOWN								= "selectJoinerGroup";
-	private static final String CONTEXT_JOIN_SITE_NOTIFY_CHECKBOX 								= "chkJoinNotification";
 	private static final String CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST_CHECKBOX					= "chkJoinExcludeFromPublicList";
 	private static final String CONTEXT_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE_CHECKBOX				= "chkJoinLimitByAccountType";
 	private static final String CONTEXT_JOIN_SITE_ACCOUNT_TYPES									= "joinableAccountTypes";
 	private static final String CONTEXT_JOIN_SITE_ACCOUNT_CATEGORIES							= "joinableAccountTypeCategories";
 	private static final String CONTEXT_JOIN_SITE_ACCOUNT_TYPE_CHECKBOX_PREFIX 					= "chkJoin-";
 	private static final String CONTEXT_JOIN_SITE_GROUP_ENABLED									= "joinGroupEnabled";
-	private static final String CONTEXT_JOIN_SITE_NOTIFICATION_ENABLED							= "joinNotificationEnabled";
 	private static final String CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST_ENABLED					= "joinExcludeFromPublicListEnabled";
 	private static final String CONTEXT_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE_ENABLED					= "joinLimitAccountTypesEnabled";
 	private static final String CONTEXT_JOIN_SITE_GROUP_ID										= SITE_PROP_JOIN_SITE_GROUP_ID;
-	private static final String CONTEXT_JOIN_SITE_NOTIFICATION									= SITE_PROP_JOIN_SITE_NOTIFACTION;
 	private static final String CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST							= SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST;
 	private static final String CONTEXT_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE							= SITE_PROP_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE;
 	private static final String CONTEXT_JOIN_SITE_LIMIT_ACCOUNT_TYPES							= SITE_PROP_JOIN_SITE_ACCOUNT_TYPES;
@@ -94,7 +89,6 @@
 	private static final String CONTEXT_JOIN_SITE_LINK											= "link";
 	private static final String CONTEXT_JOIN_SITE_SITE_BROWSER_JOIN_ENABLED						= "siteBrowserJoinEnabled";
 	private static final String CONTEXT_JOIN_SITE_GROUP_ENABLED_LOCAL_DISABLED_GLOBAL 			= "joinGroupEnabledLocalDisabledGlobal";
-	private static final String CONTEXT_JOIN_SITE_NOTIFICATION_ENABLED_LOCAL_DISABLED_GLOBAL 	= "joinNotifyEnabledLocalDisabledGlobal";
 	private static final String CONTEXT_JOIN_SITE_EXCLUDE_ENABLED_LOCAL_DISABLED_GLOBAL 		= "joinExcludeEnabledLocalDisabledGlobal";
 	private static final String CONTEXT_JOIN_SITE_LIMIT_ENABLED_LOCAL_DISABLED_GLOBAL 			= "joinLimitEnabledLocalDisabledGlobal";
 	
@@ -527,11 +521,6 @@
 			siteInfo.joinerGroup = params.getString( SITE_PROP_JOIN_SITE_GROUP_ID );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() && params.getString( SITE_PROP_JOIN_SITE_NOTIFACTION ) != null )
-		{
-			siteInfo.joinNotifications = Boolean.valueOf( params.getString( SITE_PROP_JOIN_SITE_NOTIFACTION ) );
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() && params.getString( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST ) != null )
 		{
 			siteInfo.joinExcludePublic = Boolean.valueOf( params.getString( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST ) );
@@ -571,12 +560,6 @@
 			siteInfo.joinerGroup = props.getProperty( SITE_PROP_JOIN_SITE_GROUP_ID );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() && props.getProperty( SITE_PROP_JOIN_SITE_NOTIFACTION ) != null )
-		{
-			try { siteInfo.joinNotifications = Boolean.valueOf( props.getBooleanProperty( SITE_PROP_JOIN_SITE_NOTIFACTION ) ); }
-			catch( Exception ex ) { siteInfo.joinNotifications = false; }
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() && props.getProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST ) != null )
 		{
 			try { siteInfo.joinExcludePublic = Boolean.valueOf( props.getBooleanProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST ) ); }
@@ -619,11 +602,6 @@
 			props.addProperty( SITE_PROP_JOIN_SITE_GROUP_ID, siteInfo.joinerGroup );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() )
-		{
-			props.addProperty( SITE_PROP_JOIN_SITE_NOTIFACTION, Boolean.toString( siteInfo.joinNotifications ) );
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
 		{
 			props.addProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST, Boolean.toString( siteInfo.joinExcludePublic ) );
@@ -683,11 +661,6 @@
 			props.addProperty( SITE_PROP_JOIN_SITE_GROUP_ID, (String) state.getAttribute( FORM_PREFIX + CONTEXT_JOIN_SITE_GROUP_DROP_DOWN ) );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() )
-		{
-			props.addProperty( SITE_PROP_JOIN_SITE_NOTIFACTION, (String) state.getAttribute( FORM_PREFIX + CONTEXT_JOIN_SITE_NOTIFY_CHECKBOX ) );
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
 		{
 			props.addProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST, (String) state.getAttribute( FORM_PREFIX + CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST_CHECKBOX ) );
@@ -723,11 +696,6 @@
 			props.addProperty( SITE_PROP_JOIN_SITE_GROUP_ID, state.getAttribute( STATE_JOIN_SITE_GROUP_ID ).toString() );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() )
-		{
-			props.addProperty( SITE_PROP_JOIN_SITE_NOTIFACTION, state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ).toString() );
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
 		{
 			props.addProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST, state.getAttribute( STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST ).toString() );
@@ -771,15 +739,6 @@
 				siteInfo.joinerGroup = "";
 			}
 			
-			if( siteService.isGlobalJoinNotificationEnabled() && state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ) != null )
-			{
-				siteInfo.joinNotifications = Boolean.valueOf( state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ).toString() );
-			}
-			else
-			{
-				siteInfo.joinNotifications = false;
-			}
-			
 			if( siteService.isGlobalJoinExcludedFromPublicListEnabled() && state.getAttribute( STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST ) != null )
 			{
 				siteInfo.joinExcludePublic = Boolean.valueOf( state.getAttribute( STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST ).toString() );
@@ -861,11 +820,6 @@
 			readInputAndUpdateStateVariable( state, params, CONTEXT_JOIN_SITE_GROUP_DROP_DOWN, STATE_JOIN_SITE_GROUP_ID, false );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() )
-		{
-			readInputAndUpdateStateVariable( state, params, CONTEXT_JOIN_SITE_NOTIFY_CHECKBOX, STATE_JOIN_SITE_NOTIFICATION, true );
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
 		{
 			readInputAndUpdateStateVariable( state, params, CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST_CHECKBOX, STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST, true );
@@ -905,9 +859,6 @@
 		// for clarity to the user (the checkboxes will still hold their initial choices, but will be disabled)
 		state.setAttribute( STATE_JOIN_SITE_GROUP_ID, props.getProperty( SITE_PROP_JOIN_SITE_GROUP_ID ) );
 		
-		try { state.setAttribute( STATE_JOIN_SITE_NOTIFICATION, Boolean.valueOf( props.getBooleanProperty( SITE_PROP_JOIN_SITE_NOTIFACTION ) ) ); }
-		catch( Exception ex ) { state.setAttribute( STATE_JOIN_SITE_NOTIFICATION, Boolean.FALSE ); }
-		
 		try { state.setAttribute( STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST, Boolean.valueOf( props.getBooleanProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST ) ) ); }
 		catch( Exception ex ) { state.setAttribute( STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST, Boolean.FALSE ); }
 		
@@ -939,9 +890,6 @@
 		try { siteInfo.joinerGroup = props.getProperty( SITE_PROP_JOIN_SITE_GROUP_ID ); }
 		catch( Exception ex ) { siteInfo.joinerGroup = SITE_PROP_JOIN_SITE_GROUP_NO_SEL; }
 		
-		try { siteInfo.joinNotifications = props.getBooleanProperty( SITE_PROP_JOIN_SITE_NOTIFACTION ); }
-		catch( Exception ex ) { siteInfo.joinNotifications = false; }
-		
 		try { siteInfo.joinExcludePublic = props.getBooleanProperty( SITE_PROP_JOIN_SITE_EXCLUDE_PUBLIC_LIST ); }
 		catch( Exception ex ) { siteInfo.joinExcludePublic = false; }
 		
@@ -1033,25 +981,7 @@
 					putSiteGroupsIntoContext( site, context );
 					context.put( CONTEXT_JOIN_SITE_GROUP_ENABLED_LOCAL_DISABLED_GLOBAL, Boolean.TRUE );
 				}
-			}			
-			
-			// Repeat the above process for join notification
-			if( siteService.isGlobalJoinNotificationEnabled() )
-			{
-				if( state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ) != null )
-				{
-					context.put( CONTEXT_JOIN_SITE_NOTIFICATION, state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ) );
-				}
 			}
-			else
-			{
-				if( state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ) != null &&
-						Boolean.valueOf( state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ).toString() ) == Boolean.TRUE )
-				{
-					context.put( CONTEXT_JOIN_SITE_NOTIFICATION, state.getAttribute( STATE_JOIN_SITE_NOTIFICATION ) );
-					context.put( CONTEXT_JOIN_SITE_NOTIFICATION_ENABLED_LOCAL_DISABLED_GLOBAL, Boolean.TRUE );
-				}
-			}
 			
 			// Repeat the above process for exclude from public
 			if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
@@ -1156,11 +1086,6 @@
 				state.removeAttribute( STATE_JOIN_SITE_GROUP_ID );
 			}
 			
-			if( siteService.isGlobalJoinNotificationEnabled() )
-			{
-				state.removeAttribute( STATE_JOIN_SITE_NOTIFICATION );
-			}
-			
 			if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
 			{
 				state.removeAttribute( STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST );
@@ -1266,11 +1191,6 @@
 			context.put( CONTEXT_JOIN_SITE_GROUP_ID, siteInfo.joinerGroup );
 		}
 		
-		if( siteService.isGlobalJoinNotificationEnabled() )
-		{
-			context.put( CONTEXT_JOIN_SITE_NOTIFICATION, Boolean.valueOf( siteInfo.joinNotifications ) );
-		}
-		
 		if( siteService.isGlobalJoinExcludedFromPublicListEnabled() )
 		{
 			context.put( CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST, Boolean.valueOf( siteInfo.joinExcludePublic ) );
@@ -1297,7 +1217,6 @@
 		}
 		
 		context.put( CONTEXT_JOIN_SITE_GROUP_ENABLED, Boolean.valueOf( siteService.isGlobalJoinGroupEnabled() ) );
-		context.put( CONTEXT_JOIN_SITE_NOTIFICATION_ENABLED, Boolean.valueOf( siteService.isGlobalJoinNotificationEnabled() ) );
 		context.put( CONTEXT_JOIN_SITE_EXCLUDE_PUBLIC_LIST_ENABLED, Boolean.valueOf( siteService.isGlobalJoinExcludedFromPublicListEnabled() ) );
 		context.put( CONTEXT_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE_ENABLED, Boolean.valueOf( siteService.isGlobalJoinLimitByAccountTypeEnabled() ) );
 	}
@@ -1376,7 +1295,7 @@
 		String paramValue = StringUtils.trimToNull( params.getString( paramName ) );
 		
 		// If the state attribute name is one of the joinable site setting's, flip the value from 'on'/'off' to 'true'/'false'
-		if( STATE_JOIN_SITE_NOTIFICATION.equalsIgnoreCase( stateAttributeName ) || STATE_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE.equalsIgnoreCase( stateAttributeName ) ||
+		if( STATE_JOIN_SITE_LIMIT_BY_ACCOUNT_TYPE.equalsIgnoreCase( stateAttributeName ) ||
 				STATE_JOIN_SITE_EXCLUDE_PUBLIC_LIST.equalsIgnoreCase( stateAttributeName ) || stateAttributeName.startsWith( STATE_JOIN_SITE_ACCOUNT_TYPE_PREFIX ) )
 		{
 			if( paramValue != null && paramValue.equalsIgnoreCase( ON_STRING ) )
Index: site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
===================================================================
--- site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java	(revision 307287)
+++ site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java	(working copy)
@@ -12204,12 +12204,6 @@
 			return joinerGroup;
 		}
 		
-		public boolean joinNotifications = false;
-		public boolean getJoinNotifications()
-		{ 
-			return joinNotifications;
-		}
-		
 		public boolean joinExcludePublic = false;
 		public boolean getJoinExcludePublic()
 		{ 
Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-editAccess.vm
===================================================================
--- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-editAccess.vm	(revision 307287)
+++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-editAccess.vm	(working copy)
@@ -239,8 +239,8 @@
 				</p>
 				
 				## bjones86 - SAK-24423 - joinable site settings title
-				#if( $joinGroupEnabled || $joinNotificationEnabled || $joinExcludeFromPublicListEnabled || $joinLimitAccountTypesEnabled ||
-						$joinGroupEnabledLocalDisabledGlobal || $joinNotifyEnabledLocalDisabledGlobal || $joinExcludeEnabledLocalDisabledGlobal ||
+				#if( $joinGroupEnabled || $joinExcludeFromPublicListEnabled || $joinLimitAccountTypesEnabled ||
+						$joinGroupEnabledLocalDisabledGlobal || $joinExcludeEnabledLocalDisabledGlobal ||
 						$joinLimitEnabledLocalDisabledGlobal )
 					<p class="indnt3">$tlang.getString( "ediacc.additionJoinAccessOptions" )</p>
 				#end
@@ -263,21 +263,6 @@
 					</p>
 				#end
 				
-				## bjones86 - SAK-24423 - joinable site settings - join notification
-				#if( $joinNotificationEnabled || $joinNotifyEnabledLocalDisabledGlobal )
-					<p class="checkbox indnt4">
-						<input name="chkJoinNotification" id="chkJoinNotification" type="checkbox" 
-								#if( $joinNotification ) checked="checked" #end 
-								#if( !$joinNotificationEnabled || $joinNotifyEnabledLocalDisabledGlobal ) disabled #end />
-						<label for="chkJoinNotification" #if( !$joinNotificationEnabled || $joinNotifyEnabledLocalDisabledGlobal ) class="instruction" #end>
-							$tlang.getString( "ediacc.joinNotification" )
-						</label>
-					</p>
-					#if( $joinNotifyEnabledLocalDisabledGlobal )
-						<p class="indnt7 messageInformation">$tlang.getString( "ediacc.notifyEnabledLocalDisabledGlobal" )</p>
-					#end
-				#end
-				
 				## bjones86 - SAK-24423 - joinable site settings - exclude from public list
 				#if( $joinExcludeFromPublicListEnabled || $joinExcludeEnabledLocalDisabledGlobal )
 					<p class="checkbox indnt4">