Index: impl/src/test/org/sakaiproject/poll/logic/test/stubs/ExternalLogicStubb.java
===================================================================
--- impl/src/test/org/sakaiproject/poll/logic/test/stubs/ExternalLogicStubb.java	(revision 1983)
+++ impl/src/test/org/sakaiproject/poll/logic/test/stubs/ExternalLogicStubb.java	(working copy)
@@ -164,4 +164,14 @@
 		return false;
 	}
 
+	public void notifyDeletedOption(List<String> userEids, String siteTitle,
+			String pollQuestion) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public String getUserEidFromId(String userId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
Index: impl/src/java/org/sakaiproject/poll/service/impl/PollListManagerImpl.java
===================================================================
--- impl/src/java/org/sakaiproject/poll/service/impl/PollListManagerImpl.java	(revision 1983)
+++ impl/src/java/org/sakaiproject/poll/service/impl/PollListManagerImpl.java	(working copy)
@@ -287,6 +287,20 @@
         return optionList;
     }
 
+	public List<Option> getVisibleOptionsForPoll(Long pollId) {
+		List<Option> options = getOptionsForPoll(pollId);
+		
+		//iterate and remove deleted options
+		for (Iterator<Option> i = options.listIterator(); i.hasNext();) {
+			Option o = i.next();
+			if (o == null || o.getDeleted()) {
+				i.remove();
+			}
+		}
+		
+		return options;
+	}
+
     public Poll getPollWithVotes(Long pollId) {
     	Search search = new Search();
         search.addRestriction(new Restriction("pollId", pollId));
@@ -317,6 +331,22 @@
         log.info("Option id " + option.getId() + " deleted");
     }
 
