From de1cc156c960506cee6335b5db59419afe3f1e4b Mon Sep 17 00:00:00 2001
From: Ron Panduwana <panduwana@gmail.com>
Date: Mon, 10 Aug 2015 00:51:55 +0700
Subject: [PATCH] OC-2795 When using email action to xxxx.xxxx@xxxx-xxxx.com ,
 Rule designer produces an error

bugfix, email validator

Add new dependency commons-validator-1.4.1, and use their EmailValidator

Add repository maven-central from http://repo1.maven.org/maven2/, there was problem with packages downloaded by maven failing checksum

Add dependency jackson-core-asl, there was problem with rendering json http response

Add dependency apache.tiles, apache.httpcore, and ow2.asm, there was missing definition when building the package
---
 pom.xml                                       | 46 ++++++++++++++++++-
 .../web/controller/RulesCommandValidator.java |  9 ++--
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 40c9f1b..90f3c21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,10 @@
                 <enabled>false</enabled>
             </snapshots>     
         </repository>
+        <repository>
+            <id>maven-central</id>
+            <url>http://repo1.maven.org/maven2</url>
+        </repository>
         <repository>
             <id>Akaza Dev Repository</id>
             <url>http://svn.akazaresearch.com/ocrepository/repository</url>
@@ -330,6 +334,21 @@
             <artifactId>tiles-jsp</artifactId>
             <version>2.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-api</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-servlet</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-template</artifactId>
+            <version>2.2.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -493,6 +512,11 @@
             <scope>compile</scope>
         </dependency>
         <!-- Jackson JSON Mapper -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>1.5.3</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
@@ -515,21 +539,41 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.4.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth</artifactId>
             <version>1.0.0.M2</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.2</version>
+        </dependency>
         <dependency>
         	<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
 			<version>1.8.0</version> 
         </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+            <version>1.8.3</version>
+        </dependency>
     </dependencies>
 	<build>
 		<plugins>
diff --git a/src/main/java/org/akaza/openclinica/designer/web/controller/RulesCommandValidator.java b/src/main/java/org/akaza/openclinica/designer/web/controller/RulesCommandValidator.java
index dd981af..562e3d1 100644
--- a/src/main/java/org/akaza/openclinica/designer/web/controller/RulesCommandValidator.java
+++ b/src/main/java/org/akaza/openclinica/designer/web/controller/RulesCommandValidator.java
@@ -1,5 +1,6 @@
 package org.akaza.openclinica.designer.web.controller;
 
+import org.apache.commons.validator.routines.EmailValidator;
 import org.openclinica.ns.rules.v31.DiscrepancyNoteActionType;
 import org.openclinica.ns.rules.v31.EmailActionType;
 import org.openclinica.ns.rules.v31.HideActionType;
@@ -82,17 +83,15 @@ private void validateEmailAction(LazyRuleRefType2 action, Errors e) {
                 if (emailAction.getTo() == null || emailAction.getTo().trim().length() == 0) {
                     e.rejectValue("ruleRef.lazyEmailActions[" + action.getEmailAction().indexOf(emailAction) + "].to", "email.to.empty");
                 } else {
-                    Pattern pattern = Pattern.compile("^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$");
+                	EmailValidator validator = EmailValidator.getInstance();
                     StringTokenizer tokenizer = new StringTokenizer(emailAction.getTo(), ",");
                     if (tokenizer.countTokens() == 0) {
-                        Matcher matcher = pattern.matcher(emailAction.getTo());
-                        if (!matcher.matches()) {
+                        if (!validator.isValid(emailAction.getTo())) {
                             e.rejectValue("ruleRef.lazyEmailActions[" + action.getEmailAction().indexOf(emailAction) + "].to", "email.to.not.valid");
                         }
                     } else {
                         while (tokenizer.hasMoreTokens()) {
-                            Matcher matcher = pattern.matcher(tokenizer.nextToken().trim());
-                            if (!matcher.matches()) {
+                            if (!validator.isValid(tokenizer.nextToken().trim())) {
                                 e.rejectValue("ruleRef.lazyEmailActions[" + action.getEmailAction().indexOf(emailAction) + "].to", "email.to.not.valid");
                                 break;
                             }