You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2015/02/08 21:46:30 UTC

stratos git commit: Adding error response message body to API methods.Removed hard coded response strings. Fixing STRATOS-1181

Repository: stratos
Updated Branches:
  refs/heads/master 8705e61b9 -> 35a2c1d37


Adding error response message body to API methods.Removed hard coded response strings. Fixing STRATOS-1181


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/35a2c1d3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/35a2c1d3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/35a2c1d3

Branch: refs/heads/master
Commit: 35a2c1d374b590ae5d9b1822533518ec87371364
Parents: 8705e61
Author: sajhak <sa...@gmail.com>
Authored: Mon Feb 9 02:15:19 2015 +0530
Committer: sajhak <sa...@gmail.com>
Committed: Mon Feb 9 02:15:38 2015 +0530

----------------------------------------------------------------------
 .../stratos/common/beans/ErrorResponseBean.java |  55 +++++++
 .../common/beans/SuccessResponseBean.java       |  54 +++++++
 .../console/controllers/rest/rest_calls.jag     |  33 +++--
 .../org/apache/stratos/rest/endpoint/Utils.java |  20 ---
 .../rest/endpoint/api/StratosApiV41.java        | 148 ++++++++++++++-----
 .../rest/endpoint/api/StratosApiV41Utils.java   |   8 +-
 .../handlers/BadRequestExceptionMapper.java     |   3 +-
 .../CookieBasedAuthenticationHandler.java       |   5 +-
 .../handlers/CustomExceptionMapper.java         |   3 +-
 .../CustomThrowableExceptionMapper.java         |   3 +-
 .../handlers/GenericExceptionMapper.java        |   3 +-
 .../handlers/StratosAuthenticationHandler.java  |  17 ++-
 .../handlers/StratosAuthorizingHandler.java     |   7 +-
 .../endpoint/handlers/StratosMockHandler.java   |  11 +-
 14 files changed, 282 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
