From 827fb864102fdf0785fb17c77c15e6b9080be7d5 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 4 May 2023 12:12:30 -0500 Subject: [PATCH] Rename ServerXml to ServerConfig --- .../profile/def/AuthInfoAccessExtDefault.java | 6 +++--- .../cms/servlet/csadmin/Configurator.java | 10 +++++----- .../com/netscape/cmscore/apps/CMSEngine.java | 12 +++++------ .../{ServerXml.java => ServerConfig.java} | 20 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) rename base/server/src/main/java/com/netscape/cmscore/apps/{ServerXml.java => ServerConfig.java} (83%) diff --git a/base/ca/src/main/java/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/ca/src/main/java/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java index 9d5b2d29b44..24b63ca4e72 100644 --- a/base/ca/src/main/java/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java +++ b/base/ca/src/main/java/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.property.EPropertyException; import com.netscape.certsrv.property.IDescriptor; import com.netscape.cmscore.apps.CMS; -import com.netscape.cmscore.apps.ServerXml; +import com.netscape.cmscore.apps.ServerConfig; import com.netscape.cmscore.base.ConfigStore; import com.netscape.cmscore.request.Request; @@ -453,8 +453,8 @@ public String getBuiltinOCSPPort() throws Exception { String instanceDir = CMS.getInstanceDir(); String path = instanceDir + File.separator + "conf" + File.separator + "server.xml"; - ServerXml serverXml = ServerXml.load(path); - port = serverXml.getUnsecurePort(); + ServerConfig serverConfig = ServerConfig.load(path); + port = serverConfig.getUnsecurePort(); logger.debug("AuthInfoAccessExtDefault: server.xml port: " + port); return port; diff --git a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java index 08e3e8091ca..2ca375dd9a5 100644 --- a/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java +++ b/base/server/src/main/java/com/netscape/cms/servlet/csadmin/Configurator.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.system.SecurityDomainClient; import com.netscape.cmscore.apps.CMSEngine; import com.netscape.cmscore.apps.EngineConfig; -import com.netscape.cmscore.apps.ServerXml; +import com.netscape.cmscore.apps.ServerConfig; /** * Utility class for functions to be used by the RESTful installer. @@ -51,12 +51,12 @@ public class Configurator { protected CMSEngine engine; protected EngineConfig cs; - protected ServerXml serverXml; + protected ServerConfig serverConfig; public Configurator(CMSEngine engine) { this.engine = engine; this.cs = engine.getConfig(); - this.serverXml = engine.getServerXml(); + this.serverConfig = engine.getServerConfig(); } public static PKIClient createClient( @@ -78,8 +78,8 @@ public void setConfigStore(EngineConfig cs) { this.cs = cs; } - public void setServerXml(ServerXml serverXml) throws Exception { - this.serverXml = serverXml; + public void setServerConfig(ServerConfig serverConfig) throws Exception { + this.serverConfig = serverConfig; } public String getInstallToken(String sdhost, int sdport, String user, String passwd) throws Exception { diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java b/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java index b1df875303e..13a17efb944 100644 --- a/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java @@ -126,7 +126,7 @@ public class CMSEngine { protected EngineConfig config; protected EngineConfig mConfig; - protected ServerXml serverXml; + protected ServerConfig serverConfig; // AutoSD : AutoShutdown private String mAutoSD_CrumbFile = null; @@ -805,9 +805,9 @@ public void configurePorts() throws Exception { String path = instanceDir + File.separator + "conf" + File.separator + SERVER_XML; - serverXml = ServerXml.load(path); - unsecurePort = serverXml.getUnsecurePort(); - securePort = serverXml.getSecurePort(); + serverConfig = ServerConfig.load(path); + unsecurePort = serverConfig.getUnsecurePort(); + securePort = serverConfig.getSecurePort(); String port = config.getString("proxy.securePort", ""); if (!port.equals("")) { @@ -1598,8 +1598,8 @@ public EngineConfig getConfig() { return mConfig; } - public ServerXml getServerXml() { - return serverXml; + public ServerConfig getServerConfig() { + return serverConfig; } /** diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/ServerXml.java b/base/server/src/main/java/com/netscape/cmscore/apps/ServerConfig.java similarity index 83% rename from base/server/src/main/java/com/netscape/cmscore/apps/ServerXml.java rename to base/server/src/main/java/com/netscape/cmscore/apps/ServerConfig.java index f844bc223f3..56d75413a2f 100644 --- a/base/server/src/main/java/com/netscape/cmscore/apps/ServerXml.java +++ b/base/server/src/main/java/com/netscape/cmscore/apps/ServerConfig.java @@ -27,18 +27,18 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -public class ServerXml { +public class ServerConfig { - public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ServerXml.class); + public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ServerConfig.class); String unsecurePort; String securePort; - public static ServerXml load(String filename) throws Exception { + public static ServerConfig load(String filename) throws Exception { - logger.debug("ServerXml: Parsing " + filename); + logger.debug("ServerConfig: Parsing " + filename); - ServerXml serverXml = new ServerXml(); + ServerConfig serverConfig = new ServerConfig(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); @@ -68,16 +68,16 @@ public static ServerXml load(String filename) throws Exception { String port = connector.getAttribute("port"); if (scheme != null && scheme.equals("https")) { - logger.debug("ServerXml: - secure port: " + port); - serverXml.setSecurePort(port); + logger.debug("ServerConfig: - secure port: " + port); + serverConfig.setSecurePort(port); } else { - logger.debug("ServerXml: - unsecure port: " + port); - serverXml.setUnsecurePort(port); + logger.debug("ServerConfig: - unsecure port: " + port); + serverConfig.setUnsecurePort(port); } } - return serverXml; + return serverConfig; } public String getUnsecurePort() {