+	public void deleteOption(Option option, boolean soft) {
+		if (!soft) {
+			deleteOption(option);
+			return;
+		} else {
+			try {
+				option.setDeleted(Boolean.TRUE);
+				dao.save(option);
+				log.info("Option id " + option.getId() + " soft deleted.");
+			} catch (DataAccessException e) {
+				log.error("Hibernate could not soft delete delete!", e);
+	            return;
+			}
+		}
+	}
+
     public boolean saveOption(Option t) {
         if (t.getUUId() == null 
                 || t.getUUId().trim().length() == 0) {
@@ -396,8 +426,9 @@
                 // archive this assignment
                 Element el = poll.toXml(doc, stack);
 
-                // get the options
-                List options = getOptionsForPoll(poll);
+                // since we aren't archiving votes too, don't worry about archiving the
+                // soft-deleted options -- only "visible".
+                List options = getVisibleOptionsForPoll(poll.getPollId());
 
                 for (int q = 0; options.size() > q; q++) {
                     Option opt = (Option) options.get(q);
@@ -533,6 +564,7 @@
 				        	toOption.setOptionText(fromOption.getOptionText());
 				        	toOption.setStatus(fromOption.getStatus());
 				        	toOption.setPollId(toPoll.getPollId());
+				        	toOption.setDeleted(fromOption.getDeleted());
 				        	saveOption(toOption);
 				        	
 				        	toPoll.addOption(toOption);
@@ -627,6 +659,4 @@
 
 		return false;
 	}
-    
-
 }
Index: impl/src/java/org/sakaiproject/poll/service/impl/PollVoteManagerImpl.java
===================================================================
--- impl/src/java/org/sakaiproject/poll/service/impl/PollVoteManagerImpl.java	(revision 1983)
+++ impl/src/java/org/sakaiproject/poll/service/impl/PollVoteManagerImpl.java	(working copy)
@@ -188,8 +188,8 @@
 	{
 		//poll must have options to be votable
 
-		poll.setOptions(pollListManager.getOptionsForPoll(poll));
-		if (poll.getPollOptions()== null || poll.getPollOptions().size() == 0) {
+		List<Option> votableOptions = pollListManager.getVisibleOptionsForPoll(poll.getPollId());
+		if (votableOptions == null || votableOptions.size() == 0) {
 			log.debug("poll has no options");
 			return false;
 		}
@@ -230,5 +230,7 @@
 	}
 
 
-
+	public void deleteVote(Vote vote) {
+		dao.delete(vote);
+	}
 }
Index: impl/src/java/org/sakaiproject/poll/logic/impl/ExternalLogicImpl.java
===================================================================
--- impl/src/java/org/sakaiproject/poll/logic/impl/ExternalLogicImpl.java	(revision 1983)
+++ impl/src/java/org/sakaiproject/poll/logic/impl/ExternalLogicImpl.java	(working copy)
@@ -21,15 +21,23 @@
 
 package org.sakaiproject.poll.logic.impl;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.Map.Entry;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.sakaiproject.authz.api.AuthzGroup;
@@ -39,6 +47,11 @@
 import org.sakaiproject.authz.api.GroupNotDefinedException;
 import org.sakaiproject.authz.api.Role;
 import org.sakaiproject.authz.api.SecurityService;
+import org.sakaiproject.component.api.ServerConfigurationService;
+import org.sakaiproject.email.api.EmailService;
+import org.sakaiproject.emailtemplateservice.model.EmailTemplate;
+import org.sakaiproject.emailtemplateservice.model.RenderedTemplate;
+import org.sakaiproject.emailtemplateservice.service.EmailTemplateService;
 import org.sakaiproject.entity.api.EntityManager;
 import org.sakaiproject.entity.api.Reference;
 import org.sakaiproject.entitybroker.DeveloperHelperService;
@@ -50,12 +63,30 @@
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.site.api.SiteService;
 import org.sakaiproject.time.api.TimeService;
-import org.sakaiproject.tool.cover.ToolManager;
+import org.sakaiproject.tool.api.Session;
+import org.sakaiproject.tool.api.SessionManager;
+import org.sakaiproject.user.api.User;
+import org.sakaiproject.user.api.UserDirectoryService;
+import org.sakaiproject.user.api.UserNotDefinedException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 public class ExternalLogicImpl implements ExternalLogic {
 
 	 private static Log log = LogFactory.getLog(ExternalLogicImpl.class);
 	
+	 private static final String
+	 	/* Email template constants */
+	 	EMAIL_TEMPLATE_NOTIFY_DELETED_OPTION = "polls.notifyDeletedOption",
+	 	FILE_NOTIFY_DELETED_OPTION_TEMPLATE = "notifyDeletedOption.xml",
+	 	
+	 	/* Other constants */
+	 	USER_ADMIN_ID = "admin",
+	 	USER_ADMIN_EID = "admin";
+	 
 	private static final String USER_ENTITY_PREFIX = "/user/";
 	
 	/**
@@ -78,6 +109,16 @@
         entityManager = em;
     }
 
+    private EmailService emailService;
+    public void setEmailService(EmailService emailService) {
+    	this.emailService = emailService;
+    }
+    
+    private EmailTemplateService emailTemplateService;
+    public void setEmailTemplateService(EmailTemplateService emailTemplateService) {
+    	this.emailTemplateService = emailTemplateService;
+    }
+    
     private EventTrackingService eventTrackingService;
     public void setEventTrackingService(EventTrackingService ets) {
         eventTrackingService = ets;
@@ -103,7 +144,33 @@
 	public void setSecurityService(SecurityService securityService) {
 		this.securityService = securityService;
 	}
+	
+	private ServerConfigurationService serverConfigurationService;
+	public void setServerConfigurationService(
+			ServerConfigurationService serverConfigurationService) {
+		this.serverConfigurationService = serverConfigurationService;
+	}
+	
+	private SessionManager sessionManager;
+	public void setSessionManager(SessionManager sessionManager) {
+		this.sessionManager = sessionManager;
+	}
+	
+	private UserDirectoryService userDirectoryService;
+	public void setUserDirectoryService(UserDirectoryService userDirectoryService) {
+		this.userDirectoryService = userDirectoryService;
+	}
 
+	private String fromEmailAddress;
+	public void setFromEmailAddress(String fromEmailAddress) {
+		this.fromEmailAddress = fromEmailAddress;
+	}
+	
+	private String replyToEmailAddress;
+	public void setReplyToEmailAddress(String replyToEmailAddress) {
+		this.replyToEmailAddress = replyToEmailAddress;
+	}
+	
 	/**
      * Methods
      */
@@ -126,6 +193,16 @@
 	public String getCurrentuserReference() {
 		return developerHelperService.getCurrentUserReference();
 	} 
+
+	public String getUserEidFromId(String userId) {
+		try {
+			return userDirectoryService.getUserEid(userId);
+		} catch (UserNotDefinedException e) {
+			log.debug("Looked up non-existant user id: "+userId, e);
+		}
+		
+		return null;
+	}
 	
 	public String getCurrentLocationReference() {
 		log.debug("getCurrentLocationReference");
@@ -145,6 +222,21 @@
 
     private static final String SAKAI_SITE_TYPE = SiteService.SITE_SUBTYPE;
    
+    public void init() {
+    	log.info("init()");
+    	
+    	try {
+    		//Load the "notify deleted option" template
+			loadMailTemplate(EMAIL_TEMPLATE_NOTIFY_DELETED_OPTION, FILE_NOTIFY_DELETED_OPTION_TEMPLATE);
+		} catch (ParserConfigurationException e) {
+			throw new RuntimeException("Could not load an XML parser.", e);
+		} catch (IOException e) {
+			throw new RuntimeException("Could not read from XML template.");
+		} catch (InvalidEmailTemplateException e) {
+			throw new RuntimeException("Could not parse email template: "+e.getKey()+" from "+e.getFileName(), e);
+		}
+    }
+    
     public List<String> getSitesForUser(String userId, String permission) {
         log.debug("userId: " + userId + ", permission: " + permission);
 
@@ -227,11 +319,11 @@
 	}
 
 
-	public String getSiteTile(String locationReference) {
+	public String getSiteTile(String siteId) {
 		Site site;
 		
 		try {
-			site = siteService.getSite(locationReference);
+			site = siteService.getSite(siteId);
 			return site.getTitle();
 		} catch (IdUnusedException e) {
 			// TODO Auto-generated catch block
@@ -352,7 +444,184 @@
 		return false;
 	}
 
+	public void notifyDeletedOption(List<String> userEids, String siteTitle, String pollQuestion) {
+		if (siteTitle == null)
+			throw new IllegalArgumentException("Site title cannot be null");
+		else if (pollQuestion == null)
+			throw new IllegalArgumentException("Poll Question cannot be null");
+		
+		Map<String, String> replacementValues = new HashMap<String, String>();
 
+		String from = (fromEmailAddress == null || fromEmailAddress.equals("")) ?
+					"no-reply@"+serverConfigurationService.getServerUrl() : fromEmailAddress;
+					
+		for (String userEid : userEids) {
+			User user = null;
+			try {
+				user = userDirectoryService.getUserByEid(userEid);
+				replacementValues.put("localSakaiName",
+						developerHelperService.getConfigurationSetting("ui.service", "Sakai"));
+				replacementValues.put("recipientFirstName",user.getFirstName());
+				replacementValues.put("pollQuestion", pollQuestion);
+				replacementValues.put("siteTitle", siteTitle); 
 
+				RenderedTemplate template = emailTemplateService.getRenderedTemplateForUser(EMAIL_TEMPLATE_NOTIFY_DELETED_OPTION,
+						user.getReference(), replacementValues);
+				
+				if (template == null)
+					return;
+					
+				String
+					content = template.getRenderedMessage(),
+					subject = template.getRenderedSubject();
+				
+				emailService.send(from, user.getEmail(), subject, content, user.getEmail(), from,
+						null);
+			} catch (UserNotDefinedException e) {
+				log.warn("Attempted to send email to unknown user (eid): '"+userEid+"'", e);
+			}
+		}
+	}
 	
+	/**
+	 * Load the mail template described by the XML in file 'fileName' into the emailTemplateService,
+	 * identified by 'key'
+	 * 
+	 * @param key
+	 * 	The key that identifies the template
+	 * @param fileName
+	 * 	The filename that holds the template information
+	 * @throws ParserConfigurationException
+	 * @throws IOException
+	 * @throws InvalidEmailTemplateException
+	 * 	Thrown if the email template is not a valid format.
+	 */
+	private void loadMailTemplate(String key, String fileName) throws ParserConfigurationException,
+			IOException, InvalidEmailTemplateException {
+		Session session = null;
+		try {
+			session = sessionManager.getCurrentSession();
+			session.setUserId(USER_ADMIN_ID);
+			session.setUserEid(USER_ADMIN_EID);
+			
+			try {
+				NodeList templates = getEmailTemplates(FILE_NOTIFY_DELETED_OPTION_TEMPLATE);
+				int n = templates.getLength();
+				for (int i = 0; i < n; i++) {
+					xmlToTemplate((Element)templates.item(i), key);
+				}
+			} catch (SAXException e) {
+				throw new InvalidEmailTemplateException(key, fileName, e);
+			} catch (InvalidEmailTemplateException e) {
+				//'e' doesn't have all the information to throw here.
+				throw new InvalidEmailTemplateException(key, fileName);
+			}
+		} finally {
+			if (session != null) {
+				session.setUserId(null);
+				session.setUserEid(null);
+			}
+		}
+	}
+	
+	/**
+	 * Given the XML template node, load it into the Email Template Service as a template
+	 * identified by 'key'
+	 * 
+	 * @param xmlTemplate
+	 * 	The valid XML template to load
+	 * @param key
+	 * 	The key that should identify the template
+	 */
+	private void xmlToTemplate(Element xmlTemplate, String key) {
+		String
+			subject = getTagValue(xmlTemplate, "subject", ""),
+			body = getTagValue(xmlTemplate, "message", ""),
+			locale = getTagValue(xmlTemplate, "locale", ""),
+			versionString = getTagValue(xmlTemplate, "version", "");
+	
+		EmailTemplate existingTemplate = this.emailTemplateService.getEmailTemplate(key, new Locale(locale));
+		if (existingTemplate == null)
+		{
+			EmailTemplate template = new EmailTemplate();
+			template.setSubject(subject);
+			template.setMessage(body);
+			template.setLocale(locale);
+			template.setKey(key);
+			template.setVersion(Integer.valueOf(1));
+			template.setOwner(USER_ADMIN_ID);
+			template.setLastModified(new Date());
+			this.emailTemplateService.saveTemplate(template);
+			log.debug("Added email template: '"+key+"'");
+		}
+		else
+		{
+			String oVersionString = existingTemplate.getVersion() != null ? existingTemplate.getVersion().toString():null;
+			if ((oVersionString == null && versionString != null) || (oVersionString != null && versionString != null && !oVersionString.equals(versionString)))
+			{
+				Integer version = (versionString != null && !versionString.equals("")) ? Integer.valueOf(versionString) : Integer.valueOf(0);
+				existingTemplate.setSubject(subject);
+				existingTemplate.setMessage(body);
+				existingTemplate.setLocale(locale);
+				existingTemplate.setKey(key);
+				existingTemplate.setVersion(version);
+				existingTemplate.setOwner(USER_ADMIN_ID);
+				existingTemplate.setLastModified(new Date());
+				this.emailTemplateService.updateTemplate(existingTemplate);
+				log.debug("Updated email template: '"+key+"' to version "+version);
+			}
+		}
+			
+	}
+
+	/**
+	 * Load a list of all the XML DOM elements that represent 'emailTemplate's.
+	 * 
+	 * @param file
+	 * 	The file to parse
+	 * @return
+	 * 	A list of nodes (NodeList) that represent all the email templates within the file
+	 * @throws SAXException
+	 * @throws IOException
+	 * @throws ParserConfigurationException
+	 * @throws InvalidEmailTemplateException
+	 * 	Thrown if the XML template is not a valid email template definition
+	 * 
+	 * TODO: Validate the XML email templates against a DTD to validate correctness
+	 */
+	private NodeList getEmailTemplates(String file) throws SAXException, IOException,
+			ParserConfigurationException, InvalidEmailTemplateException {
+		InputStream in = getClass().getClassLoader().getResourceAsStream(file);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document doc = db.parse(in);
+		
+		Element emailTemplates = doc.getDocumentElement();
+		if ("emailTemplates".equals(emailTemplates.getNodeName())) {
+			return emailTemplates.getElementsByTagName("emailTemplate");
+		} else {
+			throw new InvalidEmailTemplateException(null, file);
+		}
+	}
+	
+	/**
+	 * Convenience method to get the value of a particular tag within an XML element.
+	 * @param e
+	 * @param tagName
+	 * @return
+	 */
+	private String getTagValue(Element e, String tagName, String failover) {
+		String value = failover;
+		NodeList l = e.getElementsByTagName(tagName);
+		if (l != null && l.getLength() > 0) {
+			Element tag = (Element) l.item(0);
+			if (tag != null) {
+				Node n = tag.getFirstChild();
+				if (n != null) {
+					value = n.getNodeValue();
+				}		
+			}
+		}
+		return value;
+	}
 }
Index: impl/pom.xml
===================================================================
--- impl/pom.xml	(revision 1983)
+++ impl/pom.xml	(working copy)
@@ -35,6 +35,12 @@
             <artifactId>entitybroker-api</artifactId>
         </dependency>
         <dependency>
+        	<groupId>org.sakaiproject.emailtemplateservice</groupId>
+        	<artifactId>emailtemplateservice-api</artifactId>
+        	<version>${polls.ets.version}</version>
+        	<scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.sakaiproject</groupId>
             <artifactId>generic-dao</artifactId>
             <version>0.9.17</version>
Index: api/src/java/org/sakaiproject/poll/model/Option.java
===================================================================
--- api/src/java/org/sakaiproject/poll/model/Option.java	(revision 1983)
+++ api/src/java/org/sakaiproject/poll/model/Option.java	(working copy)
@@ -97,7 +97,7 @@
     }
     
     public Boolean getDeleted() {
-		return deleted;
+		return (deleted == null) ? Boolean.FALSE : deleted;
 	}
 
 	public void setDeleted(Boolean deleted) {
Index: api/src/java/org/sakaiproject/poll/logic/PollVoteManager.java
===================================================================
--- api/src/java/org/sakaiproject/poll/logic/PollVoteManager.java	(revision 1983)
+++ api/src/java/org/sakaiproject/poll/logic/PollVoteManager.java	(working copy)
@@ -93,5 +93,11 @@
      * @return
      */
     public boolean pollIsVotable(Poll poll);
+    
+    /**
+     * Delete the given vote
+     * @param vote The vote to delete
+     */
+    public void deleteVote(Vote vote);
 
 }
Index: api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java
===================================================================
--- api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java	(revision 1983)
+++ api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java	(working copy)
@@ -73,6 +73,14 @@
 	public String getCurrentuserReference();
 	
 	/**
+	 * Given a userId, return the associated userEid
+	 * @param userId The userId
+	 * @return
+	 * 	The userEid
+	 */
+	public String getUserEidFromId(String userId);
+	
+	/**
 	 * is the current user allowed to perform the action in the current location?
 	 * @param permission
 	 * @param locationReference
@@ -134,10 +142,10 @@
 	
 	/**
 	 * 
-	 * @param locationReference
+	 * @param siteId
 	 * @return
 	 */
-	public String getSiteTile(String locationReference);
+	public String getSiteTile(String siteId);
 	
 	/**
 	 * Get a site reference "/site/ABCD from its id (ABCD)
@@ -167,4 +175,16 @@
 	 */
 	public boolean userIsViewingAsRole();
 	
+	/**
+	 * Notify a list of users that an option they voted for in a poll has been deleted.
+	 * 
+	 * @param userEids
+	 * 	A List of user EID's that identify the users to be notified
+	 * @param pollQuestion
+	 * 	The text of the poll whose option was deleted
+	 * @param siteTitle
+	 * 	The title of the site that owns the option's poll
+	 */
+	public void notifyDeletedOption(List<String> userEids, String siteTitle, String pollQuestion);
+	
 }
Index: api/src/java/org/sakaiproject/poll/logic/PollListManager.java
===================================================================
--- api/src/java/org/sakaiproject/poll/logic/PollListManager.java	(revision 1983)
+++ api/src/java/org/sakaiproject/poll/logic/PollListManager.java	(working copy)
@@ -47,15 +47,29 @@
     public static final String PERMISSION_EDIT_OWN = "poll.editOwn";
 
     public static final String REF_POLL_TYPE ="poll";
+    
+    /**
+     * Delete an option from the database.
+     * 
+     * @param option - The option to delete
+     */
     public void deleteOption(Option option);
 
     /**
+     * Delete a poll option, either "hard" or "soft".
+     * 
+     * @param option - The option to delete
+     * @param soft - <b>true</b> if you want to "soft" delete (flag the 'deleted' field) or <b>false</b> to "hard" delete (remove from database) 
+     */
+    public void deleteOption(Option option, boolean soft);
+    
+    /**
      * Delete a poll
      * @param t - the poll object to remove
      * @return - true for success, false if failure
      */
     public boolean deletePoll(Poll t) throws SecurityException, IllegalArgumentException;
-
+    
     /**
      * Gets all the task objects for the site
      * @param siteId - the siteId of the site
@@ -87,15 +101,25 @@
      * @throws IllegalArgumentException if the pollId is invalid
      */
     public List<Option> getOptionsForPoll(Long pollId);
-
+    
     /**
+     * Get options for the given poll that are not flagged as deleted.
+     * @param pollId the id of the poll
+     * @return
+     * 	the options for the given poll that are not deleted OR empt if there are
+     * 	no "visible" options for this poll
+     * @throws IllegalArgumentException if the pollId is invalid
+     */
+    public List<Option> getVisibleOptionsForPoll(Long pollId);
+    
+    /**
      * Get all options for a specific poll
      * @param the poll
      * @return all options OR empty if there are no options for this poll
      * @throws IllegalArgumentException if the pollId is invalid
      */
     public List<Option> getOptionsForPoll(Poll poll);
-
+    
     /**
      *  get a poll by its Entity  Reference  
      */
Index: api/src/java/org/sakaiproject/poll/util/PollUtil.java
===================================================================
--- api/src/java/org/sakaiproject/poll/util/PollUtil.java	(revision 1983)
+++ api/src/java/org/sakaiproject/poll/util/PollUtil.java	(working copy)
@@ -46,6 +46,7 @@
         element.setAttribute("id", option.getUUId());
         element.setAttribute("optionid", option.getOptionId().toString());
         element.setAttribute("title", option.getOptionText());
+        element.setAttribute("deleted", option.getDeleted().toString());
         stack.pop();
 
         return element;
Index: tool/src/java/org/sakaiproject/poll/tool/params/PollToolBean.java
===================================================================
--- tool/src/java/org/sakaiproject/poll/tool/params/PollToolBean.java	(revision 1983)
+++ tool/src/java/org/sakaiproject/poll/tool/params/PollToolBean.java	(working copy)
@@ -23,11 +23,15 @@
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.sakaiproject.poll.logic.ExternalLogic;
 import org.sakaiproject.poll.logic.PollListManager;
 import org.sakaiproject.poll.logic.PollVoteManager;
 import org.sakaiproject.poll.model.Option;
@@ -38,6 +42,7 @@
 import org.sakaiproject.util.FormattedText;
 
 import uk.org.ponder.localeutil.LocaleGetter;
+import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;
 
@@ -47,6 +52,10 @@
 
 	private static final Log LOG = LogFactory.getLog(PollToolBean.class);
 	
+	public static final String
+		HANDLE_DELETE_OPTION_DO_NOTHING = "do-nothing",
+		HANDLE_DELETE_OPTION_RETURN_VOTES = "return-votes";
+	
 	//public Poll newPoll = new Poll();
 	public String siteID;
 
@@ -73,8 +82,10 @@
 	public Long[] deleteids;
 	public String submissionStatus;
 	private PollVoteManager pollVoteManager;
+	
+	//how to handle orphaned votes when deleting an option
+	private String handleOrphanVotes;
 
-
 	public Map perms = null;
 	public void setRoleperms(Map perms)
 	{
@@ -98,6 +109,11 @@
 		this.voteCollection = vc;
 	}
 
+	private ExternalLogic externalLogic;
+	public void setExternalLogic(ExternalLogic externalLogic) {
+		this.externalLogic = externalLogic;
+	}
+	
 	public void setOption (Option o) {
 		this.option = o;
 	}
@@ -117,6 +133,10 @@
 		this.messages = messages;
 	}
 
+	private MessageLocator messageLocator;
+	public void setMessageLocator(MessageLocator messageLocator) {
+		this.messageLocator = messageLocator;
+	}
 
 	public Poll processActionAdd() {
 		boolean isNew = true;
@@ -271,21 +291,77 @@
 		
 	}
 
+	@SuppressWarnings("unchecked")
 	public Poll proccessActionDeleteOption() {
 		LOG.info("about to delete option " + option.getId());
 		Long pollId = option.getPollId();
-		manager.deleteOption(option);
-
+		
+		List<Vote> votes = (List<Vote>) pollVoteManager.getAllVotesForOption(option);
+		
+		if (votes != null && votes.size() > 0) {
+			//if the option had votes, we need some special handling
+			
+			if (HANDLE_DELETE_OPTION_RETURN_VOTES.equals(getHandleOrphanVotes())) {
+				Set<String> userEids = new HashSet<String>();
+				
+				//hard-delete the option. It will no longer have any votes
+				manager.deleteOption(option);
+				
+				for (Vote vote : votes) {
+					String userId = vote.getUserId();
+					
+					if (userId != null) {
+						String userEid = externalLogic.getUserEidFromId(userId);
+						userEids.add(userEid);
+					}
+					
+					pollVoteManager.deleteVote(vote);
+				}
+				
+				//send the notification to affected users
+				sendOptionDeletedNotification(userEids.toArray(new String[0]));
+				
+			} else {
+				//soft delete the option. we still want it to show up in the results
+				
+				/*
+				 * The option in this bean is mapped by parameters
+				 * given to the form by the producer. This seems a bit
+				 * shakey. 'persistentOption' will be a fresh and full
+				 * copy of the option from the DB. This should be a safer
+				 * "save" operation. -bv
+				 */
+				Option persistentOption = manager.getOptionById(option.getOptionId());
+				manager.deleteOption(persistentOption, true);
+			}
+		} else {
+			//if the option didn't have any votes, just blow it away
+			manager.deleteOption(option);
+		}
+		
 		//we now need to update the poll object in memory
-		voteBean.setPoll(manager.getPollById(pollId));
+		Poll poll = manager.getPollById(pollId);
+		voteBean.setPoll(poll);
+		return poll;
+		
+	}
 
-		return manager.getPollById(pollId);
-
-	}
 	public String cancel() {
 		return "cancel";
 	}
