Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/InsertContextWebXmlTask.java
===================================================================
diff -u
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/InsertContextWebXmlTask.java	(revision 0)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/InsertContextWebXmlTask.java	(revision 32ec0bf25ea45f80d4d3012e0cd4b3088434aaa6)
@@ -0,0 +1,77 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.deploy;
+
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
+/**
+ * Add a  tool's application context file to the web.xml of various core modules.
+ * 
+ * @author Fiona Malikoff
+ */
+public class InsertContextWebXmlTask extends UpdateWebXmlTask
+{
+    
+    /** Creates a new instance of InsertContextWebXmlTask */
+    public InsertContextWebXmlTask(final String applicationContextPath, final String lamsEarPath, final String centralWebXmlPath,
+    		final String learningWebXmlPath, final String  monitoringWebXmlPath) {
+    	super(applicationContextPath, lamsEarPath, centralWebXmlPath, learningWebXmlPath, monitoringWebXmlPath );
+    }
+
+	/**
+	 * Update the param-value node of the context-param entry. Don't add it if it already exists. 
+	 * @param doc
+	 * @param children
+	 * @param childNode
+	 */
+	protected void updateValue(Document doc, Node contextParamElement) {
+		NodeList valueChildren = contextParamElement.getChildNodes();
+		boolean foundEntry = false;
+		for ( int i=0; i<valueChildren.getLength() && ! foundEntry ; i++ ) {
+			Node valueChild = valueChildren.item(i);
+			if ( valueChild instanceof Text) {
+				String value = valueChild.getNodeValue();  
+				int index = value.indexOf(applicationContextPath);
+				if ( index >= 0 ) {
+					System.out.println("Application context entry "+getApplicationContextPathWithClasspath()
+							+" already in document.");
+					foundEntry = true;
+				}
+			}
+		}
+
+		if ( ! foundEntry  ) {
+			System.out.println("Adding "+getApplicationContextPathWithClasspath()+" to context");
+			contextParamElement.appendChild(doc.createTextNode(" "+getApplicationContextPathWithClasspath()+"\n"));
+		}
+	}
+
+ 
+    
+}
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveContextWebXmlTask.java
===================================================================
diff -u
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveContextWebXmlTask.java	(revision 0)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveContextWebXmlTask.java	(revision 32ec0bf25ea45f80d4d3012e0cd4b3088434aaa6)
@@ -0,0 +1,78 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.deploy;
+
+
+import org.apache.commons.lang.StringUtils;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
+/**
+ * Remove a tool's application context file from the web.xml of various core modules.
+ * 
+ * @author Fiona Malikoff
+ */
+public class RemoveContextWebXmlTask extends UpdateWebXmlTask
+{
+    
+    /** Creates a new instance of InsertContextWebXmlTask */
+    public RemoveContextWebXmlTask(final String applicationContextPath, final String lamsEarPath, final String centralWebXmlPath,
+    		final String learningWebXmlPath, final String  monitoringWebXmlPath) {
+    	super(applicationContextPath, lamsEarPath, centralWebXmlPath, learningWebXmlPath, monitoringWebXmlPath );
+    }
+
+ 
+	/**
+ 	 * Remove the tool's applicationContext entry from the param-value node of the context-param entry.
+	 * Should find and remove all the matching entries (should it somehow have have got in there m  
+	 * @param doc
+	 * @param children
+	 * @param childNode
+	 */
+	protected void updateValue(Document doc, Node contextParamElement) {
+		
+		NodeList valueChildren = contextParamElement.getChildNodes();
+		for ( int i=0; i<valueChildren.getLength(); i++ ) {
+			Node valueChild = valueChildren.item(i);
+			if ( valueChild instanceof Text) {
+				String value = valueChild.getNodeValue();
+				String newValue = StringUtils.replace(value,getApplicationContextPathWithClasspath(),"");
+				if ( newValue.length() < value.length() ) {
+					valueChild.setTextContent(newValue);
+					System.out.println("Removed context entry "+getApplicationContextPathWithClasspath()
+							+" from document.");
+				}
+			}
+		}
+
+
+	}
+ 
+    
+}
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateWebXmlTask.java
===================================================================
diff -u -r2107bdefa191451610183c848195bd2c6df77897 -r32ec0bf25ea45f80d4d3012e0cd4b3088434aaa6
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateWebXmlTask.java	(.../UpdateWebXmlTask.java)	(revision 2107bdefa191451610183c848195bd2c6df77897)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateWebXmlTask.java	(.../UpdateWebXmlTask.java)	(revision 32ec0bf25ea45f80d4d3012e0cd4b3088434aaa6)
@@ -48,7 +48,7 @@
  * Base class of ant tasks that change a webxml
  * @author Fiona Malikoff
  */
