Index: lams_build/lib/jakarta-commons/validator.module.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35c310fa1c049061df6f0c0f43523015ae75b4a0
--- lams_build/lib/jakarta-commons/validator.module.xml	(.../validator.module.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/lib/jakarta-commons/validator.module.xml	(.../validator.module.xml)	(revision 35c310fa1c049061df6f0c0f43523015ae75b4a0)
@@ -20,7 +20,6 @@
 		<resource-root path="commons-validator-1.6.jar" />
 	</resources>
 	<dependencies>
-		<module name="org.apache.oro" />
 		<module name="org.apache.commons.logging" />
 		<module name="org.apache.commons.collections" />
 		<module name="org.apache.commons.digester" />
Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r35c310fa1c049061df6f0c0f43523015ae75b4a0
--- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java	(.../EmailUserController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java	(.../EmailUserController.java)	(revision 35c310fa1c049061df6f0c0f43523015ae75b4a0)
@@ -26,7 +26,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -61,7 +61,7 @@
 public class EmailUserController {
     private static Logger log = Logger.getLogger(EmailUserController.class);
     private static final EmailValidator emailValidator = EmailValidator.getInstance();
-    
+
     @Autowired
     private IUserManagementService userManagementService;
     @Autowired
Index: lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35c310fa1c049061df6f0c0f43523015ae75b4a0
--- lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java	(.../DeliveryMethodMail.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java	(.../DeliveryMethodMail.java)	(revision 35c310fa1c049061df6f0c0f43523015ae75b4a0)
@@ -7,7 +7,7 @@
 import javax.mail.internet.AddressException;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -45,8 +45,10 @@
 	    throws InvalidParameterException {
 	return send(fromUserId, toUserId, subject, message, isHtmlFormat, null);
     }
-    protected String send(Integer fromUserId, Integer toUserId, String subject, String message, boolean isHtmlFormat, String attachmentFilename)
-	    throws InvalidParameterException {
+
+    @Override
+    protected String send(Integer fromUserId, Integer toUserId, String subject, String message, boolean isHtmlFormat,
+	    String attachmentFilename) throws InvalidParameterException {
 	try {
 	    User toUser = (User) DeliveryMethodMail.userManagementService.findById(User.class, toUserId);
 	    if (toUser == null) {