diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java b/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
index 1c08d7f9dd..3126439044 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
@@ -4,6 +4,7 @@
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
@@ -32,7 +33,7 @@
 import org.zanata.seam.resteasy.IgnoreInterfacePath;
 
 @Name("accountService")
-//@Path(AccountResource.SERVICE_PATH)
+@Path(AccountResource.SERVICE_PATH)
 @Transactional
 @IgnoreInterfacePath
 public class AccountService implements AccountResource
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
index b5e0482af7..a7462d616d 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
@@ -56,6 +56,9 @@
 import com.google.common.collect.Lists;
 
 import lombok.extern.slf4j.Slf4j;
+
+import javax.ws.rs.Path;
+
 import static org.zanata.rest.dto.ProcessStatus.ProcessStatusCode;
 
 /**
@@ -64,7 +67,7 @@
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
 @Name("asynchronousProcessResourceService")
-//@Path(AsynchronousProcessResource.SERVICE_PATH)
+@Path(AsynchronousProcessResource.SERVICE_PATH)
 @Transactional
 @Slf4j
 @IgnoreInterfacePath
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
index d64f726f87..9ad268e0bb 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
@@ -34,6 +34,7 @@
 import java.util.Set;
 
 import javax.annotation.Nonnull;
+import javax.ws.rs.Path;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -68,7 +69,7 @@
 import com.google.common.io.ByteStreams;
 
 @Name("fileService")
-//@Path(FileResource.FILE_RESOURCE)
+@Path(FileResource.FILE_RESOURCE)
 @IgnoreInterfacePath
 public class FileService implements FileResource
 {
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java b/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
index 9ff02a64bb..6e09b12205 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -30,7 +31,7 @@
 import org.zanata.service.GlossaryFileService;
 
 @Name("glossaryService")
-//@Path(GlossaryService.SERVICE_PATH)
+@Path(GlossaryService.SERVICE_PATH)
 @Transactional
 @IgnoreInterfacePath
 public class GlossaryService implements GlossaryResource
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
index 3bfb545b2f..1555865637 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
@@ -26,6 +26,7 @@
 import javax.annotation.Nonnull;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.EntityTag;
@@ -56,7 +57,7 @@
 import com.google.common.base.Objects;
 
 @Name("projectIterationService")
-//@Path(ProjectIterationService.SERVICE_PATH)
+@Path(ProjectIterationService.SERVICE_PATH)
 @Transactional
 @IgnoreInterfacePath
 public class ProjectIterationService implements ProjectIterationResource
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
index 9d64a2fa3e..b3e62ab126 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nonnull;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.EntityTag;
@@ -43,7 +44,7 @@
 import com.google.common.base.Objects;
 
 @Name("projectService")
-//@Path(ProjectService.SERVICE_PATH)
+@Path(ProjectService.SERVICE_PATH)
 @Transactional
 @IgnoreInterfacePath
 public class ProjectService implements ProjectResource
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
index b7c30d8bd2..8c6ddc7cc1 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
@@ -29,6 +29,7 @@
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.MediaType;
@@ -53,7 +54,7 @@
 import com.google.common.base.Objects;
 
 @Name("projectsService")
-//@Path(ProjectsResource.SERVICE_PATH)
+@Path(ProjectsResource.SERVICE_PATH)
 @Transactional
 @IgnoreInterfacePath
 public class ProjectsService implements ProjectsResource
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
index bf5d74e551..2c5b9afc64 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
@@ -48,12 +48,15 @@
 import org.zanata.service.DocumentService;
 import org.zanata.service.LocaleService;
 
+import javax.ws.rs.Consumes;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
index 65b0c55bbb..802dd1cbf0 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
@@ -25,6 +25,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
+import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 
@@ -56,7 +57,7 @@
 
 import com.google.common.base.Optional;
 @Name("translationMemoryResource")
-//@Path(TranslationMemoryResource.SERVICE_PATH)
+@Path(TranslationMemoryResource.SERVICE_PATH)
 @Transactional(TransactionPropagationType.SUPPORTS)
 @Slf4j
 @ParametersAreNonnullByDefault
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java b/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
index 6ef3460d61..ef138e95d7 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
@@ -1,6 +1,7 @@
 package org.zanata.rest.service;
 
 
+import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 
 import org.jboss.seam.annotations.Name;
@@ -11,7 +12,7 @@
 
 
 @Name("versionService")
-//@Path(VersionResource.SERVICE_PATH)
+@Path(VersionResource.SERVICE_PATH)
 @IgnoreInterfacePath
 public class VersionService implements VersionResource
 {