From 0ed29a339fa5f0d9a13004bf4c496c7019691b48 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Fri, 20 Sep 2013 07:02:32 +1000
Subject: [PATCH] Rename and refactor implementation

---
 .../zanata/service/TranslationService.java    |  11 +-
 .../service/impl/TranslationServiceImpl.java  | 139 +++----
 .../events/WorkspaceContextUpdateEvent.java   |   8 +-
 .../presenter/ValidationOptionsPresenter.java |   2 +-
 .../server/rpc/UpdateTransUnitHandler.java    |   2 +-
 .../validation/AbstractValidationAction.java  |   2 +-
 .../shared/validation/ValidationFactory.java  |  31 +-
 .../WEB-INF/classes/META-INF/components.xml   |   4 -
 .../WEB-INF/layout/project_edit_form.xhtml    | 391 +++++++++---------
 .../layout/validation_options_legend.xhtml    |  33 +-
 .../impl/TranslationServiceImplTest.java      |   8 +-
 .../TransMemoryMergePresenterTest.java        |  13 +-
 .../TransUnitsTablePresenterTest.java         |  10 +-
 .../rpc/DummyActivateWorkspaceCommand.java    |   6 +-
 .../client/service/ValidationServiceTest.java |   6 +-
 .../rpc/ActivateWorkspaceHandlerTest.java     |   6 +-
 .../validation/HtmlXmlTagValidationTests.java |   1 -
 17 files changed, 324 insertions(+), 349 deletions(-)

diff --git a/zanata-war/src/main/java/org/zanata/service/TranslationService.java b/zanata-war/src/main/java/org/zanata/service/TranslationService.java
index 96fb70410e..b7ea132358 100644
--- a/zanata-war/src/main/java/org/zanata/service/TranslationService.java
+++ b/zanata-war/src/main/java/org/zanata/service/TranslationService.java
@@ -44,11 +44,18 @@ public interface TranslationService
     * 
     * @param localeId
     * @param translationRequests
-    * @param runValidationCheck - Should be true by default
     * @return information about each translation change
     */
-   List<TranslationResult> translate(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests, boolean skipValidationCheck);
+   List<TranslationResult> translate(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests);
 
+   /**
+    * Updates multiple text flows within a project-iteration without running validation check.
+    *
+    * @param localeId
+    * @param translationRequests
+    * @return information about each translation change
+    */
+   List<TranslationResult> translateWithoutValidating(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests);
 
    /**
     * Attempts to revert a list of updates by adding a new translation that is
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
index cb3ac3a093..c9d358ddaa 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -20,70 +20,36 @@
  */
 package org.zanata.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.persistence.EntityManager;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang.StringUtils;
-import org.hibernate.HibernateException;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.TransactionPropagationType;
-import org.jboss.seam.annotations.Transactional;
-import org.jboss.seam.core.Events;
-import org.jboss.seam.security.management.JpaIdentityStore;
-import org.jboss.seam.util.Work;
-import org.zanata.async.AsyncTaskHandle;
-import org.zanata.async.AsyncUtils;
-import org.zanata.common.ContentState;
-import org.zanata.common.LocaleId;
-import org.zanata.common.MergeType;
-import org.zanata.common.util.ContentStateUtil;
-import org.zanata.dao.DocumentDAO;
-import org.zanata.dao.PersonDAO;
-import org.zanata.dao.ProjectIterationDAO;
-import org.zanata.dao.TextFlowDAO;
-import org.zanata.dao.TextFlowTargetDAO;
-import org.zanata.events.DocumentUploadedEvent;
-import org.zanata.events.TextFlowTargetStateEvent;
-import org.zanata.exception.ZanataServiceException;
-import org.zanata.lock.Lock;
-import org.zanata.model.HAccount;
-import org.zanata.model.HDocument;
-import org.zanata.model.HLocale;
-import org.zanata.model.HPerson;
-import org.zanata.model.HProjectIteration;
-import org.zanata.model.HSimpleComment;
-import org.zanata.model.HTextFlow;
-import org.zanata.model.HTextFlowTarget;
-import org.zanata.model.HTextFlowTargetHistory;
-import org.zanata.rest.dto.resource.TextFlowTarget;
-import org.zanata.rest.dto.resource.TranslationsResource;
-import org.zanata.rest.service.ResourceUtils;
-import org.zanata.security.ZanataIdentity;
-import org.zanata.service.LocaleService;
-import org.zanata.service.LockManagerService;
-import org.zanata.service.TranslationMergeService;
-import org.zanata.service.TranslationService;
-import org.zanata.service.ValidationService;
-import org.zanata.webtrans.shared.model.TransUnitId;
-import org.zanata.webtrans.shared.model.TransUnitUpdateInfo;
-import org.zanata.webtrans.shared.model.TransUnitUpdateRequest;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import org.zanata.webtrans.shared.model.ValidationAction;
+import java.util.*;
+
+import javax.annotation.*;
+import javax.persistence.*;
+
+import lombok.extern.slf4j.*;
+
+import org.apache.commons.lang.*;
+import org.hibernate.*;
+import org.jboss.seam.*;
+import org.jboss.seam.annotations.*;
+import org.jboss.seam.core.*;
+import org.jboss.seam.security.management.*;
+import org.jboss.seam.util.*;
+import org.zanata.async.*;
+import org.zanata.common.*;
+import org.zanata.common.util.*;
+import org.zanata.dao.*;
+import org.zanata.events.*;
+import org.zanata.exception.*;
+import org.zanata.lock.*;
+import org.zanata.model.*;
+import org.zanata.rest.dto.resource.*;
+import org.zanata.rest.service.*;
+import org.zanata.security.*;
+import org.zanata.service.*;
+import org.zanata.webtrans.shared.model.*;
+
+import com.google.common.base.*;
+import com.google.common.collect.*;
 
 @Name("translationServiceImpl")
 @Scope(ScopeType.STATELESS)
