Repository: stratos Updated Branches: refs/heads/4.0.0-grouping eb37fa90b -> 95db1675d
reading username and password from configuration file for meta data service Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/95db1675 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/95db1675 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/95db1675 Branch: refs/heads/4.0.0-grouping Commit: 95db1675dc4f75abb79845abd6b572ff82582f7c Parents: eb37fa9 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Sep 24 16:24:41 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Sep 24 16:24:41 2014 +0530 ---------------------------------------------------------------------- .../client/config/MetaDataClientConfig.java | 30 ++++++++++++++++++-- .../metadata/client/rest/DefaultRestClient.java | 5 ++-- .../client/util/MetaDataClientConstants.java | 11 +++++-- 3 files changed, 39 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/95db1675/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/config/MetaDataClientConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/config/MetaDataClientConfig.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/config/MetaDataClientConfig.java index 8bb3cbe..2596ca9 100644 --- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/config/MetaDataClientConfig.java +++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/config/MetaDataClientConfig.java @@ -37,6 +37,10 @@ public class MetaDataClientConfig { private String dataExtractorClass; + private String username; + + private String password; + private XMLConfiguration config; private static volatile MetaDataClientConfig metaDataClientConfig; @@ -61,9 +65,21 @@ public class MetaDataClientConfig { MetaDataClientConstants.METADATA_SERVICE_BASE_URL + " ] in the config file"); } + username = config.getString(MetaDataClientConstants.METADATA_SERVICE_USERNAME); + if (username == null) { + throw new RuntimeException("Meta data service username not defined in the configuration"); + } + + password = config.getString(MetaDataClientConstants.METADATA_SERVICE_PASSWORD); + if (password == null) { + throw new RuntimeException("Meta data service password not defined in the configuration"); + } + dataExtractorClass = config.getString(MetaDataClientConstants.METADATA_CLIENT_DATA_EXTRACTOR_CLASS); if (dataExtractorClass == null) { - log.info("No custom Data Extractor class detected in the configuration"); + if(log.isDebugEnabled()) { + log.debug("No custom Data Extractor class detected in the configuration"); + } } } @@ -108,13 +124,23 @@ public class MetaDataClientConfig { return dataExtractorClass; } + public String getUsername() { + return username; + } + + public String getPassword() { + return password; + } + /* Sample Configuration file: <configuration> <metadataService> - <baseUrl>xx.xx.xx.xx</baseUrl> + <baseUrl>localhost</baseUrl> + <username>admin</username> + <password>admin</password> </metadataService> <metadataClient> <dataExtractorClass>org.foo.MyDataExtractor</dataExtractorClass> http://git-wip-us.apache.org/repos/asf/stratos/blob/95db1675/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java index c8ccad5..cb12b8d 100644 --- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java +++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java @@ -34,6 +34,7 @@ import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClients; +import org.apache.stratos.metadata.client.config.MetaDataClientConfig; import org.apache.stratos.metadata.client.exception.RestClientException; import java.io.IOException; @@ -91,11 +92,11 @@ public class DefaultRestClient implements RestClient { } private String getUsername() { - return null; + return MetaDataClientConfig.getInstance().getUsername(); } private String getPassword() { - return null; + return MetaDataClientConfig.getInstance().getPassword(); } private void addPayloadJsonString(Object payload, HttpPost post) { http://git-wip-us.apache.org/repos/asf/stratos/blob/95db1675/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/util/MetaDataClientConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/util/MetaDataClientConstants.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/util/MetaDataClientConstants.java index 1b2baf2..c027bed 100644 --- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/util/MetaDataClientConstants.java +++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/util/MetaDataClientConstants.java @@ -21,9 +21,14 @@ package org.apache.stratos.metadata.client.util; public class MetaDataClientConstants { - public static String METADATA_CLIENT_CONFIG_FILE = "METADATA_CLIENT_CONFIG_FILE"; + public static final String METADATA_CLIENT_CONFIG_FILE = "METADATA_CLIENT_CONFIG_FILE"; - public static String METADATA_SERVICE_BASE_URL = "metadataService.baseUrl"; + public static final String METADATA_SERVICE_BASE_URL = "metadataService.baseUrl"; + + public static final String METADATA_SERVICE_USERNAME = "metadataService.username"; + + public static final String METADATA_SERVICE_PASSWORD = "metadataService.password"; + + public static final String METADATA_CLIENT_DATA_EXTRACTOR_CLASS = "metadataClient.dataExtractorClass"; - public static String METADATA_CLIENT_DATA_EXTRACTOR_CLASS = "metadataClient.dataExtractorClass"; }