-public class UpdateWebXmlTask implements Task
+public abstract class UpdateWebXmlTask implements Task
 {
     
     /**
@@ -120,13 +120,9 @@
     	}
     }
     
-    /**
-     * Add the web uri and context root elements ot the Application xml
-     */
     protected void updateWebXml(Document doc, String documentPath) throws DeployException
     {
         
-        //find & remove web uri element
         NodeList contextParamNodeList = doc.getElementsByTagName("context-param");
         Element matchingContextParamElement = findContextParamWithMatchingParamName("contextConfigLocation", contextParamNodeList);
         if ( matchingContextParamElement == null ) {
@@ -146,30 +142,7 @@
     }
 
 
-	/**
-	 * Update the param-value node of the context-param entry. 
-	 * @param doc
-	 * @param children
-	 * @param childNode
-	 */
-	private void updateValue(Document doc, Node contextParamElement) {
-		NodeList valueChildren = contextParamElement.getChildNodes();
-		String currentValue = "";
-		for ( int vc=0; vc<valueChildren.getLength() ; vc++ ){
-			Node valueChild = valueChildren.item(vc);
-			if ( valueChild instanceof Text ) {
-				currentValue += valueChild.getNodeValue();
-			}
-			contextParamElement.removeChild(valueChildren.item(vc));
-		}
-		int index = currentValue.indexOf(applicationContextPath);
-		System.out.println("Current value "+currentValue+"\n(index="+index+")");
-		if ( index < 0  ) {
-			System.out.println("Adding "+applicationContextPath+" to context");
-			currentValue += "  classpath:"+applicationContextPath+"\n";
-		}
-		contextParamElement.appendChild(doc.createTextNode(currentValue));
-	}
+    protected abstract void updateValue(Document doc, Node contextParamElement) throws DeployException;
 
     /**
      * Writes the modified web.xml back out to the file system.
@@ -278,7 +251,7 @@
     }
 
     /**
-     * The value of the tool application context file, including the path
+     * Returns the value of the tool application context file, including the path
      * e.g. /org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
      * It should not include the "classpath:" prefix as this will be added
      * automatically.
@@ -288,6 +261,14 @@
 	}
 
     /**
+     * Returns the value of the tool application context file with the "classpath:" prepended.
+     * e.g. "classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml"
+     */
+	public String getApplicationContextPathWithClasspath() {
+		return  "classpath:"+applicationContextPath;
+	}
+
+	/**
      * The value of the tool application context file, including the path
      * e.g. /org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
      * It should not include the "classpath:" prefix as this will be added
Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/TestUpdateWebXmlTask.java
===================================================================
diff -u -r9d1cffa6c775eba739e85a3e2f7cdc83c89a23be -r32ec0bf25ea45f80d4d3012e0cd4b3088434aaa6
--- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/TestUpdateWebXmlTask.java	(.../TestUpdateWebXmlTask.java)	(revision 9d1cffa6c775eba739e85a3e2f7cdc83c89a23be)
+++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/TestUpdateWebXmlTask.java	(.../TestUpdateWebXmlTask.java)	(revision 32ec0bf25ea45f80d4d3012e0cd4b3088434aaa6)
@@ -42,10 +42,40 @@
 	        super.tearDown();
 	    }
 
-    public void testExecute() throws Exception
+    public void testInsertExecute() throws Exception
     {
-    	UpdateWebXmlTask task = new UpdateWebXmlTask("/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml",null,"test/file/web.xml",null,null);
+    	InsertContextWebXmlTask task = new InsertContextWebXmlTask("/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml",null,"test/file/web.xml",null,null);
         task.execute();
     }
 
-}
+    public void testInsertEntryAlreadyExistsExecute() throws Exception
+    {
+    	InsertContextWebXmlTask task = new InsertContextWebXmlTask("/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml",null,"test/file/web1EntryInsert.xml",null,null);
+        task.execute();
+    }
+
+    public void testRemoveExecuteNoEntry() throws Exception
+    {
+    	// tests removing it from the end of the list of contexts
+    	RemoveContextWebXmlTask task = new RemoveContextWebXmlTask("/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml",
+    			null,"test/file/webNoEntry.xml",null,null);
+        task.execute();
+    } 
+
+    public void testRemoveExecuteEnd() throws Exception
+    {
+    	// tests removing it from the end of the list of contexts
+    	RemoveContextWebXmlTask task = new RemoveContextWebXmlTask("/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml",
+    			null,"test/file/web1Entry.xml",null,null);
+        task.execute();
+    } 
+
+    public void testRemoveExecuteBeginMidEnd() throws Exception
+    {
+    	// tests removing it from the beginning and middle of the list of contexts
+    	RemoveContextWebXmlTask task = new RemoveContextWebXmlTask("/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml",
+    			null,"test/file/web3Entry.xml",null,null);
+        task.execute();
+    } 
+
+}
\ No newline at end of file