@@ -132,8 +98,18 @@ public class TranslationServiceImpl implements TranslationService
    private TranslationMergeServiceFactory translationMergeServiceFactory;
 
    @Override
-   public List<TranslationResult> translate(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests,
-         boolean runValidationCheck)
+   public List<TranslationResult> translate(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests)
+   {
+      return translate(localeId, translationRequests, true);
+   }
+
+   @Override
+   public List<TranslationResult> translateWithoutValidating(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests)
+   {
+      return translate(localeId, translationRequests, false);
+   }
+
+   private List<TranslationResult> translate(LocaleId localeId, List<TransUnitUpdateRequest> translationRequests, boolean runValidation)
    {
       List<TranslationResult> results = new ArrayList<TranslationResult>();
 
@@ -159,15 +135,18 @@ public List<TranslationResult> translate(LocaleId localeId, List<TransUnitUpdate
 
          TranslationResultImpl result = new TranslationResultImpl();
 
-         String validationMessage = validateTranslations(request.getNewContentState(), projectIteration, request
-                 .getTransUnitId().toString(), hTextFlow.getContents(), request.getNewContents());
-
-         if (runValidationCheck && !StringUtils.isEmpty(validationMessage))
+         if (runValidation)
          {
-            log.warn(validationMessage);
-            result.isSuccess = false;
-            result.errorMessage = validationMessage;
-            continue;
+            String validationMessage = validateTranslations(request.getNewContentState(), projectIteration, request
+                  .getTransUnitId().toString(), hTextFlow.getContents(), request.getNewContents());
+
+            if (!StringUtils.isEmpty(validationMessage))
+            {
+               log.warn(validationMessage);
+               result.isSuccess = false;
+               result.errorMessage = validationMessage;
+               continue;
+            }
          }
 
          HTextFlowTarget hTextFlowTarget = textFlowTargetDAO.getOrCreateTarget(hTextFlow, hLocale);
@@ -485,13 +464,13 @@ public List<String> translateAllInDoc(String projectSlug, String iterationSlug,
     * @return error messages
     */
    private String validateTranslations(ContentState newState, HProjectIteration projectVersion, String targetId,
-                                       List<String> sources, List<String> translations)
+         List<String> sources, List<String> translations)
    {
       String message = null;
       if (newState.isTranslated())
       {
          List<String> validationMessages = validationServiceImpl.validateWithServerRules(
-                 projectVersion, sources, translations, ValidationAction.State.Error);
+               projectVersion, sources, translations, ValidationAction.State.Error);
 
          if (!validationMessages.isEmpty())
          {
@@ -612,8 +591,8 @@ protected Boolean work() throws Exception
                            else
                            {
                               String validationMessage = validateTranslations(incomingTarget.getState(),
-                                      hProjectIteration, incomingTarget.getResId(), textFlow.getContents(),
-                                      incomingTarget.getContents());
+                                    hProjectIteration, incomingTarget.getResId(), textFlow.getContents(),
+                                    incomingTarget.getContents());
 
                               if (!StringUtils.isEmpty(validationMessage))
                               {
@@ -621,7 +600,7 @@ protected Boolean work() throws Exception
                                  log.warn(validationMessage);
                                  continue;
                               }
-                              
+
                               int nPlurals = getNumPlurals(hLocale, textFlow);
                               HTextFlowTarget hTarget = textFlowTargetDAO.getTextFlowTarget(textFlow, hLocale);
 
@@ -859,7 +838,7 @@ public List<TranslationResult> revertTranslations(LocaleId localeId, List<TransU
             }
          }
       }
-      results.addAll(translate(localeId, updateRequests, false));
+      results.addAll(translate(localeId, updateRequests));
       return results;
    }
 
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java b/zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
index 70c562c357..e68fcdf77c 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
@@ -13,13 +13,13 @@ public class WorkspaceContextUpdateEvent extends GwtEvent<WorkspaceContextUpdate
 {
    private final boolean isProjectActive;
    private final ProjectType projectType;
-   private final Map<ValidationId, State> validationsState;
+   private final Map<ValidationId, State> validationStates;
 
    public WorkspaceContextUpdateEvent(HasWorkspaceContextUpdateData data)
    {
       this.isProjectActive = data.isProjectActive();
       this.projectType = data.getProjectType();
-      this.validationsState = data.getValidationsState();
+      this.validationStates = data.getValidationsState();
    }
 
    /**
@@ -63,8 +63,8 @@ public ProjectType getProjectType()
       return projectType;
    }
 
-   public Map<ValidationId, State> getValidationsState()
+   public Map<ValidationId, State> getValidationStates()
    {
-      return validationsState;
+      return validationStates;
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
index f53e1fa3ca..6184c9a2e6 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
@@ -133,7 +133,7 @@ public void onValueChange(ValueChangeEvent<Boolean> event)
    @Override
    public void onWorkspaceContextUpdated(WorkspaceContextUpdateEvent event)
    {
-      validationService.setValidationRules(event.getValidationsState());
+      validationService.setValidationRules(event.getValidationStates());
 
       initDisplay();
    }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
index d29f5c48fd..0b3e2c6e91 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
@@ -88,7 +88,7 @@ protected UpdateTransUnitResult doTranslation(LocaleId localeId, TranslationWork
          TransUnitUpdated.UpdateType updateType)
    {
       UpdateTransUnitResult result = new UpdateTransUnitResult();
-      List<TranslationResult> translationResults = translationServiceImpl.translate(localeId, updateRequests, true);
+      List<TranslationResult> translationResults = translationServiceImpl.translateWithoutValidating(localeId, updateRequests);
       for (TranslationResult translationResult : translationResults)
       {
          HTextFlowTarget newTarget = translationResult.getTranslatedTextFlowTarget();
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
index 0f831e10a8..96bcd2fba6 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
@@ -57,7 +57,7 @@ public abstract class AbstractValidationAction implements ValidationAction
 
    private ValidationDisplayRules displayRules;
 
-   private ArrayList<ValidationAction> exclusiveValidations = new ArrayList<ValidationAction>();
+   private ArrayList<ValidationAction> exclusiveValidations = Lists.newArrayList();
 
    private ValidationMessages validationMessages;
    
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
index 19e86e4fb1..1160724d70 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
@@ -3,25 +3,14 @@
  */
 package org.zanata.webtrans.shared.validation;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.zanata.webtrans.client.resources.ValidationMessages;
-import org.zanata.webtrans.shared.model.ValidationAction;
-import org.zanata.webtrans.shared.model.ValidationAction.State;
-import org.zanata.webtrans.shared.model.ValidationId;
-import org.zanata.webtrans.shared.validation.action.HtmlXmlTagValidation;
-import org.zanata.webtrans.shared.validation.action.JavaVariablesValidation;
-import org.zanata.webtrans.shared.validation.action.NewlineLeadTrailValidation;
-import org.zanata.webtrans.shared.validation.action.PrintfVariablesValidation;
-import org.zanata.webtrans.shared.validation.action.PrintfXSIExtensionValidation;
-import org.zanata.webtrans.shared.validation.action.TabValidation;
-import org.zanata.webtrans.shared.validation.action.XmlEntityValidation;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.*;
+
+import org.zanata.webtrans.client.resources.*;
+import org.zanata.webtrans.shared.model.*;
+import org.zanata.webtrans.shared.model.ValidationAction.*;
+import org.zanata.webtrans.shared.validation.action.*;
+
+import com.google.common.collect.*;
 
 /**
  * Validation Factory - provides list of available validation rules to run on server or client.
@@ -32,7 +21,7 @@ public final class ValidationFactory
 {
    private final ValidationMessages validationMessages;
 
-   private final TreeMap<ValidationId, ValidationAction> referenceMap;
+   private final Map<ValidationId, ValidationAction> referenceMap;
 
    public static Comparator<ValidationId> ValidationIdComparator = new Comparator<ValidationId>()
    {
@@ -73,7 +62,7 @@ public ValidationAction getValidationAction(ValidationId id)
       return referenceMap.get(id);
    }
 
-   private TreeMap<ValidationId, ValidationAction> generateActions()
+   private Map<ValidationId, ValidationAction> generateActions()
    {
       TreeMap<ValidationId, ValidationAction> validationMap = Maps.newTreeMap();
 
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
index 8b7cf8eaa2..67689b1c71 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
@@ -124,10 +124,6 @@
    -->
   <component name="zanataJobScheduler" class="org.zanata.job.ZanataJobScheduler"/>
 
-  <!-- Mailserver for notification messages -->
-  <!-- From 2.0, email configuration is on zanata.properties -->
-<!--   <mail:mail-session host="localhost" port="25" ssl="false" tls="false"/> -->
-
   <!-- Maximum size of file uploads 
       If you are using MySQL, don't forget their magic stuff:
       http://dev.mysql.com/doc/refman/5.0/en/packet-too-large.html
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
index d9b43a82b7..2747957205 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
@@ -1,201 +1,202 @@
 <h:form id="projectForm"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:s="http://jboss.org/schema/seam/taglib"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:rich="http://richfaces.org/rich"
-    xmlns:a4j="http://richfaces.org/a4j"
-    xmlns:richext="http://java.sun.com/jsf/composite/richext">
-
-    <s:token allowMultiplePosts="true" />
-    <rich:panel>
-        <s:decorate id="slugField" template="edit.xhtml" enclose="true">
-            <ui:define name="label">#{messages['jsf.ProjectId']}</ui:define>
-            <h:outputText rendered="#{projectHome.managed}" value="#{projectHome.instance.slug}" />
-            <h:inputText rendered="#{not projectHome.managed}"
-                         id="slug" required="true"
-                         value="#{projectHome.instance.slug}"
-                         valueChangeListener="#{projectHome.verifySlugAvailable}">
-              <a4j:ajax event="blur" render="slugField" execute="@this"/>
-            </h:inputText>
-
-            <s:span styleClass="icon-info-circle-2 input_help" id="slugHelp">
-            	<rich:tooltip>
-	          		<em><code>#{messages['jsf.ProjectIdExample']}</code></em>
-	        	</rich:tooltip>
-           	</s:span>
-       </s:decorate>
-
-        <s:decorate id="nameField" template="edit.xhtml" enclose="true">
-            <ui:define name="label">#{messages['jsf.Name']}</ui:define>
-            <h:inputText id="name" required="true"
-                         value="#{projectHome.instance.name}">
-                <a4j:ajax event="blur" render="nameField" execute="@this"/>
-            </h:inputText>
-        </s:decorate>
-
-        <s:decorate id="descriptionField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.Description']}</ui:define>
-            <h:inputText id="description" required="false"
-                         value="#{projectHome.instance.description}" style="width:400px;"/>
-        </s:decorate>
-
-         <s:decorate id="projectTypeField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.projectType']}</ui:define>
-            <h:selectOneMenu id="selectField" value="#{projectHome.instance.defaultProjectType}">
-                <f:selectItem itemValue="#{null}"
-                              itemLabel="#{messages['jsf.projectType.NoSelection']}"
-                              noSelectionOption="true" />
-                <f:selectItems value="#{projectHome.projectTypeList}"
-                               var="projectType"
-                               itemValue="#{projectType}"
-                               itemLabel="#{messages['jsf.projectType.detail.'.concat(projectType)]}" />
-            </h:selectOneMenu>
-            <s:span styleClass="icon-info-circle-2 input_help" id="defaultProjectTypeHelp">
-                <rich:tooltip>
-                   #{messages['jsf.projectType.Description']}<br/>
-                   #{messages['jsf.projectType.DefaultBehaviour']}<br/>
-                   <br/>
-                   <em>#{messages['jsf.projectType.MoreInfo']}</em><br/>
-                </rich:tooltip>
-            </s:span>
-        </s:decorate>
-
-        <s:decorate id="humanViewableSourceUrlField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.viewSourceFiles']}</ui:define>
-            <h:inputText id="humanViewableSourceUrl" required="false"
-                         value="#{projectHome.instance.sourceViewURL}" style="width:400px;"/>
-            <s:span styleClass="icon-info-circle-2 input_help" id="humanSourceUrlHelp">
-                <rich:tooltip>
-                   <em><code>#{messages['jsf.viewSourceFiles.Example']}</code></em>
-                </rich:tooltip>
-            </s:span>
-        </s:decorate>
-
-        <s:decorate id="machineReadableSourceUrlField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.SourceCheckoutUrl']}</ui:define>
-            <h:inputText id="machineReadableSourceUrl" required="false"
-                         value="#{projectHome.instance.sourceCheckoutURL}" style="width:400px;"/>
-            <s:span styleClass="icon-info-circle-2 input_help" id="machineSourceUrlHelp">
-                <rich:tooltip>
-                   <em><code>#{messages['jsf.SourceCheckoutUrl.Example']}</code></em>
-                </rich:tooltip>
-            </s:span>
-        </s:decorate>
-
-        <s:decorate id="homeContentField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.HomepageContent']}</ui:define>
-             <rich:editor id="homeContent" 
-                width="412" height="300" style="width:412px;"
-                required="false"
-                value="#{projectHome.instance.homeContent}"
-                viewMode="visual" 
-                useSeamText="true"
-                configuration="richeditor"
-                theme="advanced">
-            </rich:editor>
-        </s:decorate>
-	
-	    <s:decorate id="statusField" template="edit.xhtml">
-	        <ui:define name="label">#{messages['jsf.Status']}</ui:define>
-	        <h:selectOneMenu id="selectField" value="#{projectHome.instance.status}">
-	            <f:selectItems value="#{projectHome.statusList}"/>
-	        </h:selectOneMenu>
-	    </s:decorate>
-
-        <div style="clear:both"/>
-        
-        <span class="name">#{messages['jsf.customizedValidationMessage']}</span>
-        <s:div id="validationOptionsList">
-            <rich:dataTable value="#{projectValidationOptionsAction.validationList}" var="validationAction">
-                <rich:column>
-                    #{validationAction.id.displayName}
-                </rich:column>
-            
-                <rich:column>
-                    #{validationAction.description}
-                </rich:column>
-            
-                <rich:column>
-                    <h:selectOneRadio value="#{validationAction.state}" styleClass="validation_options">
-                        <f:selectItems value="#{projectValidationOptionsAction.validationStates}" var="state"
-                            itemLabel="#{state}" itemValue="#{state}"/>
-                         <a4j:ajax event="change" listener="#{projectValidationOptionsAction.checkExclusive(validationAction)}" 
-                                render="validationOptionsList"/>
-                    </h:selectOneRadio>
-                </rich:column>
-            </rich:dataTable>
-        </s:div>
-    </rich:panel>
-
-	<s:div>
-		<a4j:region>
-		<h:selectBooleanCheckbox
-		  value="#{localeListAction.setting}" >
-			<a4j:ajax event="change" render="languagelist" />
-		</h:selectBooleanCheckbox>
-		</a4j:region>
-		<h:outputText
-		  value="#{messages['jsf.customizedLocaleMessage']}"/>
-	</s:div>
-
-
-	<s:div id="languagelist">
-	<a4j:region renderRegionOnly="true">
-      	<h:panelGrid columns="3" id ="languagePanel" rendered="#{localeListAction.setting}">
-	    <h:outputText value="#{messages['jsf.DisabledLocales']}"/>
-	    <h:outputText value=""/>
-	    <h:outputText value="#{messages['jsf.EnabledLocales']}"/>
-            <h:selectManyListbox id ="languagelist2" value="#{localeListAction.availableList}" styleClass="language_list">
-                <f:selectItems value="#{availableItems}"/>
-                <a4j:ajax event="dblclick" render="languagePanel" listener="#{localeListAction.toCustomizedLocales}"/>
-            </h:selectManyListbox>
-            <h:panelGroup id="buttons" styleClass="language_action_buttons">
-                <a4j:commandButton value="#{messages['jsf.AddLocale']}" action="#{localeListAction.toCustomizedLocales}" styleClass="language_action_button" render="languagePanel" />
-                <a4j:commandButton value="#{messages['jsf.RemoveLocale']}" action="#{localeListAction.removeFromCustomizedLocales}" styleClass="language_action_button" render="languagePanel" />
-            </h:panelGroup>
-            <h:selectManyListbox id="languagelist1" value="#{localeListAction.customizedLocales}" styleClass="language_list" >
-                <f:selectItems value="#{localeListAction.customizedItems}"/>
-                <a4j:ajax event="dblclick" render="languagePanel" listener="#{localeListAction.removeFromCustomizedLocales}"/>
-            </h:selectManyListbox>
-      	</h:panelGrid>
-	</a4j:region>
-	</s:div>
-
-    <s:div>
-        <a4j:region>
-            <h:selectBooleanCheckbox title="#{messages['jsf.RestrictRoleAccessTooltip']}" value="#{projectRoleRestrictionAction.restrictByRoles}" >
-                <a4j:ajax event="change" render="roleList" />
-            </h:selectBooleanCheckbox>
-        </a4j:region>
-        <h:outputText
-                value="#{messages['jsf.RestrictRoleAccessMessage']}"/>
+        xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:s="http://jboss.org/schema/seam/taglib"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:rich="http://richfaces.org/rich"
+        xmlns:a4j="http://richfaces.org/a4j"
+        xmlns:richext="http://java.sun.com/jsf/composite/richext">
+
+  <s:token allowMultiplePosts="true"/>
+  <rich:panel>
+    <s:decorate id="slugField" template="edit.xhtml" enclose="true">
+      <ui:define name="label">#{messages['jsf.ProjectId']}</ui:define>
+      <h:outputText rendered="#{projectHome.managed}" value="#{projectHome.instance.slug}"/>
+      <h:inputText rendered="#{not projectHome.managed}"
+                   id="slug" required="true"
+                   value="#{projectHome.instance.slug}"
+                   valueChangeListener="#{projectHome.verifySlugAvailable}">
+        <a4j:ajax event="blur" render="slugField" execute="@this"/>
+      </h:inputText>
+
+      <s:span styleClass="icon-info-circle-2 input_help" id="slugHelp">
+        <rich:tooltip>
+          <em><code>#{messages['jsf.ProjectIdExample']}</code></em>
+        </rich:tooltip>
+      </s:span>
+    </s:decorate>
+
+    <s:decorate id="nameField" template="edit.xhtml" enclose="true">
+      <ui:define name="label">#{messages['jsf.Name']}</ui:define>
+      <h:inputText id="name" required="true"
+                   value="#{projectHome.instance.name}">
+        <a4j:ajax event="blur" render="nameField" execute="@this"/>
+      </h:inputText>
+    </s:decorate>
+
+    <s:decorate id="descriptionField" template="edit.xhtml">
+      <ui:define name="label">#{messages['jsf.Description']}</ui:define>
+      <h:inputText id="description" required="false"
+                   value="#{projectHome.instance.description}" style="width:400px;"/>
+    </s:decorate>
+
+    <s:decorate id="projectTypeField" template="edit.xhtml">
+      <ui:define name="label">#{messages['jsf.projectType']}</ui:define>
+      <h:selectOneMenu id="selectField" value="#{projectHome.instance.defaultProjectType}">
+        <f:selectItem itemValue="#{null}"
+                      itemLabel="#{messages['jsf.projectType.NoSelection']}"
+                      noSelectionOption="true"/>
+        <f:selectItems value="#{projectHome.projectTypeList}"
+                       var="projectType"
+                       itemValue="#{projectType}"
+                       itemLabel="#{messages['jsf.projectType.detail.'.concat(projectType)]}"/>
+      </h:selectOneMenu>
+      <s:span styleClass="icon-info-circle-2 input_help" id="defaultProjectTypeHelp">
+        <rich:tooltip>
+          #{messages['jsf.projectType.Description']}<br/>
+          #{messages['jsf.projectType.DefaultBehaviour']}<br/>
+          <br/>
+          <em>#{messages['jsf.projectType.MoreInfo']}</em><br/>
+        </rich:tooltip>
+      </s:span>
+    </s:decorate>
+
+    <s:decorate id="humanViewableSourceUrlField" template="edit.xhtml">
+      <ui:define name="label">#{messages['jsf.viewSourceFiles']}</ui:define>
+      <h:inputText id="humanViewableSourceUrl" required="false"
+                   value="#{projectHome.instance.sourceViewURL}" style="width:400px;"/>
+      <s:span styleClass="icon-info-circle-2 input_help" id="humanSourceUrlHelp">
+        <rich:tooltip>
+          <em><code>#{messages['jsf.viewSourceFiles.Example']}</code></em>
+        </rich:tooltip>
+      </s:span>
+    </s:decorate>
+
+    <s:decorate id="machineReadableSourceUrlField" template="edit.xhtml">
+      <ui:define name="label">#{messages['jsf.SourceCheckoutUrl']}</ui:define>
+      <h:inputText id="machineReadableSourceUrl" required="false"
+                   value="#{projectHome.instance.sourceCheckoutURL}" style="width:400px;"/>
+      <s:span styleClass="icon-info-circle-2 input_help" id="machineSourceUrlHelp">
+        <rich:tooltip>
+          <em><code>#{messages['jsf.SourceCheckoutUrl.Example']}</code></em>
+        </rich:tooltip>
+      </s:span>
+    </s:decorate>
+
+    <s:decorate id="homeContentField" template="edit.xhtml">
+      <ui:define name="label">#{messages['jsf.HomepageContent']}</ui:define>
+      <rich:editor id="homeContent"
+                   width="412" height="300" style="width:412px;"
+                   required="false"
+                   value="#{projectHome.instance.homeContent}"
+                   viewMode="visual"
+                   useSeamText="true"
+                   configuration="richeditor"
+                   theme="advanced">
+      </rich:editor>
+    </s:decorate>
+
+    <s:decorate id="statusField" template="edit.xhtml">
+      <ui:define name="label">#{messages['jsf.Status']}</ui:define>
+      <h:selectOneMenu id="selectField" value="#{projectHome.instance.status}">
+        <f:selectItems value="#{projectHome.statusList}"/>
+      </h:selectOneMenu>
+    </s:decorate>
+
+    <div style="clear:both"/>
+
+    <span class="name">#{messages['jsf.customizedValidationMessage']}</span>
+    <s:div id="validationOptionsList">
+      <rich:dataTable value="#{projectValidationOptionsAction.validationList}" var="validationAction">
+        <rich:column>
+          #{validationAction.id.displayName}
+        </rich:column>
+
+        <rich:column>
+          #{validationAction.description}
+        </rich:column>
+
+        <rich:column>
+          <h:selectOneRadio value="#{validationAction.state}" styleClass="validation_options">
+            <f:selectItems value="#{projectValidationOptionsAction.validationStates}" var="state" itemLabel="#{state}" itemValue="#{state}"/>
+            <a4j:ajax event="change" listener="#{projectValidationOptionsAction.checkExclusive(validationAction)}"
+                      render="validationOptionsList"/>
+          </h:selectOneRadio>
+        </rich:column>
+      </rich:dataTable>
     </s:div>
-
-    <s:div id="roleList">
-        <a4j:region renderRegionOnly="true">
-            <rich:dataGrid value="#{projectRoleRestrictionAction.availableRoles}" var="role" columns="4"
-                           rendered="#{projectRoleRestrictionAction.restrictByRoles}">
-                <h:selectBooleanCheckbox value="#{projectRoleRestrictionAction.roleRestrictions[role.name]}"/>
-                <h:outputLabel value="#{role.name}"/>
-            </rich:dataGrid>
-        </a4j:region>
-    </s:div>
-
-    <div class="actionButtons">
-        <h:commandButton id="save"
-                      value="#{messages['jsf.Save']}"
+  </rich:panel>
+
+  <s:div>
+    <a4j:region>
+      <h:selectBooleanCheckbox
+              value="#{localeListAction.setting}">
+        <a4j:ajax event="change" render="languagelist"/>
+      </h:selectBooleanCheckbox>
+    </a4j:region>
+    <h:outputText
+            value="#{messages['jsf.customizedLocaleMessage']}"/>
+  </s:div>
+
+
+  <s:div id="languagelist">
+    <a4j:region renderRegionOnly="true">
+      <h:panelGrid columns="3" id="languagePanel" rendered="#{localeListAction.setting}">
+        <h:outputText value="#{messages['jsf.DisabledLocales']}"/>
+        <h:outputText value=""/>
+        <h:outputText value="#{messages['jsf.EnabledLocales']}"/>
+        <h:selectManyListbox id="languagelist2" value="#{localeListAction.availableList}" styleClass="language_list">
+          <f:selectItems value="#{availableItems}"/>
+          <a4j:ajax event="dblclick" render="languagePanel" listener="#{localeListAction.toCustomizedLocales}"/>
+        </h:selectManyListbox>
+        <h:panelGroup id="buttons" styleClass="language_action_buttons">
+          <a4j:commandButton value="#{messages['jsf.AddLocale']}" action="#{localeListAction.toCustomizedLocales}" styleClass="language_action_button"
+                             render="languagePanel"/>
+          <a4j:commandButton value="#{messages['jsf.RemoveLocale']}" action="#{localeListAction.removeFromCustomizedLocales}"
+                             styleClass="language_action_button" render="languagePanel"/>
+        </h:panelGroup>
+        <h:selectManyListbox id="languagelist1" value="#{localeListAction.customizedLocales}" styleClass="language_list">
+          <f:selectItems value="#{localeListAction.customizedItems}"/>
+          <a4j:ajax event="dblclick" render="languagePanel" listener="#{localeListAction.removeFromCustomizedLocales}"/>
+        </h:selectManyListbox>
+      </h:panelGrid>
+    </a4j:region>
+  </s:div>
+
+  <s:div>
+    <a4j:region>
+      <h:selectBooleanCheckbox title="#{messages['jsf.RestrictRoleAccessTooltip']}" value="#{projectRoleRestrictionAction.restrictByRoles}">
+        <a4j:ajax event="change" render="roleList"/>
+      </h:selectBooleanCheckbox>
+    </a4j:region>
+    <h:outputText
+            value="#{messages['jsf.RestrictRoleAccessMessage']}"/>
+  </s:div>
+
+  <s:div id="roleList">
+    <a4j:region renderRegionOnly="true">
+      <rich:dataGrid value="#{projectRoleRestrictionAction.availableRoles}" var="role" columns="4"
+                     rendered="#{projectRoleRestrictionAction.restrictByRoles}">
+        <h:selectBooleanCheckbox value="#{projectRoleRestrictionAction.roleRestrictions[role.name]}"/>
+        <h:outputLabel value="#{role.name}"/>
+      </rich:dataGrid>
+    </a4j:region>
+  </s:div>
+
+  <div class="actionButtons">
+    <h:commandButton id="save"
+                     value="#{messages['jsf.Save']}"
                      action="#{projectHome.persist}"
-                   rendered="#{!projectHome.managed}"/>
-        <h:commandButton id="update"
-                      value="#{messages['jsf.Update']}"
+                     rendered="#{!projectHome.managed}"/>
+    <h:commandButton id="update"
+                     value="#{messages['jsf.Update']}"
                      action="#{projectHome.update}"
-                   rendered="#{projectHome.managed}"/>
-        <s:button id="cancel"
-                        value="#{messages['jsf.Cancel']}"
-                        propagation="none"
-                       action="#{projectHome.cancel}"/>
-    </div>
+                     rendered="#{projectHome.managed}"/>
+    <s:button id="cancel"
+              value="#{messages['jsf.Cancel']}"
+              propagation="none"
+              action="#{projectHome.cancel}"/>
+  </div>
 
 </h:form>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/validation_options_legend.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/validation_options_legend.xhtml
index 76452ff593..b89e7f2b50 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/validation_options_legend.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/validation_options_legend.xhtml
@@ -2,22 +2,19 @@
             xmlns:f="http://java.sun.com/jsf/core"
             xmlns:rich="http://richfaces.org/rich">
 
-    <f:facet name="header">#{messages['jsf.ValidationHelp']}</f:facet>
-    <ul class="list--no-bullets">
-        <li class="l--push-v-half">
-            <span class="Epsilon">#{messages['jsf.Off']}</span>
-
-            <div>#{messages['jsf.ValidationStateHelpOff']}</div>
-        </li>
-        <li class="l--push-v-half txt--warning">
-            <span class="Epsilon txt--warning">#{messages['jsf.Warning']}</span>
-
-            <div>#{messages['jsf.ValidationStateHelpWarning']}</div>
-        </li>
-        <li class="l--push-v-half txt--danger">
-            <span class="Epsilon txt--danger">#{messages['jsf.Error']}</span>
-
-            <div>#{messages['jsf.ValidationStateHelpError']}</div>
-        </li>
-    </ul>
+  <f:facet name="header">#{messages['jsf.ValidationHelp']}</f:facet>
+  <ul class="list--no-bullets">
+    <li class="l--push-v-half">
+      <span class="Epsilon">#{messages['jsf.Off']}</span>
+      <div>#{messages['jsf.ValidationStateHelpOff']}</div>
+    </li>
+    <li class="l--push-v-half txt--warning">
+      <span class="Epsilon txt--warning">#{messages['jsf.Warning']}</span>
+      <div>#{messages['jsf.ValidationStateHelpWarning']}</div>
+    </li>
+    <li class="l--push-v-half txt--danger">
+      <span class="Epsilon txt--danger">#{messages['jsf.Error']}</span>
+      <div>#{messages['jsf.ValidationStateHelpError']}</div>
+    </li>
+  </ul>
 </rich:panel>
\ No newline at end of file
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
index 9605cde9e8..d0d9c7674a 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
@@ -95,7 +95,7 @@ public void translate() throws Exception
       newContents.add("translated 2");
       TransUnitUpdateRequest translateReq = new TransUnitUpdateRequest(transUnitId, newContents, ContentState.Approved, 1);
 
-      List<TranslationResult> result = transService.translate(new LocaleId("de"), Lists.newArrayList(translateReq), true);
+      List<TranslationResult> result = transService.translateWithoutValidating(new LocaleId("de"), Lists.newArrayList(translateReq));
 
       assertThat(result.get(0).isTranslationSuccessful(), is(true));
       assertThat(result.get(0).getBaseVersionNum(), is(1));
@@ -124,7 +124,7 @@ public void translateMultiple() throws Exception
       newContents.add("translated 2");
       translationReqs.add( new TransUnitUpdateRequest(transUnitId, newContents, ContentState.NeedReview, 0) );
 
-      List<TranslationResult> results = transService.translate(new LocaleId("de"), translationReqs, true);
+      List<TranslationResult> results = transService.translateWithoutValidating(new LocaleId("de"), translationReqs);
 
       // First result
       TranslationResult result = results.get(0);
@@ -154,7 +154,7 @@ public void incorrectBaseVersion() throws Exception
 
       // Should not pass as the base version (1) does not match
       List<TransUnitUpdateRequest> translationRequests = Lists.newArrayList(translateReq);
-      List<TranslationResult> result = transService.translate(new LocaleId("de"), translationRequests, true);
+      List<TranslationResult> result = transService.translateWithoutValidating(new LocaleId("de"), translationRequests);
 
       assertThat(result.get(0).isTranslationSuccessful(), Matchers.is(false));
    }
@@ -168,7 +168,7 @@ public void willCheckPermissionForReviewState()
       TransUnitId transUnitId = new TransUnitId(3L);
       TransUnitUpdateRequest translateReq = new TransUnitUpdateRequest(transUnitId, Lists.newArrayList("a", "b"), ContentState.Approved, 0);
 
-      List<TranslationResult> result = transService.translate(new LocaleId("de"), Lists.newArrayList(translateReq), true);
+      List<TranslationResult> result = transService.translateWithoutValidating(new LocaleId("de"), Lists.newArrayList(translateReq));
 
       verify(identity).checkPermission(eq("translation-review"), isA(HProject.class), isA(HLocale.class));
       assertThat(result.get(0).isTranslationSuccessful(), is(true));
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
index 086410e87b..d49264d0e2 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
@@ -41,9 +41,7 @@
 import org.zanata.webtrans.client.ui.InlineLink;
 import org.zanata.webtrans.client.ui.TransMemoryMergePopupPanelDisplay;
 import org.zanata.webtrans.client.ui.UndoLink;
-import org.zanata.webtrans.shared.model.TransUnit;
-import org.zanata.webtrans.shared.model.TransUnitUpdateInfo;
-import org.zanata.webtrans.shared.model.TransUnitUpdateRequest;
+import org.zanata.webtrans.shared.model.*;
 import org.zanata.webtrans.shared.rpc.MergeRule;
 import org.zanata.webtrans.shared.rpc.MergeOptions;
 import org.zanata.webtrans.shared.rpc.TransMemoryMerge;
@@ -225,6 +223,7 @@ public void onRequestTMMergeSuccessWithTranslationWillCreateUndoLinkAndNotify()
             makeTransUnit(4, ContentState.NeedReview));
       mockCurrentPageToReturn(currentPageRows);
       UndoLink undoLink = mock(UndoLink.class);
+      DocumentId documentId = new DocumentId(new Long(0), "");
       when(undoLinkProvider.get()).thenReturn(undoLink);
 
       // When:
@@ -237,11 +236,11 @@ public void onRequestTMMergeSuccessWithTranslationWillCreateUndoLinkAndNotify()
       AsyncCallback<UpdateTransUnitResult> callback = callbackCaptor.getValue();
       // rpc call success and result has some updated info
       UpdateTransUnitResult result = new UpdateTransUnitResult();
-      result.addUpdateResult(new TransUnitUpdateInfo(true, true, null, currentPageRows.get(0), 0, 0, ContentState.Approved, null));
+      result.addUpdateResult(new TransUnitUpdateInfo(true, true, documentId, currentPageRows.get(0), 0, 0, ContentState.Approved, null));
       // add an unsuccessful result
-      result.addUpdateResult(new TransUnitUpdateInfo(false, true, null, currentPageRows.get(1), 0, 0, ContentState.Approved, null));
-      result.addUpdateResult(new TransUnitUpdateInfo(true, true, null, currentPageRows.get(2), 0, 0, ContentState.Approved, null));
-      result.addUpdateResult(new TransUnitUpdateInfo(true, true, null, currentPageRows.get(3), 0, 0, ContentState.Approved, null));
+      result.addUpdateResult(new TransUnitUpdateInfo(false, true, documentId, currentPageRows.get(1), 0, 0, ContentState.Approved, null));
+      result.addUpdateResult(new TransUnitUpdateInfo(true, true, documentId, currentPageRows.get(2), 0, 0, ContentState.Approved, null));
+      result.addUpdateResult(new TransUnitUpdateInfo(true, true, documentId, currentPageRows.get(3), 0, 0, ContentState.Approved, null));
       callback.onSuccess(result);
 
       // Then:
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
index ba25adfcc0..f275099380 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
@@ -129,7 +129,15 @@ public void onGoToPage()
    @Test
    public void onFilterViewEventDoNothingIfItsCancel()
    {
-      presenter.onFilterView(new FilterViewEvent(true, true, true, true, true, false, true));
+      boolean viewTranslated = true;
+      boolean viewFuzzy = true;
+      boolean viewUntranslated = true;
+      boolean viewApproved = true;
+      boolean viewRejected = true;
+      boolean viewHasError = false;
+      boolean cancelFilter = true;
+
+      presenter.onFilterView(new FilterViewEvent(viewTranslated, viewFuzzy, viewUntranslated, viewApproved, viewRejected, viewHasError, cancelFilter));
 
       verifyNoMoreInteractions(eventBus, display, targetContentsPresenter);
    }
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
index 669ff007a2..9a71b64e3d 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
@@ -52,14 +52,14 @@ public void execute()
 
       ValidationFactory validationFactory = new ValidationFactory(null);
       Map<ValidationId, ValidationAction> validationMap = validationFactory.getAllValidationActions();
-      Map<ValidationId, State> validationsState = new HashMap<ValidationId, State>();
+      Map<ValidationId, State> validationStates = new HashMap<ValidationId, State>();
 
       for (ValidationAction action : validationMap.values())
       {
-         validationsState.put(action.getId(), action.getState());
+         validationStates.put(action.getId(), action.getState());
       }
 
-      callback.onSuccess(new ActivateWorkspaceResult(userWorkspaceContext, identity, new UserConfigHolder().getState(), validationsState));
+      callback.onSuccess(new ActivateWorkspaceResult(userWorkspaceContext, identity, new UserConfigHolder().getState(), validationStates));
       Log.info("EXIT DummyActivateWorkspaceCommand.execute()");
    }
 }
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
index 761dfb794f..e76f4f49f6 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
@@ -64,14 +64,14 @@ public void beforeMethod() throws IOException
       ValidationFactory validationFactory = new ValidationFactory(validationMessages);
 
       Collection<ValidationAction> validationList = validationFactory.getAllValidationActions().values();
-      Map<ValidationId, State> validationsStateList = new HashMap<ValidationId, State>();
+      Map<ValidationId, State> validationStatesMap = new HashMap<ValidationId, State>();
       
       for (ValidationAction action : validationList)
       {
          action.getRules().setEnabled(true);
-         validationsStateList.put(action.getId(), action.getState());
+         validationStatesMap.put(action.getId(), action.getState());
       }
-      service.setValidationRules(validationsStateList);
+      service.setValidationRules(validationStatesMap);
 
       verify(eventBus).addHandler(RunValidationEvent.getType(), service);
    }
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
index d81c74a008..76bbb94690 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
@@ -146,13 +146,13 @@ public void testExecute() throws Exception
       when(workspaceContext.getWorkspaceId()).thenReturn(workspaceId);
 
       Collection<ValidationAction> validationList = validationFactory.getAllValidationActions().values();
-      Map<ValidationId, State> validationsState = new HashMap<ValidationId, State>();
+      Map<ValidationId, State> validationStates = new HashMap<ValidationId, State>();
       for (ValidationAction valAction : validationList)
       {
-         validationsState.put(valAction.getId(), valAction.getState());
+         validationStates.put(valAction.getId(), valAction.getState());
       }
       
-      GetValidationRulesResult validationResult = new GetValidationRulesResult(validationsState);
+      GetValidationRulesResult validationResult = new GetValidationRulesResult(validationStates);
       when(getValidationRulesHandler.execute(isA(GetValidationRulesAction.class), any(ExecutionContext.class))).thenReturn(validationResult);
 
       ActivateWorkspaceResult result = handler.execute(action, null);
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java b/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
index 2993f647ca..ce3773842d 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
@@ -115,7 +115,6 @@ public void missingTagError()
       List<String> errorList =  htmlXmlTagValidation.validate(source, target);
 
       assertThat(errorList, hasItem(messages.tagsMissing(Arrays.asList("<foo>"))));
-      System.out.println(errorList);
       assertThat(errorList.size(), is(1));
    }