+	
+	public void setHandleOrphanVotes(String handleOrphanVotes) {
+		this.handleOrphanVotes = handleOrphanVotes;
+	}
+  
+	public String getHandleOrphanVotes() {
+		return this.handleOrphanVotes;
+	}
 
+	private void sendOptionDeletedNotification(String[] userEids) {
+		Poll poll = manager.getPollById(option.getPollId());
+		String siteTitle = externalLogic.getSiteTile(poll.getSiteId());
+		externalLogic.notifyDeletedOption(Arrays.asList(userEids), siteTitle, poll.getPollText());
+	}
 
-
 }
Index: tool/src/java/org/sakaiproject/poll/tool/producers/AddPollProducer.java
===================================================================
--- tool/src/java/org/sakaiproject/poll/tool/producers/AddPollProducer.java	(revision 1983)
+++ tool/src/java/org/sakaiproject/poll/tool/producers/AddPollProducer.java	(working copy)
@@ -196,7 +196,7 @@
 			}
 
 
-			List<Option> options = poll.getPollOptions();
+			List<Option> options = pollListManager.getVisibleOptionsForPoll(poll.getPollId());
 			for (int i = 0; i < options.size(); i++){
 				Option o = (Option)options.get(i);
 				UIBranchContainer oRow = UIBranchContainer.make(actionBlock,"options-row:",o.getOptionId().toString());
Index: tool/src/java/org/sakaiproject/poll/tool/producers/ResultsProducer.java
===================================================================
--- tool/src/java/org/sakaiproject/poll/tool/producers/ResultsProducer.java	(revision 1983)
+++ tool/src/java/org/sakaiproject/poll/tool/producers/ResultsProducer.java	(working copy)
@@ -160,6 +160,7 @@
 			LOG.debug("collating option " + option.getOptionId());
 			collatedVote.setoptionId(option.getOptionId());
 			collatedVote.setOptionText(option.getOptionText());
+			collatedVote.setDeleted(option.getDeleted());
 			for (int q=0; q <votes.size(); q++ ) {
 				Vote vote = (Vote)votes.get(q);
 				if (vote.getPollOption().equals(option.getOptionId())){
@@ -189,7 +190,13 @@
 		for (int i=0; i <collation.size(); i++ ) {
 			CollatedVote cv = (CollatedVote)collation.get(i);
 			UIBranchContainer resultRow = UIBranchContainer.make(tofill,"answer-row:",cv.getoptionId().toString());
-			UIVerbatim.make(resultRow,"answer-option",cv.getOptionText());
+			
+			String optionText = cv.getOptionText();
+			if (cv.getDeleted()) {
+				optionText += messageLocator.getMessage("deleted_option_tag_html");
+			}
+
+			UIVerbatim.make(resultRow,"answer-option",optionText);
 			UIOutput.make(resultRow,"answer-count", Integer.valueOf(i+1).toString());
 			UIOutput.make(resultRow,"answer-numVotes",Long.valueOf(cv.getVotes()).toString());
 			LOG.debug("about to do the calc: (" + cv.getVotes()+"/"+ totalVotes +")*100");
@@ -239,7 +246,8 @@
 		private Long optionId ;
 		private String optionText;
 		private int votes;
-
+		private Boolean deleted;
+		
 		public CollatedVote() {
 			this.votes=0;
 		}
@@ -267,6 +275,12 @@
 		public void incrementVotes(){
 			this.votes++;
 		}
+		public void setDeleted(Boolean deleted) {
+			this.deleted = deleted;
+		}
+		public Boolean getDeleted() {
+			return deleted;
+		}
 
 	}
 }
Index: tool/src/java/org/sakaiproject/poll/tool/producers/PollOptionDeleteProducer.java
===================================================================
--- tool/src/java/org/sakaiproject/poll/tool/producers/PollOptionDeleteProducer.java	(revision 1983)
+++ tool/src/java/org/sakaiproject/poll/tool/producers/PollOptionDeleteProducer.java	(working copy)
@@ -21,21 +21,29 @@
 
 package org.sakaiproject.poll.tool.producers;
 
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.sakaiproject.poll.logic.PollListManager;
+import org.sakaiproject.poll.logic.PollVoteManager;
 import org.sakaiproject.poll.model.Option;
 import org.sakaiproject.poll.model.Poll;
 import org.sakaiproject.poll.tool.params.OptionViewParameters;
+import org.sakaiproject.poll.tool.params.PollToolBean;
 import org.sakaiproject.poll.tool.params.PollViewParameters;
 
 import uk.org.ponder.messageutil.MessageLocator;
+import uk.org.ponder.rsf.components.UIBranchContainer;
 import uk.org.ponder.rsf.components.UICommand;
 import uk.org.ponder.rsf.components.UIContainer;
 import uk.org.ponder.rsf.components.UIELBinding;
 import uk.org.ponder.rsf.components.UIForm;
 import uk.org.ponder.rsf.components.UIInput;
+import uk.org.ponder.rsf.components.UIMessage;
 import uk.org.ponder.rsf.components.UIOutput;
+import uk.org.ponder.rsf.components.UISelect;
+import uk.org.ponder.rsf.components.UISelectChoice;
 import uk.org.ponder.rsf.components.UIVerbatim;
 import uk.org.ponder.rsf.flow.ARIResult;
 import uk.org.ponder.rsf.flow.ActionResultInterceptor;
@@ -46,25 +54,16 @@
 
 
 public class PollOptionDeleteProducer implements ViewComponentProducer, ActionResultInterceptor,ViewParamsReporter {
-//,
 	public static final String VIEW_ID = "pollOptionDelete";
 	private static final Log LOG = LogFactory.getLog(PollOptionDeleteProducer.class);
 	
-	
-	
 	private MessageLocator messageLocator;
 	
-	
-	
-	
-	
 	public String getViewID() {
 		
 		return VIEW_ID;
 	}
 	
-
-		
 	  public void setMessageLocator(MessageLocator messageLocator) {
 			  
 		  this.messageLocator = messageLocator;
@@ -75,12 +74,17 @@
 		  this.pollListManager = p;
 	  }
 	  
+	  private PollVoteManager pollVoteManager;
+	  public void setPollVoteManager(PollVoteManager pollVoteManager) {
+		  this.pollVoteManager = pollVoteManager;
+	  }
+	  
+	@SuppressWarnings("unchecked")
 	public void fillComponents(UIContainer tofill, ViewParameters viewparams,
 			ComponentChecker arg2) {
 		LOG.debug("rendering view");
 		
 		UIOutput.make(tofill,"confirm_delete",messageLocator.getMessage("delete_confirm"));
-		UIOutput.make(tofill,"error",messageLocator.getMessage("delete_option_message"));
 		
 		Option option = null;
 		OptionViewParameters aivp = (OptionViewParameters) viewparams;
@@ -95,10 +99,57 @@
 			return;
 		}
 		
-		UIVerbatim.make(tofill,"poll_text",option.getOptionText());
+		UIMessage.make(tofill, "error", "delete_option_message",
+				new Object[] { option.getOptionText() }
+			);
+		
 		UIForm form = UIForm.make(tofill,"opt-form");
 		UIInput.make(form,"opt-text","#{option.optionText}",option.getOptionText());
+
+		Poll poll = pollListManager.getPollById(option.getPollId());
+		Boolean showVoteHandlingOptions = Boolean.FALSE;
+
+		if (pollVoteManager.pollIsVotable(poll)) {
+			//if the poll is votable, show the vote handling options since 
+			//voting is not locked.
+			
+			showVoteHandlingOptions = Boolean.TRUE;
+		} else {
+			List votes = pollVoteManager.getAllVotesForOption(option);
 		
+			//if the poll is not votable, but contains votes, we need to 
+			//ask the user how to handle them.
+			if (votes != null && votes.size() > 0) {
+				showVoteHandlingOptions = Boolean.TRUE;
+			}
+		}
+		
+		if (showVoteHandlingOptions) {		
+			UIBranchContainer hasVotesContainer = UIBranchContainer.make(form, "has-votes:");
+			UIMessage.make(hasVotesContainer, "has-votes-text", "delete_option_has_votes");
+			
+			UISelect handleVotesSelect = UISelect.make(
+					hasVotesContainer,
+					"handle-votes",
+					new String[] {
+							PollToolBean.HANDLE_DELETE_OPTION_DO_NOTHING,
+							PollToolBean.HANDLE_DELETE_OPTION_RETURN_VOTES
+						},
+					"#{pollToolBean.handleOrphanVotes}",
+					PollToolBean.HANDLE_DELETE_OPTION_RETURN_VOTES
+				);
+			
+			UISelectChoice.make(hasVotesContainer, "do-nothing",
+					handleVotesSelect.getFullID(), 0);
+			
+			UISelectChoice.make(hasVotesContainer, "return-votes",
+					handleVotesSelect.getFullID(), 1);
+			
+			UIMessage.make(hasVotesContainer, "do-nothing-label", "handle_delete_option_do_nothing_label");
+			UIMessage.make(hasVotesContainer, "return-votes-label", "handle_delete_option_return_votes_label");
+		}
+		
+		//populate the relevant polls information in the form parameters
 		form.parameters.add(new UIELBinding("#{option.optionId}",
 		           option.getOptionId()));
 		form.parameters.add(new UIELBinding("#{option.id}",
Index: tool/src/java/org/sakaiproject/poll/tool/producers/PollToolProducer.java
===================================================================
--- tool/src/java/org/sakaiproject/poll/tool/producers/PollToolProducer.java	(revision 1983)
+++ tool/src/java/org/sakaiproject/poll/tool/producers/PollToolProducer.java	(working copy)
@@ -213,7 +213,7 @@
 		
 		for (int i = 0 ; i < polls.size(); i++) {
 			Poll poll = (Poll)polls.get(i);
-			boolean canVote = pollIsVotable(poll);
+			boolean canVote = pollVoteManager.pollIsVotable(poll);
 			UIBranchContainer pollrow = UIBranchContainer.make(deleteForm,
 					canVote ? "poll-row:votable"
 							: "poll-row:nonvotable", poll.getPollId().toString());
@@ -310,54 +310,6 @@
 		return togo;
 	}
 
-	private boolean pollIsVotable(Poll poll)
-	{
-		//poll must have options to be votable
-
-		poll.setOptions(pollListManager.getOptionsForPoll(poll));
-		if (poll.getPollOptions()== null || poll.getPollOptions().size() == 0) {
-			LOG.debug("poll has no options");
-			return false;
-		}
-
-		boolean pollAfterOpen = true;
-		boolean pollBeforeClose = true;
-
-		if (poll.getVoteClose()!=null) {
-			if (poll.getVoteClose().before(new Date())) {
-				LOG.debug("Poll is closed for voting");
-				pollBeforeClose=false;
-			}
-
-		} 
-
-		if (poll.getVoteOpen()!=null) {
-			if(new Date().before(poll.getVoteOpen())) {
-				LOG.debug("Poll is not open yet");
-				pollAfterOpen=false;
-			}
-		} 
-
-		if (pollAfterOpen && pollBeforeClose)
-		{
-			if (poll.getLimitVoting() && pollVoteManager.userHasVoted(poll.getPollId())) {
-				return false;
-			}
-			//the user hasn't voted do they have permission to vote?'
-			LOG.debug("about to check if this user can vote in " + externalLogic.getCurrentLocationReference());
-			if (externalLogic.isAllowedInLocation(PollListManager.PERMISSION_VOTE, externalLogic.getCurrentLocationReference())
-					|| externalLogic.isUserAdmin())
-			{
-				LOG.debug("this poll is votable  " + poll.getText());
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-
 	private boolean pollCanEdit(Poll poll) {
 		if (externalLogic.isUserAdmin())
 			return true;
Index: tool/src/java/org/sakaiproject/poll/tool/producers/PollVoteProducer.java
===================================================================
--- tool/src/java/org/sakaiproject/poll/tool/producers/PollVoteProducer.java	(revision 1983)
+++ tool/src/java/org/sakaiproject/poll/tool/producers/PollVoteProducer.java	(working copy)
@@ -142,7 +142,8 @@
 
 		UIForm voteForm = UIForm.make(tofill,"options-form",""); 
 
-		List<Option> pollOptions = poll.getPollOptions();
+		List<Option> pollOptions = pollListManager.getVisibleOptionsForPoll(poll.getPollId());
+		
 		//build the options + label lists
 		String[] values= new String[pollOptions.size()];
 		for (int i = 0;i <pollOptions.size(); i++ ) {
Index: tool/src/bundle/org/sakaiproject/poll/bundle/Messages.properties
===================================================================
--- tool/src/bundle/org/sakaiproject/poll/bundle/Messages.properties	(revision 1983)
+++ tool/src/bundle/org/sakaiproject/poll/bundle/Messages.properties	(working copy)
@@ -53,9 +53,16 @@
 edit_option_title=Edit an Option
 
 delete_option_confirm=Remove
-delete_option_message=Are you sure you want to remove this Option?
+delete_option_message=Are you sure you want to remove the option ''{0}''?
+delete_option_has_votes=If there are already votes for this option, how would you like to handle them?
 delete_confirm=Delete confirmation
- 
+
+handle_delete_option_do_nothing_label=Include deleted votes in the poll summary
+handle_delete_option_return_votes_label=Notify those who voted for this option and allow them to vote again
+deleted_option_tag_html=&nbsp;<i>(deleted)</i>
+delete_option_email_subject=[{0}] A poll option you voted for has been deleted
+delete_option_email_body=The poll option you voted for in the site ''{1}'' has been deleted by a poll maintainer. The poll question is:<br /><br />{2}<br /><br />Please log in and place a new vote for the poll.
+
 vote_hasvoted=You have already voted!
 vote_cancel=Cancel
 vote_closed=This poll is closed for voting!
Index: tool/src/webapp/WEB-INF/requestContext.xml
===================================================================
--- tool/src/webapp/WEB-INF/requestContext.xml	(revision 1983)
+++ tool/src/webapp/WEB-INF/requestContext.xml	(working copy)
@@ -25,6 +25,8 @@
 		<property name="poll" ref="poll" />
 		<property name="localeGetter" ref="requestLocaleProxy" />
 		<property name="messages" ref="targettedMessageList" />
+		<property name="messageLocator" ref="messageLocator" />
+		<property name="externalLogic" ref="org.sakaiproject.poll.logic.ExternalLogic"/>
 	</bean>
 
 
@@ -87,6 +89,8 @@
 		<property name="messageLocator" ref="messageLocator" />
 		<property name="pollListManager"
 			ref="org.sakaiproject.tool.poll.api.PollListManager" />
+		<property name="pollVoteManager"
+			ref="org.sakaiproject.tool.poll.api.PollVoteManager" />
 	</bean>
 
 	<bean id="addPollProducer"
Index: tool/src/webapp/templates/pollOptionDelete.html
===================================================================
--- tool/src/webapp/templates/pollOptionDelete.html	(revision 1983)
+++ tool/src/webapp/templates/pollOptionDelete.html	(working copy)
@@ -8,22 +8,35 @@
 </head>
 
 <body rsf:id="scr=sakai-body">
-<div class="portletBody">
-<p>
-<strong rsf:id="confirm_delete">Delete confirmation</strong></p>
-<div>
-  <div class="alertMessage" rsf:id="error">We Have Errors!</div>
-</div>
-
-<p><span rsf:id="poll_text">poll_text</span></p>
-
-<form rsf:id="opt-form">
-<span rsf:id="option"></span>
-<p class="act">
-<input type="submit" value="Post" rsf:id="submit-option-add" class="active"/>
-<input name="_cancel" type="submit" value="Cancel" rsf:id="cancel" />
-</p>
-</form>
-</div>
+	<div class="portletBody">
+		<p>
+			<strong rsf:id="confirm_delete">Delete confirmation</strong>
+		</p>
+		<div>
+			<div class="alertMessage" rsf:id="error">We Have Errors!</div>
+		</div>
+		
+		<p><span rsf:id="poll_text">poll_text</span></p>
+		
+		<form rsf:id="opt-form">
+			<span rsf:id="option"></span>
+			
+			<div rsf:id="has-votes:">
+				<p rsf:id="has-votes-text" class="instructions">
+					The current option has already been voted for 7 time(s). How would you like to handle these votes?
+				</p>
+				
+				<span rsf:id="handle-votes"></span>
+				<input rsf:id="do-nothing" type="radio" name="handle_votes" checked="checked" /> <span rsf:id="do-nothing-label">Do nothing</span><br />
+				<input rsf:id="return-votes" type="radio" name="handle_votes" /> <span rsf:id="return-votes-label">Notify the users and allow them to re-vote</span>				
+				
+			</div>
+			
+			<p class="act">
+				<input type="submit" value="Post" rsf:id="submit-option-add" class="active"/>
+				<input name="_cancel" type="submit" value="Cancel" rsf:id="cancel" />
+			</p>
+		</form>
+	</div>
 </body>
 </html>
Index: pack/src/webapp/WEB-INF/components.xml
===================================================================
--- pack/src/webapp/WEB-INF/components.xml	(revision 1983)
+++ pack/src/webapp/WEB-INF/components.xml	(working copy)
@@ -31,9 +31,12 @@
 		<property name="pollListManager" ref="org.sakaiproject.tool.poll.api.PollListManager"/>
 	</bean>
 
-	<bean id="org.sakaiproject.poll.logic.ExternalLogic" class="org.sakaiproject.poll.logic.impl.ExternalLogicImpl">
+	<bean id="org.sakaiproject.poll.logic.ExternalLogic" class="org.sakaiproject.poll.logic.impl.ExternalLogicImpl"
+			init-method="init">
 		<property name="developerHelperService" ref="org.sakaiproject.entitybroker.DeveloperHelperService"/>
 		<property name="authzGroupService" ref="org.sakaiproject.authz.api.AuthzGroupService"/>
+		<property name="emailService" ref="org.sakaiproject.email.api.EmailService" />
+		<property name="emailTemplateService" ref="org.sakaiproject.emailtemplateservice.service.EmailTemplateService" />
 		<property name="entityManager" ref="org.sakaiproject.entity.api.EntityManager"/>
 		<property name="eventTrackingService"
 			ref="org.sakaiproject.event.api.EventTrackingService" />
@@ -43,7 +46,9 @@
 			ref="org.sakaiproject.time.api.TimeService" />
 		<property name="siteService" ref="org.sakaiproject.site.api.SiteService"/>
 		<property name="securityService" ref="org.sakaiproject.authz.api.SecurityService" />
-		
+		<property name="serverConfigurationService" ref="org.sakaiproject.component.api.ServerConfigurationService" />
+		<property name="sessionManager" ref="org.sakaiproject.tool.api.SessionManager" />
+		<property name="userDirectoryService" ref="org.sakaiproject.user.api.UserDirectoryService"/>
 	</bean>
 
 </beans>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1983)
+++ pom.xml	(working copy)
@@ -34,6 +34,7 @@
     
     <properties>
         <url.localsite>scp://source.sakaiproject.org/var/www/html/release/polls/${project.version}</url.localsite>
+        <polls.ets.version>0.4.2</polls.ets.version>
     </properties>
 
     <scm>