new file mode 100644
index 0000000..693f1e8
--- /dev/null
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.common.beans;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name ="error")
+public class ErrorResponseBean {
+	
+	private int errorCode;
+	private String errorMessage;
+	
+	public ErrorResponseBean() {
+	 
+    }
+			
+	public ErrorResponseBean(String errorMessage) {
+	    this.errorMessage = errorMessage;
+    }
+
+	public ErrorResponseBean(int errorCode, String errorMessage) {	
+	    this.errorCode = errorCode;
+	    this.errorMessage = errorMessage;
+    }
+	
+	public int getErrorCode() {
+		return errorCode;
+	}
+	public void setErrorCode(int errorCode) {
+		this.errorCode = errorCode;
+	}
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
new file mode 100644
index 0000000..1c674bd
--- /dev/null
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.common.beans;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name ="success")
+public class SuccessResponseBean {
+
+	private int statusCode;
+	private String successMessage;
+	
+	public SuccessResponseBean() {	 
+    }
+
+	public SuccessResponseBean(int statusCode, String message) {	 
+	    this.statusCode = statusCode;
+	    this.successMessage = message;
+    }
+	
+	public int getStatusCode() {
+		return statusCode;
+	}
+
+	public void setStatusCode(int statusCode) {
+		this.statusCode = statusCode;
+	}
+
+	public String getSuccessMessage() {
+		return successMessage;
+	}
+
+	public void setSuccessMessage(String successMessage) {
+		this.successMessage = successMessage;
+	}
+
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index c8462de..b61d591 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -218,8 +218,8 @@ RESTCalls = new function(){
         var error;
         var par_res = this.sendReceive("GET","/policy/autoscale",{});
         var get_status = session.get("get-status");
-        if(par_res.Error != undefined){
-            error = par_res.Error;
+        if(par_res.errorCode != undefined){
+            error = par_res.errorCode;
             configStatus.first_use = true;
         }else{
             if(get_status.status == "success") {
@@ -227,8 +227,8 @@ RESTCalls = new function(){
                     configStatus.first_use = true;
                 }else{
                     var car_res = this.sendReceive("GET","/cartridge/available/list",{});
-                    if(car_res.Error != undefined){
-                        error=car_res.Error;
+                    if(car_res.errorCode != undefined){
+                        error=car_res.errorCode;
                         configStatus.first_use = false;
                         configStatus.not_complete = true;
                     }else{
@@ -294,23 +294,26 @@ RESTCalls = new function(){
                 log.error("Error in the programme flow.");
         }
         if (response.xhr.status >= 200 && response.xhr.status < 300) { //if success
-
-            session.put("get-status", { "message": "success" , "status": "success" });
+             if(response.data != null && response.data != undefined && parse(response.data).successMessage != undefined) {
+               session.put("get-status", { "message": parse(response.data).successMessage , "status": "success" });
+             } else {
+               session.put("get-status", { "message": "success" , "status": "success" });
+             }  
         } else if (response.xhr.status >= 300 && response.xhr.status < 400) { //if redirects
             if(response.data != null && response.data != undefined) {
-                session.put("get-status", { "message": parse(response.data).Error.errorMessage , "status": "warning" } );
+                session.put("get-status", { "message": parse(response.data).errorMessage , "status": "warning" } );
             }else{
                 session.put("get-status", { "message":  response.xhr.status + ' '+ response.xhr.statusText , "status": "warning"});
             }
         } else if (response.xhr.status >= 400 && response.xhr.status < 500) { //if client error
             if(response.data != null && response.data != undefined) {
-                session.put("get-status",{ "message":  parse(response.data).Error.errorMessage, "status": "warning" } );
+                session.put("get-status",{ "message":  parse(response.data).errorMessage, "status": "warning" } );
             }else{
                 session.put("get-status", { "message":  response.xhr.status + ' '+ response.xhr.statusText , "status": "warning"});
             }
         } else if (response.xhr.status >= 500 && response.xhr.status < 600) { //if server error
             if(response.data != null && response.data != undefined) {
-                session.put("get-status", { "message": parse(response.data).Error.errorMessage, "status": "warning" } );
+                session.put("get-status", { "message": parse(response.data).errorMessage, "status": "warning" } );
             }else{
                 session.put("get-status", { "message":  response.xhr.status + ' '+ response.xhr.statusText , "status": "warning"});
             }
@@ -352,22 +355,26 @@ RESTCalls = new function(){
                 log.error("Error in the programme flow.");
         }
         if (response.xhr.status >= 200 && response.xhr.status < 300) { //if success
-            session.put("deploy-status", { "message": "success" , "status": "success" });
+             if(response.data != null && response.data != undefined && parse(response.data).successMessage != undefined) {
+               session.put("deploy-status", { "message": parse(response.data).successMessage , "status": "success" });
+             } else {
+               session.put("deploy-status", { "message": "success" , "status": "success" });
+             }  
         } else if (response.xhr.status >= 300 && response.xhr.status < 400) { //if redirects
             if(response.data != null && response.data != undefined) {
-                session.put("deploy-status",{ "message": parse(response.data).Error.errorMessage, "status": "warning" } );
+                session.put("deploy-status",{ "message": parse(response.data).errorMessage, "status": "warning" } );
             }else{
                 session.put("deploy-status", { "message":  response.xhr.status + ' '+ response.xhr.statusText , "status": "warning"});
             }
         } else if (response.xhr.status >= 400 && response.xhr.status < 500) { //if client error
             if(response.data != null && response.data != undefined) {
-                session.put("deploy-status", { "message":  parse(response.data).Error.errorMessage, "status": "error"});
+                session.put("deploy-status", { "message":  parse(response.data).errorMessage, "status": "error"});
             }else{
                 session.put("deploy-status", { "message":  response.xhr.status + ' '+ response.xhr.statusText , "status": "error"});
             }
         } else if (response.xhr.status >= 500 && response.xhr.status < 600) { //if server error
             if(response.data != null && response.data != undefined) {
-                session.put("deploy-status", { "message": parse(response.data).Error.errorMessage, "status": "error"});
+                session.put("deploy-status", { "message": parse(response.data).errorMessage, "status": "error"});
             }else{
                 session.put("deploy-status", { "message":  response.xhr.status + ' '+ response.xhr.statusText , "status": "error"});
             }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java
index e7b3e34..37bcf8c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java
@@ -20,26 +20,6 @@ package org.apache.stratos.rest.endpoint;
 
 public class Utils {
 
-
-    public static String buildMessage(int errorCode, String errorMessage) {
-        String jsonResponse = "{\"Error\":{" +
-                " \"errorCode\": \" " + errorCode + "\"," +
-                " \"errorMessage\": \" " + errorMessage + "\"" +
-                "}" +
-                "}";
-        return jsonResponse;
-    }
-
-    public static String buildMessage(String errorMessage) {
-        String jsonResponse = "{\"Error\":{" +
-                " \"errorCode\": \" " + -1234 + "\"," +
-                " \"errorMessage\": \" " + errorMessage + "\"" +
-                "}" +
-                "}";
-        return jsonResponse;
-    }
-
-
     public static String buildAuthenticationSuccessMessage(String jSessionId) {
         String jsonResponse = "{\"Success\":{" +
                 " \"sessionId\": \"" + jSessionId + "\"" +

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 18f5c5d..623f8b7 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -68,6 +68,7 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@@ -144,15 +145,19 @@ public class StratosApiV41 extends AbstractApi {
         String cartridgeType = cartridgeDefinitionBean.getType();
         CartridgeBean cartridgeBean = StratosApiV41Utils.getCartridgeForValidate(cartridgeType);
         if(cartridgeBean != null) {
-            log.warn(String.format("Cartridge already exists: [cartridge-type] %s", cartridgeType));
-            return Response.status(Response.Status.CONFLICT).build();
+        	String msg = String.format("Cartridge already exists: [cartridge-type] %s", cartridgeType);
+            log.warn(msg);
+            return Response.status(Response.Status.CONFLICT).entity(new ErrorResponseBean(
+            		Response.Status.CONFLICT.getStatusCode(),msg)).build();
         }
 
         StratosApiV41Utils.addCartridge(cartridgeDefinitionBean);
         URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeType).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(new SuccessResponseBean(Response.Status.OK.getStatusCode(), 
+        		String.format("Cartridge added successfully: [cartridge-type] %s", cartridgeType))).build();
     }
 
+
 	/**
 	 * Updates the cartridge definition.
 	 *
@@ -169,7 +174,8 @@ public class StratosApiV41 extends AbstractApi {
 			throws RestAPIException {
 		StratosApiV41Utils.updateCartridge(cartridgeDefinitionBean);
 		URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.getType()).build();
-		return Response.created(url).build();
+		return Response.created(url).entity(new SuccessResponseBean(Response.Status.OK.getStatusCode(), 
+        		"Cartridge updated successfully")).build();
 
 	}
     /**
@@ -267,7 +273,9 @@ public class StratosApiV41 extends AbstractApi {
     @AuthorizationAction("/permission/admin/manage/removeCartridge")
     public Response removeCartridge(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
         StratosApiV41Utils.removeCartridge(cartridgeType);
-        return Response.noContent().build();
+        return Response.ok().entity(new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        		String.format("Cartridge deleted successfully: [cartridge-type] %s", cartridgeType))).build();        
+        
     }
 
     // API methods for cartridge groups
@@ -289,7 +297,8 @@ public class StratosApiV41 extends AbstractApi {
             throws RestAPIException {
         StratosApiV41Utils.addServiceGroup(serviceGroupDefinition);
         URI url = uriInfo.getAbsolutePathBuilder().path(serviceGroupDefinition.getName()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        		String.format("Service Group added successfully: [service-group] %s", serviceGroupDefinition.getName()))).build();
     }
 
     /**
@@ -357,7 +366,9 @@ public class StratosApiV41 extends AbstractApi {
             throws RestAPIException {
 
         StratosApiV41Utils.removeServiceGroup(groupDefinitionName);
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Service Group deleted successfully: [service-group] %s",groupDefinitionName))).build();
     }
 
     // API methods for network partitions
@@ -378,12 +389,16 @@ public class StratosApiV41 extends AbstractApi {
         String networkPartitionId = networkPartitionBean.getId();
         NetworkPartitionBean networkPartition = StratosApiV41Utils.getNetworkPartition(networkPartitionId);
         if(networkPartition != null) {
-            log.warn(String.format("Network partition already exists: [network-partition-id] %s", networkPartitionId));
-            return Response.status(Response.Status.CONFLICT).build();
+        	String msg = String.format("Network partition already exists: [network-partition-id] %s", networkPartitionId);
+            log.warn(msg);
+            return Response.status(Response.Status.CONFLICT).entity(
+            		new ErrorResponseBean(Response.Status.CONFLICT.getStatusCode(), msg)).build();
         }
         StratosApiV41Utils.addNetworkPartition(networkPartitionBean);
         URI url = uriInfo.getAbsolutePathBuilder().path(networkPartitionId).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(new SuccessResponseBean(
+        		Response.Status.OK.getStatusCode(),
+        		String.format("Network partition added successfully: [network-partition] %s", networkPartitionId))).build();
     }
 
     /**
@@ -430,7 +445,9 @@ public class StratosApiV41 extends AbstractApi {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
         StratosApiV41Utils.removeNetworkPartition(networkPartitionId);
-        return Response.ok().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Network Partition deleted successfully: [network-partition] %s", networkPartitionId))).build();
     }
 
     // API methods for applications
@@ -451,7 +468,9 @@ public class StratosApiV41 extends AbstractApi {
             throws RestAPIException {
         StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain());
         URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Application added successfully: [application] %s", applicationDefinition.getApplicationId()))).build();
     }
 
     /**
@@ -507,7 +526,9 @@ public class StratosApiV41 extends AbstractApi {
     public Response deployApplication(@PathParam("applicationId") String applicationId, DeploymentPolicyBean deploymentPolicy)
             throws RestAPIException {
         StratosApiV41Utils.deployApplication(applicationId, deploymentPolicy);
-        return Response.accepted().build();
+        return Response.accepted().entity(
+        		new SuccessResponseBean(Response.Status.ACCEPTED.getStatusCode(),
+        				String.format("Application deployed successfully: [application] %s", applicationId))).build();
     }
 
     /**
@@ -547,7 +568,9 @@ public class StratosApiV41 extends AbstractApi {
     public Response addApplicationSignUp(@PathParam("applicationId") String applicationId,
                                          ApplicationSignUpBean applicationSignUpBean) throws RestAPIException {
         StratosApiV41Utils.addApplicationSignUp(applicationId, applicationSignUpBean);
-        return Response.ok().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Successfully signed up for: [application] %s", applicationId))).build();
     }
 
     /**
@@ -603,7 +626,14 @@ public class StratosApiV41 extends AbstractApi {
     public Response addDomainMappings(@PathParam("applicationId") String applicationId,
                                          ApplicationDomainMappingsBean domainMapppingsBean) throws RestAPIException {
         StratosApiV41Utils.addApplicationDomainMappings(applicationId, domainMapppingsBean);
-        return Response.ok().build();
+        List<DomainMappingBean> mappings = domainMapppingsBean.getDomainMappings();
+        List<String> domainMappingList = new ArrayList<String>();
+        for (DomainMappingBean domainMappingBean : mappings) {
+        	domainMappingList.add(domainMappingBean.getDomainName());
+        }
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Domain Mappings added successfully: [domain-mappings] %s",domainMappingList ))).build();
     }
 
     /**
@@ -622,7 +652,14 @@ public class StratosApiV41 extends AbstractApi {
     public Response removeDomainMappings(@PathParam("applicationId") String applicationId,
                                      ApplicationDomainMappingsBean domainMapppingsBean) throws RestAPIException {
         StratosApiV41Utils.removeApplicationDomainMappings(applicationId, domainMapppingsBean);
-        return Response.ok().build();
+        List<DomainMappingBean> mappings = domainMapppingsBean.getDomainMappings();
+        List<String> domainMappingList = new ArrayList<String>();
+        for (DomainMappingBean domainMappingBean : mappings) {
+        	domainMappingList.add(domainMappingBean.getDomainName());
+        }
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Domain Mappings deleted successfully: [domain-mappings] %s", domainMappingList ))).build();
     }
 
     /**
@@ -659,7 +696,9 @@ public class StratosApiV41 extends AbstractApi {
     public Response undeployApplication(@PathParam("applicationId") String applicationId)
             throws RestAPIException {
         StratosApiV41Utils.undeployApplication(applicationId);
-        return Response.accepted().build();
+        return Response.accepted().entity(
+        		new SuccessResponseBean(Response.Status.ACCEPTED.getStatusCode(),
+        				String.format("Application undeployed successfully: [application] %s", applicationId ))).build();
     }
 
     /**
@@ -708,7 +747,9 @@ public class StratosApiV41 extends AbstractApi {
 		    return Response.status(Response.Status.NOT_ACCEPTABLE).build();
 	    }
         StratosApiV41Utils.removeApplication(applicationId);
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Application deleted successfully: [application] %s", applicationId ))).build();
     }
 
     // API methods for autoscaling policies
@@ -766,7 +807,9 @@ public class StratosApiV41 extends AbstractApi {
 
         StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy);
         URI url = uriInfo.getAbsolutePathBuilder().path(autoscalePolicy.getId()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Autoscaling policy added successfully: [autoscale-policy] %s", autoscalePolicy.getId() ))).build();
     }
 
     /**
@@ -785,7 +828,9 @@ public class StratosApiV41 extends AbstractApi {
             throws RestAPIException {
 
         StratosApiV41Utils.updateAutoscalingPolicy(autoscalePolicy);
-        return Response.ok().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Autoscaling policy updated successfully: [autoscale-policy] %s", autoscalePolicy.getId() ))).build();
     }
 
     @PUT
@@ -796,7 +841,9 @@ public class StratosApiV41 extends AbstractApi {
     public Response updateNetworkPartition(NetworkPartitionBean networkPartition) throws RestAPIException {
 
         StratosApiV41Utils.updateNetworkPartition(networkPartition);
-        return Response.ok().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Network Partition updated successfully: [network-partition] %s", networkPartition.getId() ))).build();
     }
 
 	/**
@@ -815,7 +862,9 @@ public class StratosApiV41 extends AbstractApi {
 			throws RestAPIException {
 
 		StratosApiV41Utils.removeAutoscalingPolicy(autoscalingPolicyId);
-		return Response.ok().build();
+		return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Autoscaling policy deleted successfully: [autoscale-policy] %s", autoscalingPolicyId))).build();
 	}
     // API methods for tenants
 
@@ -913,7 +962,9 @@ public class StratosApiV41 extends AbstractApi {
         }
 
         URI url = uriInfo.getAbsolutePathBuilder().path(tenant.getDomain()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Tenant added successfully: [tenant] %s", tenantDomain))).build();
     }
 
     /**
@@ -940,7 +991,9 @@ public class StratosApiV41 extends AbstractApi {
             throw new RestAPIException(msg);
         }
 
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Tenant updated successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
     }
 
     private void updateExistingTenant(org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean) throws Exception {
@@ -1147,7 +1200,8 @@ public class StratosApiV41 extends AbstractApi {
     @SuperTenantService(true)
     public Response removeTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
 
-	    return Response.status(Response.Status.NOT_ACCEPTABLE).entity("Please use the tenant deactivate method").build();
+	    return Response.status(Response.Status.NOT_ACCEPTABLE).entity(new ErrorResponseBean(
+	    		Response.Status.NOT_ACCEPTABLE.getStatusCode(),"Please use the tenant deactivate method")).build();
 
     }
 
@@ -1283,7 +1337,9 @@ public class StratosApiV41 extends AbstractApi {
             throw new RestAPIException(msg, e);
         }
 
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Tenant activated successfully: [tenant] %s", tenantDomain))).build();
     }
 
     /**
@@ -1329,7 +1385,9 @@ public class StratosApiV41 extends AbstractApi {
             throw new RestAPIException(msg, e);
         }
 
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Tenant deactivated successfully: [tenant] %s", tenantDomain))).build();
     }
 
     // API methods for repositories
@@ -1374,7 +1432,9 @@ public class StratosApiV41 extends AbstractApi {
         }
         log.info("Successfully added an user with Username " + userInfoBean.getUserName());
         URI url = uriInfo.getAbsolutePathBuilder().path(userInfoBean.getUserName()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("User added successfully: [user] %s", userInfoBean.getUserName()))).build();
     }
 
     /**
@@ -1399,7 +1459,9 @@ public class StratosApiV41 extends AbstractApi {
             throw new RestAPIException(e.getMessage());
         }
         log.info("Successfully removed user: [username] " + userName);
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("User deleted successfully: [user] %s", userName))).build();
     }
 
     /**
@@ -1426,7 +1488,9 @@ public class StratosApiV41 extends AbstractApi {
         }
 
         log.info("Successfully updated an user with Username " + userInfoBean.getUserName());
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("User updated successfully: [user] %s", userInfoBean.getUserName()))).build();
     }
 
     /**
@@ -1496,7 +1560,9 @@ public class StratosApiV41 extends AbstractApi {
 
         StratosApiV41Utils.addKubernetesCluster(kubernetesCluster);
         URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesCluster.getClusterId()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Kubernetes Host Cluster added successfully: [kub-host-cluster] %s", kubernetesCluster.getClusterId()))).build();
     }
 
     /**
@@ -1517,7 +1583,9 @@ public class StratosApiV41 extends AbstractApi {
 
         StratosApiV41Utils.addKubernetesHost(kubernetesClusterId, kubernetesHost);
         URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build();
-        return Response.created(url).build();
+        return Response.created(url).entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Kubernetes Host added successfully: [kub-host] %s", kubernetesHost.getHostId()))).build();
     }
 
     /**
@@ -1536,7 +1604,9 @@ public class StratosApiV41 extends AbstractApi {
         try {
             StratosApiV41Utils.updateKubernetesMaster(kubernetesMaster);
             URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesMaster.getHostId()).build();
-            return Response.created(url).build();
+            return Response.created(url).entity(
+            		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+            				String.format("Kubernetes Master updated successfully: [kub-master] %s", kubernetesMaster.getHostId()))).build();
         } catch (RestAPIException e) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
@@ -1552,7 +1622,9 @@ public class StratosApiV41 extends AbstractApi {
         try {
             StratosApiV41Utils.updateKubernetesHost(kubernetesHost);
             URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build();
-            return Response.created(url).build();
+            return Response.created(url).entity(
+            		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+            				String.format("Kubernetes Host updated successfully: [kub-host] %s", kubernetesHost.getHostId()))).build();
         } catch (RestAPIException e) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
@@ -1649,7 +1721,9 @@ public class StratosApiV41 extends AbstractApi {
         try {
             StratosApiV41Utils.removeKubernetesCluster(kubernetesClusterId);
         } catch (RestAPIException e) {
-            return Response.status(Response.Status.NOT_FOUND).build();
+            return Response.status(Response.Status.NOT_FOUND).entity(
+            		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+            				String.format("Kubernetes Host Cluster removed successfully: [kub-cluster] %s", kubernetesClusterId))).build();
         }
         return Response.noContent().build();
     }
@@ -1672,7 +1746,9 @@ public class StratosApiV41 extends AbstractApi {
         } catch (RestAPIException e) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
-        return Response.noContent().build();
+        return Response.ok().entity(
+        		new SuccessResponseBean(Response.Status.OK.getStatusCode(),
+        				String.format("Kubernetes Host removed successfully: [kub-host] %s", kubernetesHostId))).build();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 9863967..ca04768 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -34,6 +34,7 @@ import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig;
 import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo;
 import org.apache.stratos.cloud.controller.stub.domain.Persistence;
 import org.apache.stratos.cloud.controller.stub.domain.Volume;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.common.beans.PropertyBean;
 import org.apache.stratos.common.beans.application.ApplicationBean;
 import org.apache.stratos.common.beans.application.GroupBean;
@@ -391,11 +392,11 @@ public class StratosApiV41Utils {
             return convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
         } catch (RemoteException e) {
             String message = e.getMessage();
-            log.error(message, e);
+            log.error(message);
             throw new RestAPIException(message, e);
         } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
-            String message = e.getMessage();
-            log.error(message, e);
+            String message = e.getFaultMessage().getCartridgeNotFoundException().getMessage();
+            log.error(message);
             throw new RestAPIException(message, e);
         }
     }
@@ -1844,4 +1845,5 @@ public class StratosApiV41Utils {
             throw new RuntimeException(message, e);
         }
     }
+
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
index 2fcc638..5ee8ebd 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
@@ -19,6 +19,7 @@ package org.apache.stratos.rest.endpoint.handlers;/*
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.Utils;
 
 import javax.ws.rs.BadRequestException;
@@ -40,6 +41,6 @@ public class BadRequestExceptionMapper implements ExceptionMapper<BadRequestExce
         String errorMsg = badRequestException.getMessage() != null ? badRequestException.getMessage() : "please check" +
                 "your input format";
         return Response.status(Response.Status.BAD_REQUEST).type(MediaType.APPLICATION_JSON).
-                entity(Utils.buildMessage(Response.Status.BAD_REQUEST.getStatusCode(),errorMsg )).build();
+                entity(new ErrorResponseBean(Response.Status.BAD_REQUEST.getStatusCode(),errorMsg)).build();
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
index 3a0e2c5..9588f7b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxrs.ext.RequestHandler;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.message.Message;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.Utils;
 import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
@@ -65,7 +66,9 @@ public class CookieBasedAuthenticationHandler implements RequestHandler {
 
        }
         return Response.status(Response.Status.FORBIDDEN).
-                type(MediaType.APPLICATION_JSON).entity(Utils.buildMessage("The endpoint requires authentication")).build();
+                type(MediaType.APPLICATION_JSON).entity(
+                		new ErrorResponseBean(Response.Status.FORBIDDEN.getStatusCode(), 
+                				"The endpoint requires authentication")).build();
     }
 
     /*

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
index 8682b7d..2863c25 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
@@ -20,6 +20,7 @@ package org.apache.stratos.rest.endpoint.handlers;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.Utils;
 import org.apache.stratos.rest.endpoint.exception.RestAPIException;
 
@@ -47,6 +48,6 @@ public class CustomExceptionMapper implements ExceptionMapper<RestAPIException>
            
         log.error(errorMessage, restAPIException);
         return Response.status(httpStatus.getStatusCode()).type(MediaType.APPLICATION_JSON).
-                entity(Utils.buildMessage(httpStatus.getStatusCode(),errorMessage)).build();
+                entity(new ErrorResponseBean(httpStatus.getStatusCode(),errorMessage)).build();
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
index 74323de..d264cf1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
@@ -19,6 +19,7 @@ package org.apache.stratos.rest.endpoint.handlers;/*
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.Utils;
 
 import javax.ws.rs.core.MediaType;
@@ -34,6 +35,6 @@ public class CustomThrowableExceptionMapper implements ExceptionMapper<Throwable
         }
 
         return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
-                entity(Utils.buildMessage(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), "Internal server error")).build();
+                entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), "Internal server error")).build();
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
index ca28c2b..3e4dc17 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
@@ -20,6 +20,7 @@ package org.apache.stratos.rest.endpoint.handlers;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.Utils;
 
 import javax.ws.rs.WebApplicationException;
@@ -41,6 +42,6 @@ public class GenericExceptionMapper implements ExceptionMapper<WebApplicationExc
         String errorMessage = (webApplicationException.getMessage() != null)?
                 webApplicationException.getMessage():"Internal server error";
         return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
-                entity(Utils.buildMessage(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), errorMessage)).build();
+                entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), errorMessage)).build();
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
index 0894cd7..0a32c9d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
@@ -30,6 +30,7 @@ import org.apache.cxf.jaxrs.ext.RequestHandler;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.security.SecurityContext;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.ServiceHolder;
 import org.apache.stratos.rest.endpoint.Utils;
 import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
@@ -45,6 +46,7 @@ import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import java.util.List;
 
 /**
@@ -85,12 +87,14 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz
             log.error("username is seen as null/empty values");
             return Response.status(Response.Status.UNAUTHORIZED)
                            .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
-                           .entity(Utils.buildMessage("Username cannot be null")).build();
+                           .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), 
+                   				"Username cannot be null")).build();
         } else if (certObject == null && (StringUtils.isEmpty(password))) {
             log.error("password is seen as null/empty values");
             return Response.status(Response.Status.UNAUTHORIZED)
                            .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
-                           .entity(Utils.buildMessage("password cannot be null")).build();
+                           .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), 
+                   				"password cannot be null")).build();
         }
         
         try {
@@ -106,7 +110,7 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz
                     log .error("Invalid domain or unactivated tenant login");
                     // is this the correct HTTP code for this scenario ? (401)
                     return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic").
-                            type(MediaType.APPLICATION_JSON).entity(Utils.buildMessage("Tenant not found")).build();
+                            type(MediaType.APPLICATION_JSON).entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), "Tenant not found")).build();
                 }
             }
             username = MultitenantUtils.getTenantAwareUsername(username);
@@ -132,14 +136,15 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz
                 log.warn(String.format("Unable to authenticate the request: [message-id] %s", message.getId()));
                 // authentication failed, request the authetication, add the realm name if needed to the value of WWW-Authenticate
                 return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic").
-                        type(MediaType.APPLICATION_JSON).entity(Utils.buildMessage("Authentication failed. Please " +
-                        "check your username/password")).build();
+                        type(MediaType.APPLICATION_JSON).entity(new ErrorResponseBean ( Response.Status.UNAUTHORIZED.getStatusCode(), 
+                        		"Authentication failed. Please check your username/password")).build();
             }
         } catch (Exception exception) {
             log.error(String.format("Authentication failed: [message-id] %s", message.getId()),exception);
             // server error in the eyes of the client. Hence 5xx HTTP code.
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
-                    entity(Utils.buildMessage("Unexpected error. Please contact the system admin")).build();
+                    entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
+                    		"Unexpected error. Please contact the system admin")).build();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
index d37fdd1..1ec94d4 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
@@ -28,6 +28,7 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.Utils;
 import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
 import org.wso2.carbon.context.CarbonContext;
@@ -39,6 +40,7 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.*;
@@ -85,7 +87,7 @@ public class StratosAuthorizingHandler implements RequestHandler {
                log.warn("User :"+ userName + "trying to perform unauthrorized action" +
                        " against the resource :"+ targetMethod);
                return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON).
-                       entity(Utils.buildMessage("The user does not have required permissions to " +
+                       entity(new ErrorResponseBean(Response.Status.FORBIDDEN.getStatusCode(), "The user does not have required permissions to " +
                                "perform this operation")).build();
             }
             return null;
@@ -93,7 +95,8 @@ public class StratosAuthorizingHandler implements RequestHandler {
         } catch (Exception exception) {
             log.error("Unexpected error occured while REST api, authorization process",exception);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
-                    entity(Utils.buildMessage("Unexpected error. Please contact the system admin")).build();
+                    entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
+                    		"Unexpected error. Please contact the system admin")).build();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/35a2c1d3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
index f4994fe..12e0261 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
@@ -29,6 +29,7 @@ import org.apache.cxf.jaxrs.ext.RequestHandler;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.security.SecurityContext;
+import org.apache.stratos.common.beans.ErrorResponseBean;
 import org.apache.stratos.rest.endpoint.ServiceHolder;
 import org.apache.stratos.rest.endpoint.Utils;
 import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
@@ -44,6 +45,7 @@ import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import java.util.List;
 
 /**
@@ -80,12 +82,14 @@ public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandl
             log.error("username is seen as null/empty values.");
             return Response.status(Response.Status.UNAUTHORIZED)
                            .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
-                           .entity(Utils.buildMessage("Username cannot be null")).build();
+                           .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
+                        		   "Username cannot be null")).build();
         } else if (certObject == null && ((password == null) || password.equals(""))) {
             log.error("password is seen as null/empty values.");
             return Response.status(Response.Status.UNAUTHORIZED)
                            .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
-                           .entity(Utils.buildMessage("password cannot be null")).build();
+                           .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), 
+                        		   "password cannot be null")).build();
         }
         
         try {
@@ -98,7 +102,8 @@ public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandl
             log.error("Authentication failed",exception);
             // server error in the eyes of the client. Hence 5xx HTTP code.
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
-                    entity(Utils.buildMessage("Unexpected error. Please contact the system admin")).build();
+                    entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), 
+                    		"Unexpected error. Please contact the system admin")).build();
         }
 
     }