Alon Bar-Lev has uploaded a new change for review. Change subject: core: split LocalConfig to allow code reuse ......................................................................
core: split LocalConfig to allow code reuse EngineLocalConfig - for engine. NotifierLocalConfig - [future] for notifier. Change-Id: I711d045b50b172e00455125363d870a61d2d6fa9 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeLocator.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/plugin/PluginDataManager.java 17 files changed, 216 insertions(+), 195 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/14374/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index df74af6..5196fc0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -51,7 +51,7 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; import org.ovirt.engine.core.dao.gluster.GlusterDBUtils; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.gluster.GlusterUtil; import org.ovirt.engine.core.utils.ssh.SSHClient; import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil; @@ -322,7 +322,7 @@ returnValue = returnValue && validateSingleHostAttachedToLocalStorage(); if (Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers) - && !LocalConfig.getInstance().getPKIEngineStore().exists()) { + && !EngineLocalConfig.getInstance().getPKIEngineStore().exists()) { addCanDoActionMessage(VdcBllMessages.VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND); returnValue = false; } else if (!getParameters().getAddPending() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index f50ec76..4f03e97 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -28,7 +28,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.archivers.tar.CachedTar; import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; @@ -198,7 +198,7 @@ * @return ssh public key. */ protected static String _getEngineSSHPublicKey() { - final LocalConfig config = LocalConfig.getInstance(); + final EngineLocalConfig config = EngineLocalConfig.getInstance(); final String keystoreFile = config.getPKIEngineStore().getAbsolutePath(); final char[] password = config.getPKIEngineStorePassword().toCharArray(); final String alias = config.getPKIEngineStoreAlias(); @@ -400,14 +400,14 @@ new Callable<Object>() { public Object call() throws Exception { _parser.cliEnvironmentSet( VdsmEnv.ENGINE_HOST, - LocalConfig.getInstance().getHost() + EngineLocalConfig.getInstance().getHost() ); return null; }}, new Callable<Object>() { public Object call() throws Exception { _parser.cliEnvironmentSet( VdsmEnv.ENGINE_PORT, - LocalConfig.getInstance().getExternalHttpPort() + EngineLocalConfig.getInstance().getExternalHttpPort() ); return null; }}, @@ -575,7 +575,7 @@ new Callable<Object>() { public Object call() throws Exception { OutputStream os = null; File logFile = new File( - LocalConfig.getInstance().getLogDir(), + EngineLocalConfig.getInstance().getLogDir(), String.format( "%1$s%2$sovirt-%3$s-%4$s-%5$s.log", "host-deploy", @@ -803,7 +803,7 @@ if (s_deployPackage == null) { s_deployPackage = new CachedTar( new File( - LocalConfig.getInstance().getCacheDir(), + EngineLocalConfig.getInstance().getCacheDir(), Config.<String> GetValue(ConfigValues.BootstrapPackageName) ), new File(Config.<String> GetValue(ConfigValues.BootstrapPackageDirectory)) diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeLocator.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeLocator.java index 6ae2caf..d4610f8 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeLocator.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeLocator.java @@ -5,7 +5,7 @@ import javax.sql.DataSource; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.ResourceUtils; import org.ovirt.engine.core.utils.ejb.ContainerManagedResourceType; import org.ovirt.engine.core.utils.ejb.EjbUtils; @@ -172,7 +172,7 @@ } public static void loadDbFacadeConfig() { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); try { connectionTimeout = config.getInteger("ENGINE_DB_CONNECTION_TIMEOUT"); checkInterval = config.getInteger("ENGINE_DB_CHECK_INTERVAL"); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java index 8d52d83..4469979 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java @@ -5,7 +5,7 @@ import java.util.List; import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.EncryptionUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -28,7 +28,7 @@ if (StringUtils.isEmpty(password)) { return password; } - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); String keyFile = config.getPKIEngineStore().getAbsolutePath(); String passwd = config.getPKIEngineStorePassword(); String alias = config.getPKIEngineStoreAlias(); @@ -43,7 +43,7 @@ if (StringUtils.isEmpty(password)) { return password; } - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); String keyFile = config.getPKIEngineStore().getAbsolutePath(); String passwd = config.getPKIEngineStorePassword(); String alias = config.getPKIEngineStoreAlias(); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java index ea52454..897ceaa 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java @@ -18,7 +18,7 @@ import org.ovirt.engine.core.dao.VdcOptionDAO; import org.ovirt.engine.core.utils.crypt.EncryptionUtils; import org.ovirt.engine.core.utils.ConfigUtilsBase; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.serialization.json.JsonObjectDeserializer; @@ -97,7 +97,7 @@ } if (optionBehaviour != null) { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); Map<String, Object> values = null; switch (optionBehaviour.behaviour()) { // split string by comma for List<string> constructor diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java index b8a22b2..405417c 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.ServletUtils; /** @@ -85,7 +85,7 @@ } // Create the base file object: - base = new File(LocalConfig.getInstance().expandString(name)); + base = new File(EngineLocalConfig.getInstance().expandString(name)); } @Override diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java index d8fa669..df16ed3 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java @@ -14,7 +14,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; /** @@ -67,7 +67,7 @@ ); } - this.resourceLocation = LocalConfig.getInstance().expandString(this.resourceLocation); + this.resourceLocation = EngineLocalConfig.getInstance().expandString(this.resourceLocation); } catch(Exception e) { log.error("Cannot initialize", e); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java new file mode 100644 index 0000000..512ebf8 --- /dev/null +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java @@ -0,0 +1,175 @@ +package org.ovirt.engine.core.utils; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import org.apache.log4j.Logger; + +/** + * This class stores the local configuration (understanding local as the + * configuration of the local machine, as opposed to the global configuration + * stored in the database) of the engine loaded from the file specified by the + * <code>ENGINE_VARS</code> environment variable. + */ +public class EngineLocalConfig extends LocalConfig { + // The log: + private static final Logger log = Logger.getLogger(LocalConfig.class); + + // Default files for defaults and overridden values: + private static final String DEFAULTS_PATH = "/usr/share/ovirt-engine/conf/engine.conf.defaults"; + private static final String VARS_PATH = "/etc/ovirt-engine/engine.conf"; + + // This is a singleton and this is the instance: + private static final EngineLocalConfig instance = new EngineLocalConfig(); + + public static EngineLocalConfig getInstance() { + return instance; + } + + private EngineLocalConfig() { + // Locate the defaults file and add it to the list: + String defaultsPath = System.getenv("ENGINE_DEFAULTS"); + if (defaultsPath == null) { + defaultsPath = DEFAULTS_PATH; + } + + // Locate the overridden values file and add it to the list: + String varsPath = System.getenv("ENGINE_VARS"); + if (varsPath == null) { + varsPath = VARS_PATH; + } + + loadConfig(defaultsPath, varsPath); + } + + public boolean isProxyEnabled() { + return getBoolean("ENGINE_PROXY_ENABLED"); + } + + public int getProxyHttpPort() { + return getInteger("ENGINE_PROXY_HTTP_PORT"); + } + + public int getProxyHttpsPort() { + return getInteger("ENGINE_PROXY_HTTPS_PORT"); + } + + public String getHost() { + return getProperty("ENGINE_FQDN"); + } + + public boolean isHttpEnabled() { + return getBoolean("ENGINE_HTTP_ENABLED"); + } + + public int getHttpPort() { + return getInteger("ENGINE_HTTP_PORT"); + } + + public boolean isHttpsEnabled() { + return getBoolean("ENGINE_HTTPS_ENABLED"); + } + + public int getHttpsPort() { + return getInteger("ENGINE_HTTPS_PORT"); + } + + public File getEtcDir() { + return getFile("ENGINE_ETC"); + } + + public File getLogDir() { + return getFile("ENGINE_LOG"); + } + + public File getTmpDir() { + return getFile("ENGINE_TMP"); + } + + public File getUsrDir() { + return getFile("ENGINE_USR"); + } + + public File getVarDir() { + return getFile("ENGINE_VAR"); + } + + public File getCacheDir() { + return getFile("ENGINE_CACHE"); + } + + public File getPKIDir() { + return getFile("ENGINE_PKI"); + } + + public File getPKICACert() { + return getFile("ENGINE_PKI_CA"); + } + + public File getPKIEngineCert() { + return getFile("ENGINE_PKI_ENGINE_CERT"); + } + + public File getPKITrustStore() { + return getFile("ENGINE_PKI_TRUST_STORE"); + } + + public String getPKITrustStorePassword() { + return getProperty("ENGINE_PKI_TRUST_STORE_PASSWORD"); + } + + public File getPKIEngineStore() { + return getFile("ENGINE_PKI_ENGINE_STORE"); + } + + public String getPKIEngineStorePassword() { + return getProperty("ENGINE_PKI_ENGINE_STORE_PASSWORD"); + } + + public String getPKIEngineStoreAlias() { + return getProperty("ENGINE_PKI_ENGINE_STORE_ALIAS"); + } + + /** + * Gets the port number where the engine can be contacted using HTTP from + * external hosts. This will usually be the proxy HTTP port if the proxy is + * enabled or the engine HTTP port otherwise. + */ + public int getExternalHttpPort () { + return isProxyEnabled()? getProxyHttpPort(): getHttpPort(); + } + + /** + * Gets the port number where the engine can be contacted using HTTPS from + * external hosts. This will usually be the proxy HTTPS port if the proxy is + * enabled or the engine HTTPS port otherwise. + */ + public int getExternalHttpsPort () { + return isProxyEnabled()? getProxyHttpsPort(): getHttpsPort(); + } + + /** + * Gets the URL where the engine can be contacted using HTTP from external + * hosts. This will usually be the proxy HTTP URL if the proxy is enabled or + * the engine HTTP URL otherwise. + * + * @param path is the path that will be added after the address and port + * number of the URL + */ + public URL getExternalHttpUrl(String path) throws MalformedURLException { + return new URL("http", getHost(), getExternalHttpPort(), path); + } + + /** + * Gets the URL where the engine can be contacted using HTTPS from external + * hosts. This will usually be the proxy HTTPS URL if the proxy is enabled or + * the engine HTTPS URL otherwise. + * + * @param path is the path that will be added after the address and port + * number of the URL + */ + public URL getExternalHttpsUrl(String path) throws MalformedURLException { + return new URL("https", getHost(), getExternalHttpsPort(), path); + } +} diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java index 121a428..89f4ad2 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java @@ -5,8 +5,6 @@ import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -30,27 +28,16 @@ // The log: private static final Logger log = Logger.getLogger(LocalConfig.class); - // Default files for defaults and overridden values: - private static final String DEFAULTS_PATH = "/usr/share/ovirt-engine/conf/engine.conf.defaults"; - private static final String VARS_PATH = "/etc/ovirt-engine/engine.conf"; - // Compile regular expressions: private static final Pattern COMMENT_EXPR = Pattern.compile("\\s*#.*$"); private static final Pattern BLANK_EXPR = Pattern.compile("^\\s*$"); private static final Pattern VALUE_EXPR = Pattern.compile("^\\s*(\\w+)\\s*=\\s*(.*?)\\s*$"); private static final Pattern REF_EXPR = Pattern.compile("\\$\\{(\\w+)\\}"); - // This is a singleton and this is the instance: - private static final LocalConfig instance = new LocalConfig(); - - public static LocalConfig getInstance() { - return instance; - } - // The properties object storing the current values of the parameters: private Map<String, String> values = new HashMap<String, String>(); - private LocalConfig() { + protected void loadConfig(String defaultsPath, String varsPath) { // Set basic defaults values.put("SENSITIVE_KEYS", ""); @@ -58,20 +45,8 @@ // merged (the initial size is 2 because usually we will have only two // configuration files to merge, the defaults and the variables): List<File> configFiles = new ArrayList<File>(2); - - // Locate the defaults file and add it to the list: - String defaultsPath = System.getenv("ENGINE_DEFAULTS"); - if (defaultsPath == null) { - defaultsPath = DEFAULTS_PATH; - } File defaultsFile = new File(defaultsPath); configFiles.add(defaultsFile); - - // Locate the overridden values file and add it to the list: - String varsPath = System.getenv("ENGINE_VARS"); - if (varsPath == null) { - varsPath = VARS_PATH; - } File varsFile = new File(varsPath); configFiles.add(varsFile); @@ -335,133 +310,4 @@ return getProperty("SENSITIVE_KEYS").split(","); } - public boolean isProxyEnabled() { - return getBoolean("ENGINE_PROXY_ENABLED"); - } - - public int getProxyHttpPort() { - return getInteger("ENGINE_PROXY_HTTP_PORT"); - } - - public int getProxyHttpsPort() { - return getInteger("ENGINE_PROXY_HTTPS_PORT"); - } - - public String getHost() { - return getProperty("ENGINE_FQDN"); - } - - public boolean isHttpEnabled() { - return getBoolean("ENGINE_HTTP_ENABLED"); - } - - public int getHttpPort() { - return getInteger("ENGINE_HTTP_PORT"); - } - - public boolean isHttpsEnabled() { - return getBoolean("ENGINE_HTTPS_ENABLED"); - } - - public int getHttpsPort() { - return getInteger("ENGINE_HTTPS_PORT"); - } - - public File getEtcDir() { - return getFile("ENGINE_ETC"); - } - - public File getLogDir() { - return getFile("ENGINE_LOG"); - } - - public File getTmpDir() { - return getFile("ENGINE_TMP"); - } - - public File getUsrDir() { - return getFile("ENGINE_USR"); - } - - public File getVarDir() { - return getFile("ENGINE_VAR"); - } - - public File getCacheDir() { - return getFile("ENGINE_CACHE"); - } - - public File getPKIDir() { - return getFile("ENGINE_PKI"); - } - - public File getPKICACert() { - return getFile("ENGINE_PKI_CA"); - } - - public File getPKIEngineCert() { - return getFile("ENGINE_PKI_ENGINE_CERT"); - } - - public File getPKITrustStore() { - return getFile("ENGINE_PKI_TRUST_STORE"); - } - - public String getPKITrustStorePassword() { - return getProperty("ENGINE_PKI_TRUST_STORE_PASSWORD"); - } - - public File getPKIEngineStore() { - return getFile("ENGINE_PKI_ENGINE_STORE"); - } - - public String getPKIEngineStorePassword() { - return getProperty("ENGINE_PKI_ENGINE_STORE_PASSWORD"); - } - - public String getPKIEngineStoreAlias() { - return getProperty("ENGINE_PKI_ENGINE_STORE_ALIAS"); - } - - /** - * Gets the port number where the engine can be contacted using HTTP from - * external hosts. This will usually be the proxy HTTP port if the proxy is - * enabled or the engine HTTP port otherwise. - */ - public int getExternalHttpPort () { - return isProxyEnabled()? getProxyHttpPort(): getHttpPort(); - } - - /** - * Gets the port number where the engine can be contacted using HTTPS from - * external hosts. This will usually be the proxy HTTPS port if the proxy is - * enabled or the engine HTTPS port otherwise. - */ - public int getExternalHttpsPort () { - return isProxyEnabled()? getProxyHttpsPort(): getHttpsPort(); - } - - /** - * Gets the URL where the engine can be contacted using HTTP from external - * hosts. This will usually be the proxy HTTP URL if the proxy is enabled or - * the engine HTTP URL otherwise. - * - * @param path is the path that will be added after the address and port - * number of the URL - */ - public URL getExternalHttpUrl(String path) throws MalformedURLException { - return new URL("http", getHost(), getExternalHttpPort(), path); - } - - /** - * Gets the URL where the engine can be contacted using HTTPS from external - * hosts. This will usually be the proxy HTTPS URL if the proxy is enabled or - * the engine HTTPS URL otherwise. - * - * @param path is the path that will be added after the address and port - * number of the URL - */ - public URL getExternalHttpsUrl(String path) throws MalformedURLException { - return new URL("https", getHost(), getExternalHttpsPort(), path); - } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java index fb77309..71c259b 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java @@ -19,7 +19,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.utils.FileUtil; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -30,7 +30,7 @@ InputStream in = null; try { - in = new FileInputStream(LocalConfig.getInstance().getPKICACert()); + in = new FileInputStream(EngineLocalConfig.getInstance().getPKICACert()); final CertificateFactory cf = CertificateFactory.getInstance("X.509"); final Certificate certificate = cf.generateCertificate(in); @@ -62,7 +62,7 @@ String label, String hostname ) throws IOException { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); File pkicertdir = new File(config.getPKIDir(), "certs"); File pkireqdir = new File(config.getPKIDir(), "requests"); File signRequestBatch = new File(config.getPKIDir(), "SignReq.sh"); @@ -230,7 +230,7 @@ int days, String signedCertificateFileName) { log.debug("Building command array for Sign Certificate request script"); - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); String baseDirectoryPath = config.getPKIDir().getAbsolutePath(); String keystorePass = config.getPKIEngineStorePassword(); Calendar yesterday = Calendar.getInstance(); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java index 7b8a77f..508d3e1 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java @@ -15,7 +15,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; /** @@ -60,7 +60,7 @@ * Use default engine ssh key. */ public void useDefaultKeyPair() throws KeyStoreException { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); final File p12 = config.getPKIEngineStore(); final char[] password = config.getPKIEngineStorePassword().toCharArray(); final String alias = config.getPKIEngineStoreAlias(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index f2bc486..d7ab0df 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -33,7 +33,7 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.lock.EngineLock; import org.ovirt.engine.core.utils.lock.LockManagerFactory; import org.ovirt.engine.core.utils.log.Log; @@ -146,7 +146,7 @@ } // if ssl is on and no certificate file if (Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers) - && !LocalConfig.getInstance().getPKIEngineStore().exists()) { + && !EngineLocalConfig.getInstance().getPKIEngineStore().exists()) { if (_vds.getStatus() != VDSStatus.Maintenance && _vds.getStatus() != VDSStatus.InstallFailed) { setStatus(VDSStatus.NonResponsive, _vds); UpdateDynamicData(_vds.getDynamicData()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java index fefc9ec..1d4d23f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java @@ -31,7 +31,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.utils.Pair; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -48,7 +48,7 @@ if (Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers)) { URL keystoreUrl; try { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); keystoreUrl = new URL("file://" + config.getPKIEngineStore().getAbsolutePath()); String keystorePassword = config.getPKIEngineStorePassword(); URL truststoreUrl = new URL("file://" + config.getPKITrustStore().getAbsolutePath()); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java index 455baea..9c30189 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java @@ -13,7 +13,7 @@ import org.ovirt.engine.core.config.db.ConfigDAO; import org.ovirt.engine.core.config.entity.ConfigKey; import org.ovirt.engine.core.tools.ToolConsole; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.EncryptionUtils; public class PasswordValueHelper implements ValueHelper { @@ -31,7 +31,7 @@ static { try { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); keyStoreURL = config.getPKIEngineStore().getAbsolutePath(); keyStorePass = config.getPKIEngineStorePassword(); certAlias = config.getPKIEngineStoreAlias(); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java index 825f9e2..fa8556c 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java @@ -40,7 +40,7 @@ import org.ovirt.engine.core.notifier.utils.NotificationConfigurator; import org.ovirt.engine.core.notifier.utils.NotificationProperties; import org.ovirt.engine.core.tools.common.db.StandaloneDataSource; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.EncryptionUtils; import org.ovirt.engine.core.utils.db.DbUtils; @@ -203,7 +203,7 @@ * @throws NotificationServiceException */ private void createConcreteSSLSocketFactory() throws NotificationServiceException { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); String keystorePass = config.getPKIEngineStorePassword(); String keystoreUrl = config.getPKIEngineStore().getAbsolutePath(); @@ -254,7 +254,7 @@ } private void initServerUrl() throws NotificationServiceException { - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); try { if (isHttpsProtocol) { serverUrl = config.getExternalHttpsUrl(HEALTH_SERVLET_PATH); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java index 7760375..83f8146 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java @@ -14,7 +14,7 @@ import javax.sql.DataSource; import org.apache.log4j.Logger; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.EncryptionUtils; public class StandaloneDataSource implements DataSource { @@ -40,7 +40,7 @@ public StandaloneDataSource() throws SQLException { // Load the service configuration file: - LocalConfig config = LocalConfig.getInstance(); + EngineLocalConfig config = EngineLocalConfig.getInstance(); // Get the database connection details: driver = config.getProperty(ENGINE_DB_DRIVER); diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/plugin/PluginDataManager.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/plugin/PluginDataManager.java index e5bd747..b4f7d20 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/plugin/PluginDataManager.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/plugin/PluginDataManager.java @@ -14,12 +14,12 @@ import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.map.ObjectMapper; import org.ovirt.engine.core.common.config.ConfigUtil; -import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.EngineLocalConfig; /** * Reads, validates and stores UI plugin descriptor/configuration data. * <p> - * Note that this class uses {@link LocalConfig} to read local (machine-specific) Engine configuration. + * Note that this class uses {@link EngineLocalConfig} to read local (machine-specific) Engine configuration. */ public class PluginDataManager { @@ -39,14 +39,14 @@ * Returns UI plugin <em>data path</em>, under which UI plugin descriptor (JSON) files are placed. */ public static String resolvePluginDataPath() { - return ConfigUtil.resolvePath(LocalConfig.getInstance().getUsrDir().getAbsolutePath(), UI_PLUGIN_DIR); + return ConfigUtil.resolvePath(EngineLocalConfig.getInstance().getUsrDir().getAbsolutePath(), UI_PLUGIN_DIR); } /** * Returns UI plugin <em>config path</em>, under which UI plugin configuration (JSON) files are placed. */ public static String resolvePluginConfigPath() { - return ConfigUtil.resolvePath(LocalConfig.getInstance().getEtcDir().getAbsolutePath(), UI_PLUGIN_DIR); + return ConfigUtil.resolvePath(EngineLocalConfig.getInstance().getEtcDir().getAbsolutePath(), UI_PLUGIN_DIR); } private final File pluginDataDir; -- To view, visit http://gerrit.ovirt.org/14374 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I711d045b50b172e00455125363d870a61d2d6fa9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
