You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/02/24 07:49:06 UTC

[2/4] stratos git commit: reformating

reformating


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

Branch: refs/heads/master
Commit: 8e3427cf2183598591cd7e726d47b19730ef25e4
Parents: 3ecb274
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Feb 24 12:14:43 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Feb 24 12:18:45 2015 +0530

----------------------------------------------------------------------
 .../stratos/metadata/service/ServiceHolder.java |  78 +++----
 .../apache/stratos/metadata/service/Utils.java  |  40 ++--
 .../service/annotation/AuthorizationAction.java |   2 +-
 .../service/annotation/SuperTenantService.java  |   2 +-
 .../service/context/AuthenticationContext.java  |  30 +--
 .../service/definition/CartridgeMetaData.java   |  32 ++-
 .../service/definition/NewProperty.java         |  29 ++-
 .../service/definition/PropertyBean.java        |  52 ++---
 .../service/exception/RestAPIException.java     |  68 +++----
 ...tractAuthenticationAuthorizationHandler.java |  55 +++--
 .../CookieBasedAuthenticationHandler.java       | 100 ++++-----
 .../service/handlers/CustomExceptionMapper.java |  46 ++---
 .../CustomThrowableExceptionMapper.java         |  30 +--
 .../handlers/GenericExceptionMapper.java        |  42 ++--
 .../metadata/service/handlers/OAuthHandler.java |   6 +-
 .../handlers/StratosAuthenticationHandler.java  | 202 +++++++++----------
 .../handlers/StratosAuthorizingHandler.java     |   5 +-
 .../service/oauth2/ValidationServiceClient.java |  58 +++---
 .../service/registry/CarbonRegistry.java        |   3 +-
 .../service/registry/DataRegistryFactory.java   |  14 +-
 .../service/security/StratosPrincipal.java      |   2 +-
 .../security/StratosSecurityContext.java        |  30 +--
 .../service/services/MetaDataAdmin.java         | 126 ++++++------
 .../stratos/metadata/service/util/ConfUtil.java |  58 +++---
 .../src/main/resources/axis2_client.xml         |   4 +-
 .../metadata-test/WEB-INF/cxf-servlet.xml       |  12 +-
 .../main/webapp/metadata-test/WEB-INF/web.xml   |   4 +-
 .../webapp/metadata/WEB-INF/cxf-servlet.xml     |  13 +-
 .../src/main/webapp/metadata/WEB-INF/web.xml    |   4 +-
 29 files changed, 568 insertions(+), 579 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/ServiceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/ServiceHolder.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/ServiceHolder.java
index 4a6a8cc..b5c11fe 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/ServiceHolder.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/ServiceHolder.java
@@ -21,9 +21,9 @@ package org.apache.stratos.metadata.service;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.common.TenantBillingService;
-import org.wso2.carbon.tenant.mgt.core.TenantPersistor;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.tenant.mgt.core.TenantPersistor;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;
 import org.wso2.carbon.utils.ConfigurationContextService;
