diff --git a/server/src/main/java/org/apache/sqoop/handler/ConnectionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/ConnectionRequestHandler.java
index 2d7419d6..7842e32c 100644
--- a/server/src/main/java/org/apache/sqoop/handler/ConnectionRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/ConnectionRequestHandler.java
@@ -47,9 +47,6 @@
 /**
  * Connection request handler is supporting following resources:
  *
- * GET /v1/connection
- * Get brief list of all connections present in the system.
- *
  * GET /v1/connection/:xid
  * Return details about one particular connection with id :xid or about all of
  * them if :xid equals to "all".
@@ -62,6 +59,12 @@
  *
  * DELETE /v1/connection/:xid
  * Remove connection with id :xid
+ *
+ * Planned resources:
+ *
+ * GET /v1/connection
+ * Get brief list of all connections present in the system.
+ *
  */
 public class ConnectionRequestHandler implements RequestHandler {
 
diff --git a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
index 39b73e7f..4c389ccc 100644
--- a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
@@ -34,6 +34,20 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 
+/**
+ * Connector request handler is supporting following resources:
+ *
+ * GET /v1/connector/:cid
+ * Return details about one particular connector with id :cid or about all of
+ * them if :cid equals to "all".
+ *
+ * Planned resources:
+ *
+ * GET /v1/connector
+ * Get brief list of all connectors present in the system. This resource is not
+ * yet implemented.
+ *
+ */
 public class ConnectorRequestHandler implements RequestHandler {
 
   private static final Logger LOG =
diff --git a/server/src/main/java/org/apache/sqoop/handler/FrameworkRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/FrameworkRequestHandler.java
index f635c354..48fe0ffe 100644
--- a/server/src/main/java/org/apache/sqoop/handler/FrameworkRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/FrameworkRequestHandler.java
@@ -18,7 +18,7 @@
 package org.apache.sqoop.handler;
 
 import org.apache.log4j.Logger;
-import org.apache.sqoop.common.SqoopException;
+
 import org.apache.sqoop.framework.FrameworkManager;
 import org.apache.sqoop.json.FrameworkBean;
 import org.apache.sqoop.json.JsonBean;
@@ -26,7 +26,10 @@
 import org.apache.sqoop.server.RequestHandler;
 
 /**
+ * Framework request handler is supporting following resources:
  *
+ * GET /v1/framework
+ * Get framework metadata.
  */
 public class FrameworkRequestHandler  implements RequestHandler {
 
diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
index 41af6577..18b99975 100644
--- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
@@ -47,9 +47,6 @@
 /**
  * Job request handler is supporting following resources:
  *
- * GET /v1/job
- * Get brief list of all jobs present in the system.
- *
  * GET /v1/job/:jid
  * Return details about one particular job with id :jid or about all of
  * them if :jid equals to "all".
@@ -62,6 +59,12 @@
  *
  * DELETE /v1/job/:jid
  * Remove job with id :jid
+ *
+ * Planned resources:
+ *
+ * GET /v1/job
+ * Get brief list of all jobs present in the system. This resource is not yet
+ * implemented.
  */
 public class JobRequestHandler implements RequestHandler {
 
diff --git a/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
index a38e907e..f92d1075 100644
--- a/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
@@ -19,12 +19,17 @@
 
 import org.apache.log4j.Logger;
 import org.apache.sqoop.common.VersionInfo;
-import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.json.JsonBean;
 import org.apache.sqoop.json.VersionBean;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestHandler;
 
+/**
+ * Version request handler is supporting following resources:
+ *
+ * GET /version
+ * Get server version and supported protocol versions.
+ */
 public class VersionRequestHandler implements RequestHandler {
 
   private static final Logger LOG =