@@ -37,48 +37,48 @@ import org.wso2.carbon.utils.ConfigurationContextService;
  * doing that.
  */
 public class ServiceHolder {
-	private static Log log = LogFactory.getLog(ServiceHolder.class);
+    private static Log log = LogFactory.getLog(ServiceHolder.class);
 
-	public static TenantManager getTenantManager() {
-		PrivilegedCarbonContext carbonContext =
-		                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-		RealmService realmService = (RealmService) carbonContext.getOSGiService(RealmService.class);
-		return realmService.getTenantManager();
-	}
+    public static TenantManager getTenantManager() {
+        PrivilegedCarbonContext carbonContext =
+                PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        RealmService realmService = (RealmService) carbonContext.getOSGiService(RealmService.class);
+        return realmService.getTenantManager();
+    }
 
-	public static TenantBillingService getBillingService() {
-		PrivilegedCarbonContext carbonContext =
-		                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-		TenantBillingService tenantBillingService =
-		                                            (TenantBillingService) carbonContext.getOSGiService(TenantBillingService.class);
-		return tenantBillingService;
-	}
+    public static TenantBillingService getBillingService() {
+        PrivilegedCarbonContext carbonContext =
+                PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        TenantBillingService tenantBillingService =
+                (TenantBillingService) carbonContext.getOSGiService(TenantBillingService.class);
+        return tenantBillingService;
+    }
 
-	public static RealmService getRealmService() {
-		PrivilegedCarbonContext carbonContext =
-		                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-		RealmService realmService = (RealmService) carbonContext.getOSGiService(RealmService.class);
-		return realmService;
-	}
+    public static RealmService getRealmService() {
+        PrivilegedCarbonContext carbonContext =
+                PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        RealmService realmService = (RealmService) carbonContext.getOSGiService(RealmService.class);
+        return realmService;
+    }
 
-	public static RegistryService getRegistryService() {
-		PrivilegedCarbonContext carbonContext =
-		                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-		RegistryService registryService =
-		                                  (RegistryService) carbonContext.getOSGiService(RegistryService.class);
-		return registryService;
-	}
+    public static RegistryService getRegistryService() {
+        PrivilegedCarbonContext carbonContext =
+                PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        RegistryService registryService =
+                (RegistryService) carbonContext.getOSGiService(RegistryService.class);
+        return registryService;
+    }
 
-	public static TenantPersistor getTenantPersistor() {
-		TenantPersistor tenantPersistor = new TenantPersistor();
-		return tenantPersistor;
-	}
+    public static TenantPersistor getTenantPersistor() {
+        TenantPersistor tenantPersistor = new TenantPersistor();
+        return tenantPersistor;
+    }
 
-	public static ConfigurationContextService getConfigurationContext() {
-		PrivilegedCarbonContext carbonContext =
-		                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-		ConfigurationContextService configurationContextService =
-		                                                          (ConfigurationContextService) carbonContext.getOSGiService(ConfigurationContextService.class);
-		return configurationContextService;
-	}
+    public static ConfigurationContextService getConfigurationContext() {
+        PrivilegedCarbonContext carbonContext =
+                PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        ConfigurationContextService configurationContextService =
+                (ConfigurationContextService) carbonContext.getOSGiService(ConfigurationContextService.class);
+        return configurationContextService;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java
index 951bc59..f7b5491 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java
@@ -6,9 +6,9 @@
  * 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
@@ -20,25 +20,25 @@ package org.apache.stratos.metadata.service;
 
 public class Utils {
 
-	public static String buildMessage(int errorCode, String errorMessage) {
-		String jsonResponse =
-		                      "{\"Error\":{" + " \"errorCode\": \" " + errorCode + "\"," +
-		                              " \"errorMessage\": \" " + errorMessage + "\"" + "}" + "}";
-		return jsonResponse;
-	}
+    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 buildMessage(String errorMessage) {
+        String jsonResponse =
+                "{\"Error\":{" + " \"errorCode\": \" " + -1234 + "\"," +
+                        " \"errorMessage\": \" " + errorMessage + "\"" + "}" + "}";
+        return jsonResponse;
+    }
 
-	public static String buildAuthenticationSuccessMessage(String jSessionId) {
-		String jsonResponse =
-		                      "{\"Success\":{" + " \"sessionId\": \"" + jSessionId + "\"" + "}" +
-		                              "}";
-		return jsonResponse;
-	}
+    public static String buildAuthenticationSuccessMessage(String jSessionId) {
+        String jsonResponse =
+                "{\"Success\":{" + " \"sessionId\": \"" + jSessionId + "\"" + "}" +
+                        "}";
+        return jsonResponse;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/AuthorizationAction.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/AuthorizationAction.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/AuthorizationAction.java
index 16a8d14..5f14f03 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/AuthorizationAction.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/AuthorizationAction.java
@@ -32,5 +32,5 @@ import java.lang.annotation.Target;
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = ElementType.METHOD)
 public @interface AuthorizationAction {
-	String[] value();
+    String[] value();
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/SuperTenantService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/SuperTenantService.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/SuperTenantService.java
index df75adc..286cf91 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/SuperTenantService.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/annotation/SuperTenantService.java
@@ -30,5 +30,5 @@ import java.lang.annotation.Target;
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = ElementType.METHOD)
 public @interface SuperTenantService {
-	boolean value();
+    boolean value();
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/context/AuthenticationContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/context/AuthenticationContext.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/context/AuthenticationContext.java
index d975ae1..eebab69 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/context/AuthenticationContext.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/context/AuthenticationContext.java
@@ -20,21 +20,21 @@ package org.apache.stratos.metadata.service.context;
  */
 
 public class AuthenticationContext {
-	// maintaining the authenticated state in threadLocal. We want to skip
-	// subsequent authentication handlers
-	// once a request get authenticated by a handler.
-	private static final ThreadLocal<Boolean> authenticated = new ThreadLocal<Boolean>() {
-		@Override
-		protected Boolean initialValue() {
-			return false;
-		}
-	};
+    // maintaining the authenticated state in threadLocal. We want to skip
+    // subsequent authentication handlers
+    // once a request get authenticated by a handler.
+    private static final ThreadLocal<Boolean> authenticated = new ThreadLocal<Boolean>() {
+        @Override
+        protected Boolean initialValue() {
+            return false;
+        }
+    };
 
-	public static boolean isAthenticated() {
-		return authenticated.get();
-	}
+    public static boolean isAthenticated() {
+        return authenticated.get();
+    }
 
-	public static void setAuthenticated(boolean isAuthenticated) {
-		authenticated.set(isAuthenticated);
-	}
+    public static void setAuthenticated(boolean isAuthenticated) {
+        authenticated.set(isAuthenticated);
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/CartridgeMetaData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/CartridgeMetaData.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/CartridgeMetaData.java
index dec5739..7aca05c 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/CartridgeMetaData.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/CartridgeMetaData.java
@@ -1,36 +1,32 @@
 package org.apache.stratos.metadata.service.definition;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "cartridgeMetaData")
 public class CartridgeMetaData {
-	public String applicationName;
+    public String applicationName;
 
-	public String displayName;
+    public String displayName;
 
-	public String description;
+    public String description;
 
-	public String type;
+    public String type;
 
-	public String provider;
+    public String provider;
 
-	public String host;
+    public String host;
 
-	public String version;
+    public String version;
 
-	public String properties;
+    public String properties;
 
-	@Override
-	public String toString() {
+    @Override
+    public String toString() {
 
-		return "applicationName: " + applicationName + ", displayName: " + displayName +
-		       ", description: " + description + ", type: " + type + ", provider: " + provider +
-		       ", host: " + host + ", Version: " + version + ", properties: " + properties;
-	}
+        return "applicationName: " + applicationName + ", displayName: " + displayName +
+                ", description: " + description + ", type: " + type + ", provider: " + provider +
+                ", host: " + host + ", Version: " + version + ", properties: " + properties;
+    }
 
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/NewProperty.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/NewProperty.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/NewProperty.java
index b933d97..d6627c3 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/NewProperty.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/NewProperty.java
@@ -19,26 +19,26 @@
 
 package org.apache.stratos.metadata.service.definition;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@XmlRootElement(name="properties")
-public class NewProperty implements Serializable{
+@XmlRootElement(name = "properties")
+public class NewProperty implements Serializable {
 
     private String key;
     private List<String> values = new ArrayList<String>();
 
-    public NewProperty(){}
-    public NewProperty(String key, String value){
-        this.key=key;
+    public NewProperty() {
+    }
+
+    public NewProperty(String key, String value) {
+        this.key = key;
         this.values.add(value);
     }
-    
+
     public String getKey() {
         return key;
     }
@@ -47,22 +47,21 @@ public class NewProperty implements Serializable{
         this.key = key;
     }
 
-    public String[] getValues(){
+    public String[] getValues() {
         String[] values = new String[this.values.size()];
         values = this.values.toArray(values);
         return values;
     }
 
-    public void setValues(String[] values) {
-        this.values.addAll(Arrays.asList(values));
-    }
-
-
     public void setValues(String value) {
         this.values.add(value);
     }
 
-    public void addValue(String value){
+    public void setValues(String[] values) {
+        this.values.addAll(Arrays.asList(values));
+    }
+
+    public void addValue(String value) {
         this.values.add(value);
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/PropertyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/PropertyBean.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/PropertyBean.java
index 06f293d..f1defab 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/PropertyBean.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/definition/PropertyBean.java
@@ -24,38 +24,38 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "properties")
 public class PropertyBean {
 
-	private String hostname;
+    private String hostname;
 
-	private String username;
-	private String password;
+    private String username;
+    private String password;
 
-	public String getHostname() {
-		return hostname;
-	}
+    public String getHostname() {
+        return hostname;
+    }
 
-	public void setHostname(String hostname) {
-		this.hostname = hostname;
-	}
+    public void setHostname(String hostname) {
+        this.hostname = hostname;
+    }
 
-	public String getUsername() {
-		return username;
-	}
+    public String getUsername() {
+        return username;
+    }
 
-	public void setUsername(String username) {
-		this.username = username;
-	}
+    public void setUsername(String username) {
+        this.username = username;
+    }
 
-	public String getPassword() {
-		return password;
-	}
+    public String getPassword() {
+        return password;
+    }
 
-	public void setPassword(String password) {
-		this.password = password;
-	}
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
-	@Override
-	public String toString() {
-		return " [hostname: " + getHostname() + ", username: " + getUsername() + ", password: " + getPassword() +
-				"]";
-	}
+    @Override
+    public String toString() {
+        return " [hostname: " + getHostname() + ", username: " + getUsername() + ", password: " + getPassword() +
+                "]";
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/exception/RestAPIException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/exception/RestAPIException.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/exception/RestAPIException.java
index edb9a59..9eeb695 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/exception/RestAPIException.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/exception/RestAPIException.java
@@ -23,48 +23,48 @@ import javax.ws.rs.core.Response;
 
 public class RestAPIException extends Exception {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private String message;
-	private Response.Status httpStatusCode;
+    private String message;
+    private Response.Status httpStatusCode;
 
-	public RestAPIException() {
-		super();
-	}
+    public RestAPIException() {
+        super();
+    }
 
-	public RestAPIException(String message, Throwable cause) {
-		super(message, cause);
-		this.message = message;
-	}
+    public RestAPIException(String message, Throwable cause) {
+        super(message, cause);
+        this.message = message;
+    }
 
-	public RestAPIException(Response.Status httpStatusCode, String message, Throwable cause) {
-		super(message, cause);
-		this.message = message;
-		this.httpStatusCode = httpStatusCode;
-	}
+    public RestAPIException(Response.Status httpStatusCode, String message, Throwable cause) {
+        super(message, cause);
+        this.message = message;
+        this.httpStatusCode = httpStatusCode;
+    }
 
-	public RestAPIException(String message) {
-		super(message);
-		this.message = message;
-	}
+    public RestAPIException(String message) {
+        super(message);
+        this.message = message;
+    }
 
-	public RestAPIException(Response.Status httpStatusCode, String message) {
-		super(message);
-		this.message = message;
-		this.httpStatusCode = httpStatusCode;
-	}
+    public RestAPIException(Response.Status httpStatusCode, String message) {
+        super(message);
+        this.message = message;
+        this.httpStatusCode = httpStatusCode;
+    }
 
-	public RestAPIException(Throwable cause) {
-		super(cause);
-	}
+    public RestAPIException(Throwable cause) {
+        super(cause);
+    }
 
-	@Override
-	public String getMessage() {
-		return message;
-	}
+    @Override
+    public String getMessage() {
+        return message;
+    }
 
-	public Response.Status getHTTPStatusCode() {
-		return httpStatusCode;
-	}
+    public Response.Status getHTTPStatusCode() {
+        return httpStatusCode;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
index f96bc69..4be5efe 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
@@ -6,9 +6,9 @@
  * 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
@@ -18,11 +18,6 @@
  */
 package org.apache.stratos.metadata.service.handlers;
 
-import java.util.List;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxrs.ext.RequestHandler;
@@ -31,26 +26,30 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.message.Message;
 import org.apache.stratos.metadata.service.context.AuthenticationContext;
 
-public abstract class AbstractAuthenticationAuthorizationHandler implements RequestHandler {
-	private final Log log = LogFactory.getLog(AbstractAuthenticationAuthorizationHandler.class);
-
-	@Override
-	public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
-		HttpHeaders headers = new HttpHeadersImpl(message);
-		List<String> authHeader = headers.getRequestHeader(HttpHeaders.AUTHORIZATION);
-		if (log.isDebugEnabled()) {
-			log.debug("Executing " + this.getClass());
-		}
-		if (!AuthenticationContext.isAthenticated() && authHeader != null &&
-		    authHeader.size() > 0 && canHandle(authHeader.get(0).trim().split(" ")[0])) {
-			return handle(message, classResourceInfo);
-		}
-		// give the control to the next handler
-		return null;
-
-	}
-
-	protected abstract boolean canHandle(String authHeaderPrefix);
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import java.util.List;
 
-	protected abstract Response handle(Message message, ClassResourceInfo classResourceInfo);
+public abstract class AbstractAuthenticationAuthorizationHandler implements RequestHandler {
+    private final Log log = LogFactory.getLog(AbstractAuthenticationAuthorizationHandler.class);
+
+    @Override
+    public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
+        HttpHeaders headers = new HttpHeadersImpl(message);
+        List<String> authHeader = headers.getRequestHeader(HttpHeaders.AUTHORIZATION);
+        if (log.isDebugEnabled()) {
+            log.debug("Executing " + this.getClass());
+        }
+        if (!AuthenticationContext.isAthenticated() && authHeader != null &&
+                authHeader.size() > 0 && canHandle(authHeader.get(0).trim().split(" ")[0])) {
+            return handle(message, classResourceInfo);
+        }
+        // give the control to the next handler
+        return null;
+
+    }
+
+    protected abstract boolean canHandle(String authHeaderPrefix);
+
+    protected abstract Response handle(Message message, ClassResourceInfo classResourceInfo);
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CookieBasedAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CookieBasedAuthenticationHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CookieBasedAuthenticationHandler.java
index 39bbaa5..de6da63 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CookieBasedAuthenticationHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CookieBasedAuthenticationHandler.java
@@ -18,11 +18,6 @@
  */
 package org.apache.stratos.metadata.service.handlers;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxrs.ext.RequestHandler;
@@ -32,6 +27,11 @@ import org.apache.stratos.metadata.service.Utils;
 import org.apache.stratos.metadata.service.context.AuthenticationContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
 /*
  * authenticate an incoming request using the session availability. Session is
  * first established using the
@@ -40,55 +40,55 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
  * too provide a session would result in an authentication failure.
  */
 public class CookieBasedAuthenticationHandler implements RequestHandler {
-	private final Log log = LogFactory.getLog(CookieBasedAuthenticationHandler.class);
+    private final Log log = LogFactory.getLog(CookieBasedAuthenticationHandler.class);
 
-	@Override
-	public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
-		if (AuthenticationContext.isAthenticated()) {
-			return null;
-		}
+    @Override
+    public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
+        if (AuthenticationContext.isAthenticated()) {
+            return null;
+        }
 
-		HttpServletRequest httpServletRequest = (HttpServletRequest) message.get("HTTP.REQUEST");
-		HttpSession httpSession = httpServletRequest.getSession(false);
-		if (httpSession != null && isUserLoggedIn(httpSession)) { // if sesion
-			                                                      // is
-			                                                      // avaialble
-			String userName = (String) httpSession.getAttribute("userName");
-			String tenantDomain = (String) httpSession.getAttribute("tenantDomain");
-			int tenantId = (Integer) httpSession.getAttribute("tenantId");
-			// the following will get used by the authorization handler..
-			PrivilegedCarbonContext carbonContext =
-			                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-			carbonContext.setUsername(userName);
-			carbonContext.setTenantDomain(tenantDomain);
-			carbonContext.setTenantId(tenantId);
+        HttpServletRequest httpServletRequest = (HttpServletRequest) message.get("HTTP.REQUEST");
+        HttpSession httpSession = httpServletRequest.getSession(false);
+        if (httpSession != null && isUserLoggedIn(httpSession)) { // if sesion
+            // is
+            // avaialble
+            String userName = (String) httpSession.getAttribute("userName");
+            String tenantDomain = (String) httpSession.getAttribute("tenantDomain");
+            int tenantId = (Integer) httpSession.getAttribute("tenantId");
+            // the following will get used by the authorization handler..
+            PrivilegedCarbonContext carbonContext =
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext();
+            carbonContext.setUsername(userName);
+            carbonContext.setTenantDomain(tenantDomain);
+            carbonContext.setTenantId(tenantId);
 
-			AuthenticationContext.setAuthenticated(true);
-			if (log.isDebugEnabled()) {
-				log.debug("authenticated using the " +
-				          CookieBasedAuthenticationHandler.class.getName() + "for username  :" +
-				          userName + "tenantDomain : " + tenantDomain + " tenantId : " + tenantId);
-			}
-			return null;
+            AuthenticationContext.setAuthenticated(true);
+            if (log.isDebugEnabled()) {
+                log.debug("authenticated using the " +
+                        CookieBasedAuthenticationHandler.class.getName() + "for username  :" +
+                        userName + "tenantDomain : " + tenantDomain + " tenantId : " + tenantId);
+            }
+            return null;
 
-		}
-		return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON)
-		               .entity(Utils.buildMessage("The endpoint requires authentication")).build();
-	}
+        }
+        return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON)
+                .entity(Utils.buildMessage("The endpoint requires authentication")).build();
+    }
 
-	/*
-	 * if the userName and tenantDomain is present in the session, we conclude
-	 * this as an authenticated session.
-	 * Thos params get set by the AuthenticationAdmin endpoint.
-	 */
-	private boolean isUserLoggedIn(HttpSession httpSession) {
-		String userName = (String) httpSession.getAttribute("userName");
-		String tenantDomain = (String) httpSession.getAttribute("tenantDomain");
-		Integer tenantId = (Integer) httpSession.getAttribute("tenantId");
-		if (userName != null && tenantDomain != null && tenantId != null) {
-			return true;
-		}
-		return false;
-	}
+    /*
+     * if the userName and tenantDomain is present in the session, we conclude
+     * this as an authenticated session.
+     * Thos params get set by the AuthenticationAdmin endpoint.
+     */
+    private boolean isUserLoggedIn(HttpSession httpSession) {
+        String userName = (String) httpSession.getAttribute("userName");
+        String tenantDomain = (String) httpSession.getAttribute("tenantDomain");
+        Integer tenantId = (Integer) httpSession.getAttribute("tenantId");
+        if (userName != null && tenantDomain != null && tenantId != null) {
+            return true;
+        }
+        return false;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomExceptionMapper.java
index 7e58c5d..92e486b 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomExceptionMapper.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomExceptionMapper.java
@@ -6,9 +6,9 @@
  * 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
@@ -18,30 +18,30 @@
  */
 package org.apache.stratos.metadata.service.handlers;
 
+import org.apache.stratos.metadata.service.Utils;
+import org.apache.stratos.metadata.service.exception.RestAPIException;
+
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
-import org.apache.stratos.metadata.service.Utils;
-import org.apache.stratos.metadata.service.exception.RestAPIException;
-
 public class CustomExceptionMapper implements ExceptionMapper<RestAPIException> {
-	@Override
-	public Response toResponse(RestAPIException restAPIException) {
-		// if no specific error message specified, spitting out a generaic error
-		// message
-		String errorMessage =
-		                      (restAPIException.getMessage() != null)
-		                                                             ? restAPIException.getMessage()
-		                                                             : "Error while fullfilling the request";
-		// if no specific error specified we are throwing the bad request http
-		// status code by default
-		Response.Status httpStatus =
-		                             (restAPIException.getHTTPStatusCode() != null)
-		                                                                           ? restAPIException.getHTTPStatusCode()
-		                                                                           : Response.Status.BAD_REQUEST;
-		return Response.status(Response.Status.BAD_REQUEST).type(MediaType.APPLICATION_JSON)
-		               .entity(Utils.buildMessage(httpStatus.getStatusCode(), errorMessage))
-		               .build();
-	}
+    @Override
+    public Response toResponse(RestAPIException restAPIException) {
+        // if no specific error message specified, spitting out a generaic error
+        // message
+        String errorMessage =
+                (restAPIException.getMessage() != null)
+                        ? restAPIException.getMessage()
+                        : "Error while fullfilling the request";
+        // if no specific error specified we are throwing the bad request http
+        // status code by default
+        Response.Status httpStatus =
+                (restAPIException.getHTTPStatusCode() != null)
+                        ? restAPIException.getHTTPStatusCode()
+                        : Response.Status.BAD_REQUEST;
+        return Response.status(Response.Status.BAD_REQUEST).type(MediaType.APPLICATION_JSON)
+                .entity(Utils.buildMessage(httpStatus.getStatusCode(), errorMessage))
+                .build();
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomThrowableExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomThrowableExceptionMapper.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomThrowableExceptionMapper.java
index 8db8df6..0ce45fe 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomThrowableExceptionMapper.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/CustomThrowableExceptionMapper.java
@@ -19,26 +19,26 @@ package org.apache.stratos.metadata.service.handlers;
  * under the License.
  */
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.metadata.service.Utils;
 
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
 public class CustomThrowableExceptionMapper implements ExceptionMapper<Throwable> {
-	private static Log log = LogFactory.getLog(CustomThrowableExceptionMapper.class);
+    private static Log log = LogFactory.getLog(CustomThrowableExceptionMapper.class);
 
-	@Override
-	public Response toResponse(Throwable throwable) {
-		if (log.isDebugEnabled()) {
-			log.debug("Internal server error", throwable);
-		}
+    @Override
+    public Response toResponse(Throwable throwable) {
+        if (log.isDebugEnabled()) {
+            log.debug("Internal server error", 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();
-	}
+        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();
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/GenericExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/GenericExceptionMapper.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/GenericExceptionMapper.java
index 97016f8..74dd554 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/GenericExceptionMapper.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/GenericExceptionMapper.java
@@ -18,37 +18,37 @@
  */
 package org.apache.stratos.metadata.service.handlers;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.metadata.service.Utils;
+
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.metadata.service.Utils;
-
 /*
  * This class maps any exception thrown by the server, which is not mapped by a
  * specifi exception mapper
  * in to an appropriate format
  */
 public class GenericExceptionMapper implements ExceptionMapper<WebApplicationException> {
-	private static Log log = LogFactory.getLog(GenericExceptionMapper.class);
+    private static Log log = LogFactory.getLog(GenericExceptionMapper.class);
 
-	@Override
-	public Response toResponse(WebApplicationException webApplicationException) {
-		if (log.isDebugEnabled()) {
-			log.debug("Internal erver error", webApplicationException);
-		}
-		// if no specific error message specified, spitting out a generaic error
-		// message
-		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();
-	}
+    @Override
+    public Response toResponse(WebApplicationException webApplicationException) {
+        if (log.isDebugEnabled()) {
+            log.debug("Internal erver error", webApplicationException);
+        }
+        // if no specific error message specified, spitting out a generaic error
+        // message
+        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();
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
index 33d3b31..431fd2e 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
@@ -81,9 +81,9 @@ public class OAuthHandler extends AbstractAuthenticationAuthorizationHandler {
                 String basePath = (String) message.get(Message.BASE_PATH);
                 String requestedAppId = extractApplicationIdFromUrl(requestUrl, basePath);
 
-                if(org.apache.commons.lang3.StringUtils.isEmpty(appId) || org.apache.commons.lang3.StringUtils.isEmpty(requestedAppId)){
+                if (org.apache.commons.lang3.StringUtils.isEmpty(appId) || org.apache.commons.lang3.StringUtils.isEmpty(requestedAppId)) {
                     valid = false;
-                }else{
+                } else {
                     valid = appId.equals(requestedAppId);
                 }
 
@@ -121,7 +121,7 @@ public class OAuthHandler extends AbstractAuthenticationAuthorizationHandler {
                     new RSASSAVerifier((RSAPublicKey) keyStoreManager.getDefaultPublicKey());
             SignedJWT jwsObject = SignedJWT.parse(token);
             if (jwsObject.verify(verifier)) {
-               appId = jwsObject.getJWTClaimsSet().getStringClaim("appId");
+                appId = jwsObject.getJWTClaimsSet().getStringClaim("appId");
             }
 
         } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthenticationHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthenticationHandler.java
index 53749b8..1a2fe84 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthenticationHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthenticationHandler.java
@@ -18,10 +18,6 @@
  */
 package org.apache.stratos.metadata.service.handlers;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -30,9 +26,9 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.security.SecurityContext;
 import org.apache.stratos.metadata.service.ServiceHolder;
-import org.apache.stratos.metadata.service.security.StratosSecurityContext;
 import org.apache.stratos.metadata.service.Utils;
 import org.apache.stratos.metadata.service.context.AuthenticationContext;
+import org.apache.stratos.metadata.service.security.StratosSecurityContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.util.AnonymousSessionUtil;
 import org.wso2.carbon.registry.core.service.RegistryService;
@@ -40,6 +36,10 @@ import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
 /**
  * Here we are doing the request authentication within a {@link RequestHandler}.
  * The request handlers
@@ -48,109 +48,109 @@ import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
  * of HTTP basic auth headers as the authentication mechanism.
  */
 public class StratosAuthenticationHandler extends AbstractAuthenticationAuthorizationHandler {
-	private static Log log = LogFactory.getLog(StratosAuthenticationHandler.class);
-	private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
+    private static Log log = LogFactory.getLog(StratosAuthenticationHandler.class);
+    private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
 
-	@Override
-	public boolean canHandle(String authHeaderPrefix) {
-		return SUPPORTED_AUTHENTICATION_TYPE.equals(authHeaderPrefix);
-	}
+    @Override
+    public boolean canHandle(String authHeaderPrefix) {
+        return SUPPORTED_AUTHENTICATION_TYPE.equals(authHeaderPrefix);
+    }
 
-	/**
-	 * Authenticate the user against the user store. Once authenticate, populate
-	 * the {@link org.wso2.carbon.context.CarbonContext} to be used by the
-	 * downstream code.
-	 * 
-	 * @param message
-	 * @param classResourceInfo
-	 * @return
-	 */
-	@Override
-	public Response handle(Message message, ClassResourceInfo classResourceInfo) {
-		// If Mutual SSL is enabled
-		HttpServletRequest request = (HttpServletRequest) message.get("HTTP.REQUEST");
-		Object certObject = request.getAttribute("javax.servlet.request.X509Certificate");
+    /**
+     * Authenticate the user against the user store. Once authenticate, populate
+     * the {@link org.wso2.carbon.context.CarbonContext} to be used by the
+     * downstream code.
+     *
+     * @param message
+     * @param classResourceInfo
+     * @return
+     */
+    @Override
+    public Response handle(Message message, ClassResourceInfo classResourceInfo) {
+        // If Mutual SSL is enabled
+        HttpServletRequest request = (HttpServletRequest) message.get("HTTP.REQUEST");
+        Object certObject = request.getAttribute("javax.servlet.request.X509Certificate");
 
-		AuthorizationPolicy policy = message.get(AuthorizationPolicy.class);
-		String username = policy.getUserName().trim();
-		String password = policy.getPassword().trim();
+        AuthorizationPolicy policy = message.get(AuthorizationPolicy.class);
+        String username = policy.getUserName().trim();
+        String password = policy.getPassword().trim();
 
-		// sanity check
-		if ((username == null) || username.equals("")) {
-			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();
-		} 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();
-		}
+        // sanity check
+        if ((username == null) || username.equals("")) {
+            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();
+        } 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();
+        }
 
-		try {
-			RealmService realmService = ServiceHolder.getRealmService();
-			RegistryService registryService = ServiceHolder.getRegistryService();
-			String tenantDomain = MultitenantUtils.getTenantDomain(username);
-			int tenantId = realmService.getTenantManager().getTenantId(tenantDomain);
+        try {
+            RealmService realmService = ServiceHolder.getRealmService();
+            RegistryService registryService = ServiceHolder.getRegistryService();
+            String tenantDomain = MultitenantUtils.getTenantDomain(username);
+            int tenantId = realmService.getTenantManager().getTenantId(tenantDomain);
 
-			UserRealm userRealm = null;
-			if (certObject == null) {
-				userRealm =
-				            AnonymousSessionUtil.getRealmByTenantDomain(registryService,
-				                                                        realmService, tenantDomain);
-				if (userRealm == null) {
-					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();
-				}
-			}
-			username = MultitenantUtils.getTenantAwareUsername(username);
-			if (certObject != null ||
-			    userRealm.getUserStoreManager().authenticate(username, password)) { // if
-				                                                                    // authenticated
+            UserRealm userRealm = null;
+            if (certObject == null) {
+                userRealm =
+                        AnonymousSessionUtil.getRealmByTenantDomain(registryService,
+                                realmService, tenantDomain);
+                if (userRealm == null) {
+                    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();
+                }
+            }
+            username = MultitenantUtils.getTenantAwareUsername(username);
+            if (certObject != null ||
+                    userRealm.getUserStoreManager().authenticate(username, password)) { // if
+                // authenticated
 
-				// setting the correct tenant info for downstream code..
-				PrivilegedCarbonContext carbonContext =
-				                                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
-				carbonContext.setTenantDomain(tenantDomain);
-				carbonContext.setTenantId(tenantId);
-				carbonContext.setUsername(username);
-				// populate the secuirtyContext of authenticated user
-				SecurityContext securityContext = new StratosSecurityContext(username);
-				message.put(SecurityContext.class, securityContext);
+                // setting the correct tenant info for downstream code..
+                PrivilegedCarbonContext carbonContext =
+                        PrivilegedCarbonContext.getThreadLocalCarbonContext();
+                carbonContext.setTenantDomain(tenantDomain);
+                carbonContext.setTenantId(tenantId);
+                carbonContext.setUsername(username);
+                // populate the secuirtyContext of authenticated user
+                SecurityContext securityContext = new StratosSecurityContext(username);
+                message.put(SecurityContext.class, securityContext);
 
-				// set the authenticated flag and let the request to continue
-				AuthenticationContext.setAuthenticated(true);
-				if (log.isDebugEnabled()) {
-					log.debug("authenticated using the " +
-					          CookieBasedAuthenticationHandler.class.getName() + "for username  :" +
-					          username + "tenantDomain : " + tenantDomain + " tenantId : " +
-					          tenantId);
-				}
-				return null;
-			} else {
-				log.warn("unable to authenticate the request");
-				// 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();
-			}
-		} catch (Exception exception) {
-			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();
-		}
+                // set the authenticated flag and let the request to continue
+                AuthenticationContext.setAuthenticated(true);
+                if (log.isDebugEnabled()) {
+                    log.debug("authenticated using the " +
+                            CookieBasedAuthenticationHandler.class.getName() + "for username  :" +
+                            username + "tenantDomain : " + tenantDomain + " tenantId : " +
+                            tenantId);
+                }
+                return null;
+            } else {
+                log.warn("unable to authenticate the request");
+                // 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();
+            }
+        } catch (Exception exception) {
+            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();
+        }
 
-	}
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthorizingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthorizingHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthorizingHandler.java
index 5b1c9a4..e09c610 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthorizingHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/StratosAuthorizingHandler.java
@@ -51,15 +51,14 @@ import java.util.*;
  * by the {@link org.apache.cxf.jaxrs.security.SimpleAuthorizingFilter}
  */
 public class StratosAuthorizingHandler implements RequestHandler {
-    private final Log log = LogFactory.getLog(StratosAuthorizingHandler.class);
-
-    private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
     private static final String AUTHORIZATION_ANNOTATION_CLASS_NAME =
             "org.apache.stratos.metadata.service.annotation.AuthorizationAction";
     private static final String TENANT_ANNOTATION_CLASS_NAME =
             "org.apache.stratos.metadata.service.annotation.SuperTenantService";
     private static final String ACTION_ON_RESOURCE = "ui.execute";
     private static final Set<String> SKIP_METHODS;
+    private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
+    private final Log log = LogFactory.getLog(StratosAuthorizingHandler.class);
     private Map<String, String> authorizationActionMap = Collections.emptyMap();
     private Set<String> superTenantServiceSet = Collections.emptySet();
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
index d4810c6..2c03b35 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
@@ -18,48 +18,48 @@
  */
 package org.apache.stratos.metadata.service.oauth2;
 
-import java.rmi.RemoteException;
-
 import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.wso2.carbon.utils.CarbonUtils;
 import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
 import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;
 import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import java.rmi.RemoteException;
 
 /**
  * Service class wrapper for OAuthTokenValidation endpoint.
  */
 public class ValidationServiceClient {
-	private OAuth2TokenValidationServiceStub stub = null;
-	private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class);
+    private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class);
+    private OAuth2TokenValidationServiceStub stub = null;
 
-	public ValidationServiceClient(String backendServerURL, String username, String password)
-	                                                                                         throws Exception {
-		String serviceURL = backendServerURL + "OAuth2TokenValidationService";
-		try {
-			stub = new OAuth2TokenValidationServiceStub(serviceURL);
-			CarbonUtils.setBasicAccessSecurityHeaders(username, password, true,
-			                                          stub._getServiceClient());
-		} catch (AxisFault e) {
-			log.error("Error initializing OAuth2 Client");
-			throw new Exception("Error initializing OAuth Client", e);
-		}
-	}
+    public ValidationServiceClient(String backendServerURL, String username, String password)
+            throws Exception {
+        String serviceURL = backendServerURL + "OAuth2TokenValidationService";
+        try {
+            stub = new OAuth2TokenValidationServiceStub(serviceURL);
+            CarbonUtils.setBasicAccessSecurityHeaders(username, password, true,
+                    stub._getServiceClient());
+        } catch (AxisFault e) {
+            log.error("Error initializing OAuth2 Client");
+            throw new Exception("Error initializing OAuth Client", e);
+        }
+    }
 
-	public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken)
-	                                                                                         throws Exception {
-		OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO();
-		oauthReq.setAccessToken(accessToken);
-		oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
-		try {
-			return stub.validate(oauthReq);
-		} catch (RemoteException e) {
-			log.error("Error while validating OAuth2 request");
-			throw new Exception("Error while validating OAuth2 request", e);
-		}
-	}
+    public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken)
+            throws Exception {
+        OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO();
+        oauthReq.setAccessToken(accessToken);
+        oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
+        try {
+            return stub.validate(oauthReq);
+        } catch (RemoteException e) {
+            log.error("Error while validating OAuth2 request");
+            throw new Exception("Error while validating OAuth2 request", e);
+        }
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
index aaef6ea..e52c028 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
@@ -40,12 +40,11 @@ import java.util.*;
 
 public class CarbonRegistry implements DataStore {
 
+    private static final String mainResource = "metadata/";
     private static Log log = LogFactory.getLog(CarbonRegistry.class);
     @Context
     HttpServletRequest httpServletRequest;
 
-    private static final String mainResource = "metadata/";
-
     public CarbonRegistry() {
     }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/DataRegistryFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/DataRegistryFactory.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/DataRegistryFactory.java
index 981560c..298fffd 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/DataRegistryFactory.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/DataRegistryFactory.java
@@ -23,11 +23,11 @@ package org.apache.stratos.metadata.service.registry;
  */
 public class DataRegistryFactory {
 
-	public static DataStore getDataStore(String registryName) {
-		if (registryName.equals("carbon")) {
-			return new CarbonRegistry();
-		} else {
-			return null;
-		}
-	}
+    public static DataStore getDataStore(String registryName) {
+        if (registryName.equals("carbon")) {
+            return new CarbonRegistry();
+        } else {
+            return null;
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
index 9f0c835..5bd6336 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
@@ -36,7 +36,7 @@ public class StratosPrincipal implements Principal {
     }
 
     public boolean equals(Object another) {
-      return userName.equals((another));
+        return userName.equals((another));
     }
 
     public String toString() {

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosSecurityContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosSecurityContext.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosSecurityContext.java
index fbc4b1a..6a3145b 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosSecurityContext.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosSecurityContext.java
@@ -18,33 +18,33 @@
  */
 package org.apache.stratos.metadata.service.security;
 
-import java.security.Principal;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.security.SecurityContext;
 
+import java.security.Principal;
+
 /**
  * {@link StratosSecurityContext} is what get passed between authentication
  * handlers
  * and the authorization handler.
  */
 public class StratosSecurityContext implements SecurityContext {
-	private static Log log = LogFactory.getLog(StratosSecurityContext.class);
-	Principal principal;
+    private static Log log = LogFactory.getLog(StratosSecurityContext.class);
+    Principal principal;
 
-	public StratosSecurityContext(String user) {
-		this.principal = new StratosPrincipal(user);
-	}
+    public StratosSecurityContext(String user) {
+        this.principal = new StratosPrincipal(user);
+    }
 
-	@Override
-	public Principal getUserPrincipal() {
-		return principal;
-	}
+    @Override
+    public Principal getUserPrincipal() {
+        return principal;
+    }
 
-	@Override
-	public boolean isUserInRole(String role) {
-		return false;
-	}
+    @Override
+    public boolean isUserInRole(String role) {
+        return false;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
index 0a73b0a..6b43d95 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
@@ -39,22 +39,18 @@ import java.util.List;
 
 @Path("/")
 public class MetaDataAdmin {
+    private static Log log = LogFactory.getLog(MetaDataAdmin.class);
     @Context
     UriInfo uriInfo;
-
-    private static Log log = LogFactory.getLog(MetaDataAdmin.class);
-
-
-
     private DataStore registry;
 
     /**
      * Meta data admin configuration loading
      */
-    public MetaDataAdmin(){
+    public MetaDataAdmin() {
         XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
         String DEFAULT_REG_TYPE = "carbon";
-        String registryType =  conf.getString("metadataservice.govenanceregistrytype", DEFAULT_REG_TYPE);
+        String registryType = conf.getString("metadataservice.govenanceregistrytype", DEFAULT_REG_TYPE);
         registry = DataRegistryFactory.getDataStore(registryType);
     }
 
@@ -67,18 +63,18 @@ public class MetaDataAdmin {
 
         List<NewProperty> properties;
         NewProperty[] propertiesArr = null;
-	    try {
-		    properties = registry
-				    .getPropertiesOfCluster(applicationId, clusterId);
-		    if (properties != null) {
-			    propertiesArr = new NewProperty[properties.size()];
-			    propertiesArr = properties.toArray(propertiesArr);
-		    }
-	    } catch (RegistryException e) {
-		    String msg = "Error occurred while getting properties ";
-		    log.error(msg, e);
-		    throw new RestAPIException(msg, e);
-	    }
+        try {
+            properties = registry
+                    .getPropertiesOfCluster(applicationId, clusterId);
+            if (properties != null) {
+                propertiesArr = new NewProperty[properties.size()];
+                propertiesArr = properties.toArray(propertiesArr);
+            }
+        } catch (RegistryException e) {
+            String msg = "Error occurred while getting properties ";
+            log.error(msg, e);
+            throw new RestAPIException(msg, e);
+        }
 
         Response.ResponseBuilder rb;
         if (propertiesArr == null) {
@@ -94,29 +90,29 @@ public class MetaDataAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Response getClusterProperty(@PathParam("application_id") String applicationId, @PathParam("cluster_id") String clusterId, @PathParam("property_name") String propertyName) throws RestAPIException{
+    public Response getClusterProperty(@PathParam("application_id") String applicationId, @PathParam("cluster_id") String clusterId, @PathParam("property_name") String propertyName) throws RestAPIException {
         List<NewProperty> properties;
 
 
         NewProperty property = null;
 
-	    try {
-		    properties = registry
-				    .getPropertiesOfCluster(applicationId, clusterId);
-		    if (properties == null) {
-			    return Response.status(Response.Status.NOT_FOUND).build();
-		    }
-		    for (NewProperty p : properties) {
-			    if (propertyName.equals(p.getKey())) {
-				    property = p;
-				    break;
-			    }
-		    }
-	    } catch (RegistryException e) {
-		    String msg = "Error occurred while getting property";
-		    log.error(msg, e);
-		    throw new RestAPIException(msg, e);
-	    }
+        try {
+            properties = registry
+                    .getPropertiesOfCluster(applicationId, clusterId);
+            if (properties == null) {
+                return Response.status(Response.Status.NOT_FOUND).build();
+            }
+            for (NewProperty p : properties) {
+                if (propertyName.equals(p.getKey())) {
+                    property = p;
+                    break;
+                }
+            }
+        } catch (RegistryException e) {
+            String msg = "Error occurred while getting property";
+            log.error(msg, e);
+            throw new RestAPIException(msg, e);
+        }
 
         Response.ResponseBuilder rb;
         if (property == null) {
@@ -135,18 +131,18 @@ public class MetaDataAdmin {
     public Response addPropertyToACluster(@PathParam("application_id") String applicationId, @PathParam("cluster_id") String clusterId, NewProperty property)
             throws RestAPIException {
 
-        URI url =  uriInfo.getAbsolutePathBuilder().path(applicationId + "/" + clusterId + "/" + property.getKey()).build();
-        if(StringUtils.isEmpty(property.getKey())){
+        URI url = uriInfo.getAbsolutePathBuilder().path(applicationId + "/" + clusterId + "/" + property.getKey()).build();
+        if (StringUtils.isEmpty(property.getKey())) {
             throw new RestAPIException("Property key can not be empty");
         }
 
-	    try {
-		    registry.addPropertyToCluster(applicationId, clusterId, property);
-	    } catch (RegistryException e) {
-		    String msg = "Error occurred while adding property";
-		    log.error(msg, e);
-		    throw new RestAPIException(msg, e);
-	    }
+        try {
+            registry.addPropertyToCluster(applicationId, clusterId, property);
+        } catch (RegistryException e) {
+            String msg = "Error occurred while adding property";
+            log.error(msg, e);
+            throw new RestAPIException(msg, e);
+        }
 
         return Response.created(url).build();
     }
@@ -160,13 +156,13 @@ public class MetaDataAdmin {
             throws RestAPIException {
         URI url = uriInfo.getAbsolutePathBuilder().path(applicationId + "/" + clusterId).build();
 
-	    try {
-		    registry.addPropertiesToCluster(applicationId, clusterId, properties);
-	    } catch (RegistryException e) {
-		    String msg = "Error occurred while adding properties ";
-		    log.error(msg, e);
-		    throw new RestAPIException(msg, e);
-	    }
+        try {
+            registry.addPropertiesToCluster(applicationId, clusterId, properties);
+        } catch (RegistryException e) {
+            String msg = "Error occurred while adding properties ";
+            log.error(msg, e);
+            throw new RestAPIException(msg, e);
+        }
 
         return Response.created(url).build();
     }
@@ -179,18 +175,18 @@ public class MetaDataAdmin {
     public Response deleteApplicationProperties(@PathParam("application_id") String applicationId)
             throws RestAPIException {
 
-	    try {
-		    boolean deleted = registry.deleteApplication(applicationId);
-		    if (!deleted) {
-			    log.warn(String.format(
-					    "Either no metadata is associated with given appId %s Or resources could not be deleted",
-					    applicationId));
-		    }
-	    } catch (RegistryException e) {
-		    String msg = "Resource attached with appId could not be deleted";
-		    log.error(msg, e);
-		    throw new RestAPIException(msg, e);
-	    }
+        try {
+            boolean deleted = registry.deleteApplication(applicationId);
+            if (!deleted) {
+                log.warn(String.format(
+                        "Either no metadata is associated with given appId %s Or resources could not be deleted",
+                        applicationId));
+            }
+        } catch (RegistryException e) {
+            String msg = "Resource attached with appId could not be deleted";
+            log.error(msg, e);
+            throw new RestAPIException(msg, e);
+        }
 
         return Response.ok().build();
     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/util/ConfUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/util/ConfUtil.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/util/ConfUtil.java
index 50eaa63..fcf12f9 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/util/ConfUtil.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/util/ConfUtil.java
@@ -34,43 +34,41 @@ import java.io.File;
  */
 public class ConfUtil {
 
-	private static Log log = LogFactory.getLog(ConfUtil.class);
+    private static Log log = LogFactory.getLog(ConfUtil.class);
+    private static ConfUtil instance = null;
+    private XMLConfiguration config;
 
-	private XMLConfiguration config;
-
-	private static ConfUtil instance = null;
-
-	private ConfUtil(String configFilePath) {
+    private ConfUtil(String configFilePath) {
         log.debug("Loading configuration.....");
 
-		try {
+        try {
 
-			File confFile;
-			if (StringUtils.isNotEmpty(configFilePath)) {
-				confFile = new File(configFilePath);
+            File confFile;
+            if (StringUtils.isNotEmpty(configFilePath)) {
+                confFile = new File(configFilePath);
 
-			} else {
-				confFile =
-				           new File(CarbonUtils.getCarbonConfigDirPath(),
-				                    Constants.METADATASERVICE_CONFIG_FILE_NAME);
-			}
+            } else {
+                confFile =
+                        new File(CarbonUtils.getCarbonConfigDirPath(),
+                                Constants.METADATASERVICE_CONFIG_FILE_NAME);
+            }
 
-			config = new XMLConfiguration(confFile);
-		} catch (ConfigurationException e) {
-			log.error("Unable to load autoscaler configuration file", e);
-			config = new XMLConfiguration(); // continue with default values
-		}
-	}
+            config = new XMLConfiguration(confFile);
+        } catch (ConfigurationException e) {
+            log.error("Unable to load autoscaler configuration file", e);
+            config = new XMLConfiguration(); // continue with default values
+        }
+    }
 
-	public static ConfUtil getInstance(String configFilePath) {
-		if (instance == null) {
-			instance = new ConfUtil(configFilePath);
-		}
-		return instance;
-	}
+    public static ConfUtil getInstance(String configFilePath) {
+        if (instance == null) {
+            instance = new ConfUtil(configFilePath);
+        }
+        return instance;
+    }
 
-	public XMLConfiguration getConfiguration() {
-		return config;
-	}
+    public XMLConfiguration getConfiguration() {
+        return config;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/resources/axis2_client.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/resources/axis2_client.xml b/components/org.apache.stratos.metadata.service/src/main/resources/axis2_client.xml
index db07954..dda7ccd 100644
--- a/components/org.apache.stratos.metadata.service/src/main/resources/axis2_client.xml
+++ b/components/org.apache.stratos.metadata.service/src/main/resources/axis2_client.xml
@@ -107,7 +107,7 @@
                           class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
                           class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-	<!--JSON Message Formatters-->
+        <!--JSON Message Formatters-->
         <messageFormatter contentType="application/json"
                           class="org.apache.axis2.json.JSONMessageFormatter"/>
         <messageFormatter contentType="application/json/badgerfish"
@@ -126,7 +126,7 @@
                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
         <messageBuilder contentType="application/x-www-form-urlencoded"
                         class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-	<!--JSON Message Builders-->
+        <!--JSON Message Builders-->
         <messageBuilder contentType="application/json"
                         class="org.apache.axis2.json.JSONOMBuilder"/>
         <messageBuilder contentType="application/json/badgerfish"

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/cxf-servlet.xml
index f8b8750..41dccfb 100644
--- a/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/cxf-servlet.xml
@@ -18,9 +18,9 @@
   #  under the License.
   -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
          http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
@@ -31,16 +31,18 @@
         </jaxrs:serviceBeans>
 
         <jaxrs:providers>
-			<ref bean="throwableExceptionHandler"/>
+            <ref bean="throwableExceptionHandler"/>
             <bean class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
                 <property name="dropRootElement" value="true"/>
                 <property name="supportUnwrapped" value="true"/>
-            </bean>>
+            </bean>
+            >
             <ref bean="exceptionHandler"/>
         </jaxrs:providers>
     </jaxrs:server>
 
     <bean id="stratosRestEndpointTestBean" class="org.apache.stratos.rest.endpoint.mock.StratosTestAdmin"/>
     <bean id="exceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomExceptionMapper"/>
-    <bean id="throwableExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomThrowableExceptionMapper"/>
+    <bean id="throwableExceptionHandler"
+          class="org.apache.stratos.rest.endpoint.handlers.CustomThrowableExceptionMapper"/>
 </beans>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e3427cf/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/web.xml b/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/web.xml
index 4a752f6..30e80ca 100644
--- a/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/web.xml
+++ b/components/org.apache.stratos.metadata.service/src/main/webapp/metadata-test/WEB-INF/web.xml
@@ -18,8 +18,8 @@
   #  under the License.
   -->
 
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+         xmlns="http://java.sun.com/xml/ns/javaee"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
          http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">