#stText.Overview.warning.warningMsg#
@@ -365,7 +353,6 @@ Error Output --->
-
-
-
-
-
@@ -618,14 +553,10 @@ Error Output --->
#stText.Overview.ReleaseDate# |
#lsDateFormat(server.lucee['release-date'])# |
-
| #stText.Overview.label# |
#info.label?:""# |
-
-
-
| #stText.Overview.InstalledTLs# |
@@ -634,8 +565,6 @@ Error Output --->
|
-
-
| #stText.Overview.InstalledFLs# |
@@ -644,8 +573,6 @@ Error Output --->
|
-
-
@@ -687,13 +614,11 @@ Error Output --->
-
-
- | #stText.Overview.hash# |
- #info.hash?:""# |
-
-
-
+
+ | #stText.Overview.hash# |
+ #info.hash?:""# |
+
+
diff --git a/core/src/main/cfml/context/admin/resources.component.list.cfm b/core/src/main/cfml/context/admin/resources.component.list.cfm
index 00879f0034..043f6b5a27 100644
--- a/core/src/main/cfml/context/admin/resources.component.list.cfm
+++ b/core/src/main/cfml/context/admin/resources.component.list.cfm
@@ -172,8 +172,7 @@
|
- bmbr button reset" name="cancel" value="#stText.Buttons.cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/resources.rest.cfm b/core/src/main/cfml/context/admin/resources.rest.cfm
index 3799a63e18..b59ac46fd8 100644
--- a/core/src/main/cfml/context/admin/resources.rest.cfm
+++ b/core/src/main/cfml/context/admin/resources.rest.cfm
@@ -164,8 +164,7 @@ list all mappings and display necessary edit fields --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/resources/menu.cfm b/core/src/main/cfml/context/admin/resources/menu.cfm
index da4ca8455d..17dad9cc07 100755
--- a/core/src/main/cfml/context/admin/resources/menu.cfm
+++ b/core/src/main/cfml/context/admin/resources/menu.cfm
@@ -1,7 +1,6 @@
-
- if(isNull(request.singlemode))request.singlemode=false;
sHelpURL = "https://www.lucee.org/help/stHelp.json";
param name="request.stLocalHelp" default="#structNew()#";
param name="request.stWebMediaHelp" default="#structNew()#";
@@ -76,8 +75,8 @@
}
- stText.menuStruct.web = createMenu( stText.menu, "web",request.singlemode?:false);
- stText.menuStruct.server = createMenu( stText.menu, "server",request.singlemode?:false);
+ stText.menuStruct.web = createMenu( stText.menu, "web");
+ stText.menuStruct.server = createMenu( stText.menu, "server");
} else{
languages=application.languages;
diff --git a/core/src/main/cfml/context/admin/security.access.cfm b/core/src/main/cfml/context/admin/security.access.cfm
index 718df038c1..f32822d938 100755
--- a/core/src/main/cfml/context/admin/security.access.cfm
+++ b/core/src/main/cfml/context/admin/security.access.cfm
@@ -37,37 +37,6 @@ function checkTheBox(field) {
-
-
-
-
-
password="#session["password"&request.adminType]#"
returnVariable="access">
-
-
- #stText.Security.desc#
-
-
-
-
-
-
-
-
-
- #stText.Security.specialDesc#
-
-
-
-
-
\ No newline at end of file
diff --git a/core/src/main/cfml/context/admin/security.access.form.cfm b/core/src/main/cfml/context/admin/security.access.form.cfm
index 94dcac4cc7..861ecc97a3 100644
--- a/core/src/main/cfml/context/admin/security.access.form.cfm
+++ b/core/src/main/cfml/context/admin/security.access.form.cfm
@@ -56,7 +56,7 @@
-
+
#stText.Security.WebAdministrator#
#stText.Security.WebAdministratorDescription#
diff --git a/core/src/main/cfml/context/admin/security.password.cfm b/core/src/main/cfml/context/admin/security.password.cfm
index 30219e101f..d8af569d52 100755
--- a/core/src/main/cfml/context/admin/security.password.cfm
+++ b/core/src/main/cfml/context/admin/security.password.cfm
@@ -190,7 +190,7 @@ Error Output --->
-
+
-
+
typeChecking="#!isNull(form.typeChecking) and form.typeChecking EQ true#"
remoteClients="#request.getRemoteClients()#"
>
-
-
-
-
@@ -414,23 +405,6 @@ Create Datasource --->
-
-
-
-
- | Develop Mode |
-
-
-
- |
-
-
@@ -442,8 +416,7 @@ Create Datasource --->
|
- bmbr button reset" type="reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.cfm b/core/src/main/cfml/context/admin/server.cfm
index fd9cf3a62b..8934f8b73c 100644
--- a/core/src/main/cfml/context/admin/server.cfm
+++ b/core/src/main/cfml/context/admin/server.cfm
@@ -1,9 +1,3 @@
-if(getApplicationSettings().singleContext) {
location url="index.cfm?reinit=true" addtoken=false;
-}
-else {
- param name="request.adminType" default="server";
- include "web.cfm";
-}
\ No newline at end of file
diff --git a/core/src/main/cfml/context/admin/server.charset.cfm b/core/src/main/cfml/context/admin/server.charset.cfm
index e324cb113c..401a23089d 100755
--- a/core/src/main/cfml/context/admin/server.charset.cfm
+++ b/core/src/main/cfml/context/admin/server.charset.cfm
@@ -151,8 +151,7 @@ Error Output --->
|
- bmbr button reset" type="reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.compiler.cfm b/core/src/main/cfml/context/admin/server.compiler.cfm
index dfbad01d9c..d189130faf 100755
--- a/core/src/main/cfml/context/admin/server.compiler.cfm
+++ b/core/src/main/cfml/context/admin/server.compiler.cfm
@@ -302,8 +302,7 @@ Redirtect to entry --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.error.cfm b/core/src/main/cfml/context/admin/server.error.cfm
index 14b2656d62..ed01ef90fb 100755
--- a/core/src/main/cfml/context/admin/server.error.cfm
+++ b/core/src/main/cfml/context/admin/server.error.cfm
@@ -171,10 +171,7 @@ Error Output --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.output.cfm b/core/src/main/cfml/context/admin/server.output.cfm
index 8380ee59dc..56dd126fca 100755
--- a/core/src/main/cfml/context/admin/server.output.cfm
+++ b/core/src/main/cfml/context/admin/server.output.cfm
@@ -178,8 +178,7 @@ Defaults --->
|
- bmbr button reset" type="reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.regex.cfm b/core/src/main/cfml/context/admin/server.regex.cfm
index 97fc18630c..388e855ac8 100755
--- a/core/src/main/cfml/context/admin/server.regex.cfm
+++ b/core/src/main/cfml/context/admin/server.regex.cfm
@@ -146,10 +146,7 @@ Error Output --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.regional.cfm b/core/src/main/cfml/context/admin/server.regional.cfm
index 2667819152..fdf719d295 100755
--- a/core/src/main/cfml/context/admin/server.regional.cfm
+++ b/core/src/main/cfml/context/admin/server.regional.cfm
@@ -193,10 +193,7 @@ Create Datasource --->
|
- bmbr button reset" type="reset" name="cancel" value="#stText.Buttons.Cancel#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.request.cfm b/core/src/main/cfml/context/admin/server.request.cfm
index ea07c98e56..eb6e10813c 100755
--- a/core/src/main/cfml/context/admin/server.request.cfm
+++ b/core/src/main/cfml/context/admin/server.request.cfm
@@ -286,8 +286,7 @@ Error Output --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
@@ -410,8 +409,7 @@ Error Output --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
@@ -543,8 +541,7 @@ Error Output --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
@@ -688,8 +685,7 @@ Error Output --->
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.scope.cfm b/core/src/main/cfml/context/admin/server.scope.cfm
index e78df3b36f..102039bab4 100755
--- a/core/src/main/cfml/context/admin/server.scope.cfm
+++ b/core/src/main/cfml/context/admin/server.scope.cfm
@@ -607,10 +607,7 @@ function test() localMode="#scope.LocalMode#" {}
|
- bmbr button reset" name="cancel" value="#stText.Buttons.Cancel#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/server.security.cfm b/core/src/main/cfml/context/admin/server.security.cfm
index 50686235fa..4e128fa8d6 100755
--- a/core/src/main/cfml/context/admin/server.security.cfm
+++ b/core/src/main/cfml/context/admin/server.security.cfm
@@ -140,8 +140,7 @@ Error Output --->
|
- bmbr button reset" type="reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/services.ai.list.cfm b/core/src/main/cfml/context/admin/services.ai.list.cfm
index bc49e73426..fb458f1990 100755
--- a/core/src/main/cfml/context/admin/services.ai.list.cfm
+++ b/core/src/main/cfml/context/admin/services.ai.list.cfm
@@ -170,9 +170,7 @@ function defaultValue(field) {
|
blbs button submit" name="mainAction" value="#stText.Buttons.update#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/services.cache.list.cfm b/core/src/main/cfml/context/admin/services.cache.list.cfm
index 4da99cb0c4..f8cda07fd5 100755
--- a/core/src/main/cfml/context/admin/services.cache.list.cfm
+++ b/core/src/main/cfml/context/admin/services.cache.list.cfm
@@ -300,10 +300,7 @@ this.cache.webservice = "#!hasWSe?"<cache-name>":defaults.webservice#";
|
- blbs button submit" name="mainAction" value="#stText.Buttons.update#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/services.certificates.cfm b/core/src/main/cfml/context/admin/services.certificates.cfm
index 8925ce97b8..b743a7108d 100755
--- a/core/src/main/cfml/context/admin/services.certificates.cfm
+++ b/core/src/main/cfml/context/admin/services.certificates.cfm
@@ -96,8 +96,7 @@ Error Output --->
- bmbr button reset" type="reset" name="cancel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/services.datasource.list.cfm b/core/src/main/cfml/context/admin/services.datasource.list.cfm
index af16666c0a..a921c3f7c8 100644
--- a/core/src/main/cfml/context/admin/services.datasource.list.cfm
+++ b/core/src/main/cfml/context/admin/services.datasource.list.cfm
@@ -124,10 +124,7 @@ Error Output --->
|
- bmbr reset" name="cancel" value="#stText.Buttons.Cancel#">
-
-
-
+
|
diff --git a/core/src/main/cfml/context/admin/services.gateway.cfm b/core/src/main/cfml/context/admin/services.gateway.cfm
index f4707d2703..5e682d5f25 100755
--- a/core/src/main/cfml/context/admin/services.gateway.cfm
+++ b/core/src/main/cfml/context/admin/services.gateway.cfm
@@ -1,5 +1,3 @@
-
-
diff --git a/core/src/main/cfml/context/admin/services.mail.settings.cfm b/core/src/main/cfml/context/admin/services.mail.settings.cfm
index 21b9c053a9..8e2a264230 100644
--- a/core/src/main/cfml/context/admin/services.mail.settings.cfm
+++ b/core/src/main/cfml/context/admin/services.mail.settings.cfm
@@ -95,8 +95,7 @@
- bmbr button reset" name="canel" value="#stText.Buttons.Cancel#">
-
+
|
diff --git a/core/src/main/cfml/context/admin/services.schedule.cfm b/core/src/main/cfml/context/admin/services.schedule.cfm
index 35df2ba22f..c307fb3acb 100755
--- a/core/src/main/cfml/context/admin/services.schedule.cfm
+++ b/core/src/main/cfml/context/admin/services.schedule.cfm
@@ -1,4 +1,3 @@
-
@@ -66,7 +65,6 @@
error.detail="";
-
@@ -76,5 +74,4 @@ Defaults --->
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/core/src/main/cfml/context/admin/services.search.cfm b/core/src/main/cfml/context/admin/services.search.cfm
index 7382a543b7..087b957549 100755
--- a/core/src/main/cfml/context/admin/services.search.cfm
+++ b/core/src/main/cfml/context/admin/services.search.cfm
@@ -1,4 +1,3 @@
-
function sortByValue(struct sct) {
var tmp=structNew("ordered");
@@ -39,7 +38,7 @@
secType="search"
secValue="yes">
-
+
diff --git a/core/src/main/cfml/context/admin/services.tasks.cfm b/core/src/main/cfml/context/admin/services.tasks.cfm
index 6cffec37a0..e13f74001a 100755
--- a/core/src/main/cfml/context/admin/services.tasks.cfm
+++ b/core/src/main/cfml/context/admin/services.tasks.cfm
@@ -350,7 +350,6 @@
bmbr button reset" name="canel" value="#stText.Buttons.Cancel#">
-
|
diff --git a/core/src/main/cfml/context/admin/web.cfm b/core/src/main/cfml/context/admin/web.cfm
index b641cd4386..ca80037dd7 100755
--- a/core/src/main/cfml/context/admin/web.cfm
+++ b/core/src/main/cfml/context/admin/web.cfm
@@ -1,8 +1,6 @@
- request.singleMode=getApplicationSettings().singleContext;
-
- if(request.singleMode && right(cgi.script_name,9)!="index.cfm") {
+ if(right(cgi.script_name,9)!="index.cfm") {
location url="index.cfm" addtoken=false;
}
@@ -49,7 +47,7 @@
-
+
if(structKeyExists(url, "reinit") && (url.action?:"") != "logout") {
location url="#cgi.SCRIPT_NAME#?action=logout&full=true" addtoken="No";
diff --git a/core/src/main/java/lucee/commons/io/log/LogUtil.java b/core/src/main/java/lucee/commons/io/log/LogUtil.java
index 4464791883..cbd153f65f 100644
--- a/core/src/main/java/lucee/commons/io/log/LogUtil.java
+++ b/core/src/main/java/lucee/commons/io/log/LogUtil.java
@@ -35,7 +35,7 @@
import lucee.runtime.PageSource;
import lucee.runtime.config.Config;
import lucee.runtime.config.ConfigWeb;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.engine.ThreadLocalPageContext;
/**
@@ -181,7 +181,7 @@ public static void log(PageContext pc, int level, String logName, String type, S
public static void logGlobal(Config config, int level, String type, String msg) {
try {
- CFMLEngineFactory factory = ConfigWebUtil.getCFMLEngineFactory(config);
+ CFMLEngineFactory factory = ConfigUtil.getCFMLEngineFactory(config);
Resource log;
boolean check = false;
if (level > Log.LEVEL_DEBUG) {
diff --git a/core/src/main/java/lucee/commons/io/log/log4j2/Log4j2Engine.java b/core/src/main/java/lucee/commons/io/log/log4j2/Log4j2Engine.java
index b5ffdcf8ba..9ccba18b7b 100644
--- a/core/src/main/java/lucee/commons/io/log/log4j2/Log4j2Engine.java
+++ b/core/src/main/java/lucee/commons/io/log/log4j2/Log4j2Engine.java
@@ -45,7 +45,7 @@
import lucee.loader.util.Util;
import lucee.runtime.config.Config;
import lucee.runtime.config.ConfigWeb;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.db.ClassDefinition;
import lucee.runtime.engine.ThreadLocalPageContext;
import lucee.runtime.exp.ApplicationException;
@@ -399,14 +399,14 @@ else if (ResourceAppender.class.getName().equalsIgnoreCase(cd.getClassName())) {
String path = Caster.toString(appenderArgs.get("path"), null);
if (!StringUtil.isEmpty(path, true)) {
path = path.trim();
- path = ConfigWebUtil.translateOldPath(path);
- res = ConfigWebUtil.getFile(config, config.getConfigDir(), path, ResourceUtil.TYPE_FILE);
+ path = ConfigUtil.translateOldPath(path);
+ res = ConfigUtil.getFile(config, config.getConfigDir(), path, ResourceUtil.TYPE_FILE);
if (res != null && res.isDirectory()) {
res = res.getRealResource(name + ".log");
}
}
if (res == null) {
- res = ConfigWebUtil.getFile(config, config.getConfigDir(), "logs/" + name + ".log", ResourceUtil.TYPE_FILE);
+ res = ConfigUtil.getFile(config, config.getConfigDir(), "logs/" + name + ".log", ResourceUtil.TYPE_FILE);
}
// charset
diff --git a/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java b/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java
index 9d6b874d45..38b2107ab0 100755
--- a/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java
+++ b/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java
@@ -58,7 +58,7 @@
import lucee.runtime.config.Config;
import lucee.runtime.config.ConfigWeb;
import lucee.runtime.config.ConfigWebPro;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.config.Constants;
import lucee.runtime.engine.ThreadLocalPageContext;
import lucee.runtime.exp.ExpressionException;
@@ -471,7 +471,7 @@ public static Resource createResource(Resource res, short level, short type) {
// Parent
Resource parent = res.getParentResource();
- if (level >= LEVEL_PARENT_FILE && parent != null && parent.exists() && canRW(parent) && !ConfigWebUtil.hasPlaceholder(res.getAbsolutePath())) {
+ if (level >= LEVEL_PARENT_FILE && parent != null && parent.exists() && canRW(parent) && !ConfigUtil.hasPlaceholder(res.getAbsolutePath())) {
if (asDir) {
if (res.mkdirs()) return getCanonicalResourceEL(res);
}
@@ -484,7 +484,7 @@ public static Resource createResource(Resource res, short level, short type) {
// Grand Parent
if (level >= LEVEL_GRAND_PARENT_FILE && parent != null) {
Resource gparent = parent.getParentResource();
- if (gparent != null && gparent.exists() && canRW(gparent) && !ConfigWebUtil.hasPlaceholder(res.getAbsolutePath())) {
+ if (gparent != null && gparent.exists() && canRW(gparent) && !ConfigUtil.hasPlaceholder(res.getAbsolutePath())) {
if (asDir) {
if (res.mkdirs()) return getCanonicalResourceEL(res);
}
diff --git a/core/src/main/java/lucee/commons/io/res/util/UDFFilter.java b/core/src/main/java/lucee/commons/io/res/util/UDFFilter.java
index 3c71ff1b1b..61fdbd86e6 100644
--- a/core/src/main/java/lucee/commons/io/res/util/UDFFilter.java
+++ b/core/src/main/java/lucee/commons/io/res/util/UDFFilter.java
@@ -49,7 +49,6 @@ public boolean accept(String path) {
@Override
public boolean accept(Resource file) {
Object[] args1 = new Object[3];
- boolean isDir = file.isDirectory();
args1[0] = file.getAbsolutePath();
args1[1] = file.isDirectory() ? "directory" : "file";
args1[2] = file.isDirectory() ? "" : ResourceUtil.getExtension(file, null);
diff --git a/core/src/main/java/lucee/commons/lang/MappingUtil.java b/core/src/main/java/lucee/commons/lang/MappingUtil.java
index aa557783ff..9001eea0d6 100644
--- a/core/src/main/java/lucee/commons/lang/MappingUtil.java
+++ b/core/src/main/java/lucee/commons/lang/MappingUtil.java
@@ -33,7 +33,7 @@
import lucee.runtime.PageContext;
import lucee.runtime.PageSource;
import lucee.runtime.config.Config;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.config.Constants;
import lucee.runtime.engine.ThreadLocalPageContext;
import lucee.transformer.bytecode.util.ASMUtil;
@@ -157,7 +157,7 @@ public static SourceInfo getMatch(PageContext pc, Config config, StackTraceEleme
if (pc == null && config == null) config = ThreadLocalPageContext.getConfig();
// PageContext pc = ThreadLocalPageContext.get();
- Mapping[] mappings = pc != null ? ConfigWebUtil.getAllMappings(pc) : ConfigWebUtil.getAllMappings(config);
+ Mapping[] mappings = pc != null ? ConfigUtil.getAllMappings(pc) : ConfigUtil.getAllMappings(config);
if (pc != null) config = pc.getConfig();
Mapping mapping;
diff --git a/core/src/main/java/lucee/runtime/MappingImpl.java b/core/src/main/java/lucee/runtime/MappingImpl.java
index 6c8c2d3c2c..1fd380ca14 100755
--- a/core/src/main/java/lucee/runtime/MappingImpl.java
+++ b/core/src/main/java/lucee/runtime/MappingImpl.java
@@ -45,7 +45,7 @@
import lucee.runtime.config.ConfigPro;
import lucee.runtime.config.ConfigWeb;
import lucee.runtime.config.ConfigWebPro;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.engine.ThreadLocalPageContext;
import lucee.runtime.exp.PageException;
import lucee.runtime.listener.ApplicationListener;
@@ -169,7 +169,7 @@ private void initPhysical() {
synchronized (this) {
if (physical == null && strPhysical != null) {
ServletContext cs = (config instanceof ConfigWeb) ? ((ConfigWeb) config).getServletContext() : null;
- physical = ConfigWebUtil.getResource(cs, strPhysical, config.getConfigDir(), FileUtil.TYPE_DIR, config, checkPhysicalFromWebroot, false);
+ physical = ConfigUtil.getResource(cs, strPhysical, config.getConfigDir(), FileUtil.TYPE_DIR, config, checkPhysicalFromWebroot, false);
if (archive == null) this.physicalFirst = true;
else if (physical == null) this.physicalFirst = false;
}
@@ -182,10 +182,10 @@ private void initArchive() {
synchronized (this) {
if (archive == null && strArchive != null) {
ServletContext cs = (config instanceof ConfigWeb) ? ((ConfigWeb) config).getServletContext() : null;
- Resource tmp = ConfigWebUtil.getResource(cs, strArchive, config.getConfigDir(), FileUtil.TYPE_FILE, config, checkArchiveFromWebroot, true);
+ Resource tmp = ConfigUtil.getResource(cs, strArchive, config.getConfigDir(), FileUtil.TYPE_FILE, config, checkArchiveFromWebroot, true);
if (tmp == null || archMod == tmp.lastModified()) return;
- CFMLEngine engine = ConfigWebUtil.getEngine(config);
+ CFMLEngine engine = ConfigUtil.getEngine(config);
BundleContext bc = engine.getBundleContext();
try {
archiveBundle = OSGiUtil.installBundle(bc, tmp, true);
@@ -609,7 +609,7 @@ public String toString() {
private String toString(boolean forCompare) {
return new StringBuilder().append("StrPhysical:").append(getStrPhysical()).append(";StrArchive:").append(getStrArchive()).append(";Virtual:").append(getVirtual())
.append(";Archive:").append(getArchive()).append(";Physical:").append(getPhysical()).append(";topLevel:").append(topLevel).append(";inspect:")
- .append(ConfigWebUtil.inspectTemplate(getInspectTemplateRaw(), "")).append(";config-inspect:").append(ConfigWebUtil.inspectTemplate(getConfigInspectTemplate(), ""))
+ .append(ConfigUtil.inspectTemplate(getInspectTemplateRaw(), "")).append(";config-inspect:").append(ConfigUtil.inspectTemplate(getConfigInspectTemplate(), ""))
.append(";physicalFirst:").append(physicalFirst).append(";hidden:").append(hidden).append(";readonly:").append(forCompare ? "" : readonly).append(";").toString();
}
diff --git a/core/src/main/java/lucee/runtime/PageSourcePool.java b/core/src/main/java/lucee/runtime/PageSourcePool.java
index 8868586047..7c33fbac60 100644
--- a/core/src/main/java/lucee/runtime/PageSourcePool.java
+++ b/core/src/main/java/lucee/runtime/PageSourcePool.java
@@ -33,7 +33,7 @@
import lucee.commons.io.watch.PageSourcePoolWatcher;
import lucee.commons.lang.SerializableObject;
import lucee.runtime.config.ConfigPro;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.config.Constants;
import lucee.runtime.dump.DumpData;
import lucee.runtime.dump.DumpProperties;
@@ -323,7 +323,7 @@ public int getMaxSize() {
public static void flush(PageContext pc, Resource file) {
if (Constants.isCFML(file)) {
ApplicationContext ac = pc.getApplicationContext();
- List sources = ConfigWebUtil.toAllLoadedPageSource((ConfigPro) pc.getConfig(), ac == null ? null : ac.getMappings(), file);
+ List sources = ConfigUtil.toAllLoadedPageSource((ConfigPro) pc.getConfig(), ac == null ? null : ac.getMappings(), file);
for (PageSource ps: sources) {
((PageSourceImpl) ps).resetLoaded();
((PageSourceImpl) ps).flush();
diff --git a/core/src/main/java/lucee/runtime/cache/CacheUtil.java b/core/src/main/java/lucee/runtime/cache/CacheUtil.java
index 89ff7fc7f6..a984d275d6 100644
--- a/core/src/main/java/lucee/runtime/cache/CacheUtil.java
+++ b/core/src/main/java/lucee/runtime/cache/CacheUtil.java
@@ -370,7 +370,7 @@ public static String toType(int type, String defaultValue) {
* @return
* @throws lucee.runtime.exp.SecurityException
*/
- public static Password getPassword(PageContext pc, String password, boolean server) throws lucee.runtime.exp.SecurityException { // TODO: move this to a utility class in a more
+ public static Password getPassword(PageContext pc, String password) throws lucee.runtime.exp.SecurityException { // TODO: move this to a utility class in a more
// generic package?
// no password passed
if (StringUtil.isEmpty(password, true)) {
@@ -383,6 +383,6 @@ public static Password getPassword(PageContext pc, String password, boolean serv
"A Web Admin Password is required to manipulate Cache connections. " + "You can either pass the password as an argument to this function, or set it in "
+ (Constants.CFML_APPLICATION_EVENT_HANDLER) + " with the variable [this.webAdminPassword].");
- return PasswordImpl.passwordToCompare(pc.getConfig(), server, password);
+ return PasswordImpl.passwordToCompare(pc.getConfig(), password);
}
}
\ No newline at end of file
diff --git a/core/src/main/java/lucee/runtime/cache/ram/RamCache.java b/core/src/main/java/lucee/runtime/cache/ram/RamCache.java
index c25f0e4dbc..944b3ac1de 100755
--- a/core/src/main/java/lucee/runtime/cache/ram/RamCache.java
+++ b/core/src/main/java/lucee/runtime/cache/ram/RamCache.java
@@ -40,7 +40,7 @@
import lucee.runtime.cache.ram.ref.Ref;
import lucee.runtime.cache.ram.ref.SoftRef;
import lucee.runtime.config.Config;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.engine.CFMLEngineImpl;
import lucee.runtime.engine.ThreadLocalPageContext;
import lucee.runtime.op.Caster;
@@ -75,7 +75,7 @@ public static void doNotifyAll(CFMLEngineImpl cfmlEngineImpl) {
public RamCache() {
Config config = ThreadLocalPageContext.getConfig();
if (config != null) {
- CFMLEngineImpl engine = CFMLEngineImpl.toCFMLEngineImpl(ConfigWebUtil.getEngine(config), null);
+ CFMLEngineImpl engine = CFMLEngineImpl.toCFMLEngineImpl(ConfigUtil.getEngine(config), null);
if (engine != null) {
controller = new Controler(engine, this);
controller.start();
@@ -88,7 +88,7 @@ public void init(Config config, String cacheName, Struct arguments) throws IOExc
// RamCache is also used without calling init, because of that we have this test in constructor and
// here
if (controller == null) {
- CFMLEngineImpl engine = CFMLEngineImpl.toCFMLEngineImpl(ConfigWebUtil.getEngine(config), null);
+ CFMLEngineImpl engine = CFMLEngineImpl.toCFMLEngineImpl(ConfigUtil.getEngine(config), null);
if (engine != null) {
controller = new Controler(engine, this);
controller.start();
diff --git a/core/src/main/java/lucee/runtime/component/ComponentLoader.java b/core/src/main/java/lucee/runtime/component/ComponentLoader.java
index c5662b4b19..6042eda50f 100755
--- a/core/src/main/java/lucee/runtime/component/ComponentLoader.java
+++ b/core/src/main/java/lucee/runtime/component/ComponentLoader.java
@@ -47,7 +47,7 @@
import lucee.runtime.StaticScope;
import lucee.runtime.SubPage;
import lucee.runtime.config.ConfigPro;
-import lucee.runtime.config.ConfigWebUtil;
+import lucee.runtime.config.ConfigUtil;
import lucee.runtime.config.Constants;
import lucee.runtime.debug.DebugEntryTemplate;
import lucee.runtime.exp.ApplicationException;
@@ -450,7 +450,7 @@ private static Object _search(PageContext pc, PageSource loadingLocation, String
if (returnType == RETURN_TYPE_COMPONENT) {
Resource res = ResourceUtil.toResourceExisting(pc, pathWithCFC, true, null);
if (res != null) {
- ps = ConfigWebUtil.toComponentPageSource(pc, res, null);
+ ps = ConfigUtil.toComponentPageSource(pc, res, null);
if (ps != null) {
page = toCIPage(PageSourceImpl.loadPage(pc, new PageSource[] { ps }, null));
if (page != null) {
diff --git a/core/src/main/java/lucee/runtime/config/CFConfigImport.java b/core/src/main/java/lucee/runtime/config/CFConfigImport.java
index 5f0451838e..31ea2c9851 100644
--- a/core/src/main/java/lucee/runtime/config/CFConfigImport.java
+++ b/core/src/main/java/lucee/runtime/config/CFConfigImport.java
@@ -127,7 +127,7 @@ public Struct execute(boolean throwException) throws PageException {
// dynAttr = (DynamicAttributes) tag;
boolean isServer = "server".equalsIgnoreCase(type);
- String strPW = ConfigWebUtil.decrypt(password);
+ String strPW = ConfigUtil.decrypt(password);
Password pw; // hash password if
if (isServer && config instanceof ConfigWebPro) {
pw = ((ConfigWebPro) config).isServerPasswordEqual(strPW);
@@ -209,7 +209,7 @@ private boolean setPasswordIfNecessary(ConfigPro config) throws PageException {
if (!hasPassword) {
// create password
try {
- if (config instanceof ConfigWebPro && isServer) ((ConfigWebPro) config).updatePassword(isServer, null, password);
+ if (config instanceof ConfigWebPro && isServer) ((ConfigWebPro) config).updatePassword(null, password);
else {
PasswordImpl.updatePassword(config, null, password);
}
diff --git a/core/src/main/java/lucee/runtime/config/ConfigAdmin.java b/core/src/main/java/lucee/runtime/config/ConfigAdmin.java
index c6016f0c2d..37fa1b8b14 100755
--- a/core/src/main/java/lucee/runtime/config/ConfigAdmin.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigAdmin.java
@@ -53,7 +53,7 @@
import com.allaire.cfx.CustomTag;
-import lucee.aprint;
+import lucee.print;
import lucee.commons.digest.MD5;
import lucee.commons.io.CharsetUtil;
import lucee.commons.io.FileUtil;
@@ -215,11 +215,11 @@ public static ConfigAdmin newInstance(Config config, Password password, boolean
}
private void checkWriteAccess() throws SecurityException {
- if (!optionalPW) ConfigWebUtil.checkGeneralWriteAccess(config, password);
+ if (!optionalPW) ConfigUtil.checkGeneralWriteAccess(config, password);
}
private void checkReadAccess() throws SecurityException {
- if (!optionalPW) ConfigWebUtil.checkGeneralReadAccess(config, password);
+ if (!optionalPW) ConfigUtil.checkGeneralReadAccess(config, password);
}
/**
@@ -269,7 +269,7 @@ public void removePassword(String contextPath) throws PageException, IOException
else {
ConfigServerImpl cs = (ConfigServerImpl) config;
ConfigWebImpl cw = (ConfigWebImpl) cs.getConfigWeb(contextPath);
- if (cw != null) cw.updatePassword(false, cw.getPassword(), null);
+ // MUST if (cw != null) cw.updatePassword(false, cw.getPassword(), null);
}
}
@@ -325,36 +325,28 @@ public synchronized void storeAndReload() throws PageException, ClassException,
private synchronized void _store() throws ConverterException, IOException {
JSONConverter json = new JSONConverter(true, CharsetUtil.UTF8, JSONDateFormat.PATTERN_CF, false);
String str = json.serialize(null, root, SerializationSettings.SERIALIZE_AS_ROW, true);
+ print.e(config.getConfigFile());
+ print.e(str);
IOUtil.write(config.getConfigFile(), str, CharsetUtil.UTF8, false);
}
private synchronized void _reload() throws PageException, ClassException, IOException, TagLibException, FunctionLibException, BundleException {
-
+ print.e("------------ _reload -----------------");
+ print.e(config);
// if(storeInMemoryData)XMLCaster.writeTo(doc,config.getConfigFile());
- CFMLEngine engine = ConfigWebUtil.getEngine(config);
- if (config instanceof ConfigServerImpl) {
-
- ConfigServerImpl cs = (ConfigServerImpl) config;
- ConfigServerFactory.reloadInstance(engine, cs);
- ConfigWeb[] webs = cs.getConfigWebs();
- for (ConfigWeb web: webs) {
- ConfigWebFactory.reloadInstance(engine, (ConfigServerImpl) config, (ConfigWebImpl) web, true);
-
- }
+ CFMLEngine engine = ConfigUtil.getEngine(config);
+ ConfigServerImpl cs;
+ if (config instanceof ConfigWebImpl) {
+ cs = ((ConfigWebImpl) config).getConfigServerImpl();
}
- else if (config instanceof ConfigWebImpl) {
- ConfigServerImpl cs = ((ConfigWebImpl) config).getConfigServerImpl();
- ConfigWebFactory.reloadInstance(engine, cs, (ConfigWebImpl) config, false);
+ else {
+ cs = (ConfigServerImpl) config;
}
- else if (config instanceof SingleContextConfigWeb) {
- if (true) throw new RuntimeException("important exception, please report to Lucee");
- // TODO remove this this should never happening
- aprint.ds();
- SingleContextConfigWeb sccw = (SingleContextConfigWeb) config;
- ConfigServerImpl cs = sccw.getConfigServerImpl();
- ConfigServerFactory.reloadInstance(engine, cs);
- sccw.reload();
+ ConfigServerFactory.reloadInstance(engine, cs);
+ ConfigWeb[] webs = cs.getConfigWebs();
+ for (ConfigWeb web: webs) {
+ ConfigWebFactory.reloadInstance(engine, cs, (ConfigWebImpl) web, true);
}
}
@@ -366,7 +358,7 @@ else if (config instanceof SingleContextConfigWeb) {
public void setTaskMaxThreads(Integer maxThreads) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update task settings");
Struct mail = _getRootElement("remoteClients");
mail.setEL("maxThreads", Caster.toString(maxThreads, ""));
@@ -382,12 +374,12 @@ public void setTaskMaxThreads(Integer maxThreads) throws SecurityException {
public void setMailLog(Config config, String logFile, String level) throws PageException {
ConfigPro ci = (ConfigPro) config;
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
if (!hasAccess) throw new SecurityException("no access to update mail server settings");
- ConfigWebUtil.getFile(config, config.getRootDirectory(), logFile, FileUtil.TYPE_FILE);
+ ConfigUtil.getFile(config, config.getRootDirectory(), logFile, FileUtil.TYPE_FILE);
- Struct loggers = ConfigWebUtil.getAsStruct("loggers", root);
+ Struct loggers = ConfigUtil.getAsStruct("loggers", root);
Struct logger = Caster.toStruct(loggers.get(KeyConstants._mail, null), null);
if (logger == null) {
@@ -414,7 +406,7 @@ public void setMailLog(Config config, String logFile, String level) throws PageE
*/
public void setMailSpoolEnable(Boolean spoolEnable) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
if (!hasAccess) throw new SecurityException("no access to update mail server settings");
root.setEL("mailSpoolEnable", Caster.toString(spoolEnable, ""));
@@ -428,7 +420,7 @@ public void setMailSpoolEnable(Boolean spoolEnable) throws SecurityException {
*/
public void setMailTimeout(Integer timeout) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
if (!hasAccess) throw new SecurityException("no access to update mail server settings");
root.setEL("mailConnectionTimeout", Caster.toString(timeout, ""));
}
@@ -441,7 +433,7 @@ public void setMailTimeout(Integer timeout) throws SecurityException {
*/
public void setMailDefaultCharset(String charset) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
if (!hasAccess) throw new SecurityException("no access to update mail server settings");
if (!StringUtil.isEmpty(charset)) {
@@ -470,7 +462,7 @@ public void setMailDefaultCharset(String charset) throws PageException {
public void updateMailServer(int id, String hostName, String username, String password, int port, boolean tls, boolean ssl, long lifeTimeSpan, long idleTimeSpan,
boolean reuseConnections) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_MAIL);
if (!hasAccess) throw new SecurityException("no access to update mail server settings");
if (port < 1) port = 21;
@@ -478,7 +470,7 @@ public void updateMailServer(int id, String hostName, String username, String pa
if (hostName == null || hostName.trim().length() == 0) throw new ExpressionException("Host (SMTP) cannot be an empty value");
hostName = hostName.trim();
- Array children = ConfigWebUtil.getAsArray("mailServers", root);
+ Array children = ConfigUtil.getAsArray("mailServers", root);
boolean checkId = id > 0;
@@ -512,7 +504,7 @@ public void updateMailServer(int id, String hostName, String username, String pa
}
server.setEL("smtp", hostName);
server.setEL(KeyConstants._username, username);
- server.setEL(KeyConstants._password, ConfigWebUtil.encrypt(password));
+ server.setEL(KeyConstants._password, ConfigUtil.encrypt(password));
server.setEL(KeyConstants._port, (port));
server.setEL("tls", (tls));
server.setEL("ssl", (ssl));
@@ -529,7 +521,7 @@ public void updateMailServer(int id, String hostName, String username, String pa
*/
public void removeMailServer(String hostName, String username) throws SecurityException {
checkWriteAccess();
- Array children = ConfigWebUtil.getAsArray("mailServers", root);
+ Array children = ConfigUtil.getAsArray("mailServers", root);
Key[] keys = children.keys();
String _hostName, _username;
if (children.size() > 0) {
@@ -549,7 +541,7 @@ public void removeMailServer(String hostName, String username) throws SecurityEx
public void removeLogSetting(String name) throws SecurityException {
checkWriteAccess();
- Struct children = ConfigWebUtil.getAsStruct("loggers", root);
+ Struct children = ConfigUtil.getAsStruct("loggers", root);
if (children.size() > 0) {
String _name;
Key[] keys = children.keys();
@@ -694,8 +686,7 @@ public void updateMapping(String virtual, String physical, String archive, Strin
private void _updateMapping(String virtual, String physical, String archive, String primary, short inspect, int inspectTemplateIntervalSlow, int inspectTemplateIntervalFast,
boolean toplevel, int listenerMode, int listenerType, boolean readOnly) throws ExpressionException, SecurityException {
-
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_MAPPING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_MAPPING);
virtual = virtual.trim();
if (physical == null) physical = "";
else physical = physical.trim();
@@ -719,7 +710,7 @@ private void _updateMapping(String virtual, String physical, String archive, Str
if (!isArchive && archive.length() > 0 && physical.length() == 0) isArchive = true;
- Struct children = ConfigWebUtil.getAsStruct("mappings", root);
+ Struct children = ConfigUtil.getAsStruct("mappings", root);
Key[] keys = children.keys();
Struct el = null;
for (Key key: keys) {
@@ -765,7 +756,7 @@ else if (el.containsKey("archive")) {
el.setEL("primary", isArchive ? "archive" : "physical");
// listener-type
- String type = ConfigWebUtil.toListenerType(listenerType, null);
+ String type = ConfigUtil.toListenerType(listenerType, null);
if (type != null) {
el.setEL("listenerType", type);
}
@@ -774,7 +765,7 @@ else if (el.containsKey("listenerType")) {
}
// listener-mode
- String mode = ConfigWebUtil.toListenerMode(listenerMode, null);
+ String mode = ConfigUtil.toListenerMode(listenerMode, null);
if (mode != null) {
el.setEL("listenerMode", mode);
}
@@ -783,7 +774,7 @@ else if (el.containsKey("listenerMode")) {
}
// others
- String str = ConfigWebUtil.inspectTemplate(inspect, "");
+ String str = ConfigUtil.inspectTemplate(inspect, "");
if (!StringUtil.isEmpty(str)) el.setEL("inspectTemplate", str);
else el.removeEL(KeyImpl.init("inspectTemplate"));
if (ConfigPro.INSPECT_INTERVAL_SLOW != inspectTemplateIntervalSlow && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalSlow)
@@ -798,7 +789,7 @@ else if (el.containsKey("listenerMode")) {
// set / to the end
if (!update) {
- children = ConfigWebUtil.getAsStruct("mappings", root);
+ children = ConfigUtil.getAsStruct("mappings", root);
keys = children.keys();
for (Key key: keys) {
Struct tmp = Caster.toStruct(children.get(key, null), null);
@@ -814,7 +805,6 @@ else if (el.containsKey("listenerMode")) {
}
}
-
}
public void updateRestMapping(String virtual, String physical, boolean _default) throws ExpressionException, SecurityException {
@@ -836,7 +826,7 @@ public void updateRestMapping(String virtual, String physical, boolean _default)
if ((physical.length()) == 0) throw new ExpressionException("physical path cannot be an empty value");
Struct rest = _getRootElement("rest");
- Array children = ConfigWebUtil.getAsArray("mapping", rest);
+ Array children = ConfigUtil.getAsArray("mapping", rest);
// remove existing default
if (_default) {
@@ -855,7 +845,7 @@ public void updateRestMapping(String virtual, String physical, boolean _default)
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
- v = ConfigWebUtil.getAsString("virtual", tmp, null);
+ v = ConfigUtil.getAsString("virtual", tmp, null);
if (v != null && v.equals(virtual)) {
el = tmp;
}
@@ -892,7 +882,7 @@ public void _removeMapping(String virtual) throws ExpressionException {
if (!virtual.equals("/") && virtual.endsWith("/")) virtual = virtual.substring(0, virtual.length() - 1);
if (virtual.charAt(0) != '/') throw new ExpressionException("virtual path must start with [/]");
- Struct children = ConfigWebUtil.getAsStruct("mappings", root);
+ Struct children = ConfigUtil.getAsStruct("mappings", root);
Key[] keys = children.keys();
for (Key key: keys) {
Struct tmp = Caster.toStruct(children.get(key, null), null);
@@ -918,14 +908,14 @@ public void removeRestMapping(String virtual) throws ExpressionException, Securi
if (virtual.endsWith("/")) virtual = virtual.substring(0, virtual.length() - 1);
if (virtual.charAt(0) != '/') virtual = "/" + virtual;
- Array children = ConfigWebUtil.getAsArray("rest", "mapping", root);
+ Array children = ConfigUtil.getAsArray("rest", "mapping", root);
Key[] keys = children.keys();
for (int i = keys.length - 1; i >= 0; i--) {
Key key = keys[i];
Struct tmp = Caster.toStruct(children.get(key, null), null);
if (tmp == null) continue;
- String v = ConfigWebUtil.getAsString("virtual", tmp, null);
+ String v = ConfigUtil.getAsString("virtual", tmp, null);
if (v != null) {
if (!v.equals("/") && v.endsWith("/")) v = v.substring(0, v.length() - 1);
if (v != null && v.equals(virtual)) {
@@ -944,7 +934,7 @@ public void removeRestMapping(String virtual) throws ExpressionException, Securi
public void removeCustomTag(String virtual) throws SecurityException {
checkWriteAccess();
- Array mappings = ConfigWebUtil.getAsArray("customTagMappings", root);
+ Array mappings = ConfigUtil.getAsArray("customTagMappings", root);
Key[] keys = mappings.keys();
Struct data;
String v;
@@ -961,7 +951,7 @@ public void removeCustomTag(String virtual) throws SecurityException {
}
private void _removeScheduledTask(String name) throws ExpressionException {
- Array tasks = ConfigWebUtil.getAsArray("scheduledTasks", root);
+ Array tasks = ConfigUtil.getAsArray("scheduledTasks", root);
Key[] keys = tasks.keys();
Struct data;
String n;
@@ -983,7 +973,7 @@ private void _removeScheduledTask(String name) throws ExpressionException {
public void removeComponentMapping(String virtual) throws SecurityException {
checkWriteAccess();
- Array mappings = ConfigWebUtil.getAsArray("componentMappings", root);
+ Array mappings = ConfigUtil.getAsArray("componentMappings", root);
Key[] keys = mappings.keys();
Struct data;
String v;
@@ -1018,7 +1008,7 @@ public void updateCustomTag(String virtual, String physical, String archive, Str
private void _updateCustomTag(String virtual, String physical, String archive, String primary, short inspect, int inspectTemplateIntervalSlow, int inspectTemplateIntervalFast)
throws ExpressionException, SecurityException {
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG);
if (!hasAccess) throw new SecurityException("no access to change custom tag settings");
if (physical == null) physical = "";
if (archive == null) archive = "";
@@ -1034,7 +1024,7 @@ private void _updateCustomTag(String virtual, String physical, String archive, S
throw new ExpressionException("physical must have a value when primary has value physical");
}
- Array mappings = ConfigWebUtil.getAsArray("customTagMappings", root);
+ Array mappings = ConfigUtil.getAsArray("customTagMappings", root);
Key[] keys = mappings.keys();
// Update
String v;
@@ -1049,7 +1039,7 @@ private void _updateCustomTag(String virtual, String physical, String archive, S
el.setEL("physical", physical);
el.setEL("archive", archive);
el.setEL("primary", primary.equalsIgnoreCase("archive") ? "archive" : "physical");
- String str = ConfigWebUtil.inspectTemplate(inspect, "");
+ String str = ConfigUtil.inspectTemplate(inspect, "");
if (!StringUtil.isEmpty(str)) el.setEL("inspectTemplate", str);
else el.removeEL(KeyImpl.init("inspectTemplate"));
if (ConfigPro.INSPECT_INTERVAL_SLOW != inspectTemplateIntervalSlow && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalSlow)
@@ -1071,8 +1061,8 @@ private void _updateCustomTag(String virtual, String physical, String archive, S
if (archive.length() > 0) el.setEL("archive", archive);
el.setEL("primary", primary.equalsIgnoreCase("archive") ? "archive" : "physical");
- String str = ConfigWebUtil.inspectTemplate(inspect, "");
- if (!StringUtil.isEmpty(str)) el.setEL("inspectTemplate", ConfigWebUtil.inspectTemplate(inspect, ""));
+ String str = ConfigUtil.inspectTemplate(inspect, "");
+ if (!StringUtil.isEmpty(str)) el.setEL("inspectTemplate", ConfigUtil.inspectTemplate(inspect, ""));
if (ConfigPro.INSPECT_INTERVAL_SLOW != inspectTemplateIntervalSlow && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalSlow)
el.setEL("inspectTemplateIntervalSlow", Caster.toString(inspectTemplateIntervalSlow, ""));
if (ConfigPro.INSPECT_INTERVAL_FAST != inspectTemplateIntervalFast && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalFast)
@@ -1081,7 +1071,7 @@ private void _updateCustomTag(String virtual, String physical, String archive, S
}
private Struct _getScheduledTask(String name, boolean throwWhenNotExist) throws ExpressionException {
- Array scheduledTasks = ConfigWebUtil.getAsArray("scheduledTasks", root);
+ Array scheduledTasks = ConfigUtil.getAsArray("scheduledTasks", root);
Key[] keys = scheduledTasks.keys();
// Update
Struct data = null;
@@ -1107,7 +1097,7 @@ private Struct _getScheduledTask(String name, boolean throwWhenNotExist) throws
}
private Array _getScheduledTasks() {
- return ConfigWebUtil.getAsArray("scheduledTasks", root);
+ return ConfigUtil.getAsArray("scheduledTasks", root);
}
public void updateComponentMapping(String virtual, String physical, String archive, String primary, short inspect, int inspectTemplateIntervalSlow,
@@ -1133,7 +1123,7 @@ private void _updateComponentMapping(String virtual, String physical, String arc
throw new ExpressionException("physical must have a value when primary has value physical");
}
- Array componentMappings = ConfigWebUtil.getAsArray("componentMappings", root);
+ Array componentMappings = ConfigUtil.getAsArray("componentMappings", root);
Key[] keys = componentMappings.keys();
Struct el;
@@ -1152,7 +1142,7 @@ private void _updateComponentMapping(String virtual, String physical, String arc
data.setEL("physical", physical);
data.setEL("archive", archive);
data.setEL("primary", primary.equalsIgnoreCase("archive") ? "archive" : "physical");
- String str = ConfigWebUtil.inspectTemplate(inspect, "");
+ String str = ConfigUtil.inspectTemplate(inspect, "");
if (!StringUtil.isEmpty(str)) data.setEL("inspectTemplate", str);
else data.removeEL(KeyImpl.init("inspectTemplate"));
if (ConfigPro.INSPECT_INTERVAL_SLOW != inspectTemplateIntervalSlow && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalSlow)
@@ -1172,8 +1162,8 @@ private void _updateComponentMapping(String virtual, String physical, String arc
if (physical.length() > 0) el.setEL("physical", physical);
if (archive.length() > 0) el.setEL("archive", archive);
el.setEL("primary", primary.equalsIgnoreCase("archive") ? "archive" : "physical");
- String str = ConfigWebUtil.inspectTemplate(inspect, "");
- if (!StringUtil.isEmpty(str)) el.setEL("inspectTemplate", ConfigWebUtil.inspectTemplate(inspect, ""));
+ String str = ConfigUtil.inspectTemplate(inspect, "");
+ if (!StringUtil.isEmpty(str)) el.setEL("inspectTemplate", ConfigUtil.inspectTemplate(inspect, ""));
if (ConfigPro.INSPECT_INTERVAL_SLOW != inspectTemplateIntervalSlow && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalSlow)
el.setEL("inspectTemplateIntervalSlow", Caster.toString(inspectTemplateIntervalSlow, ""));
if (ConfigPro.INSPECT_INTERVAL_FAST != inspectTemplateIntervalFast && ConfigPro.INSPECT_INTERVAL_UNDEFINED != inspectTemplateIntervalFast)
@@ -1337,13 +1327,13 @@ static void updateJar(Config config, InputStream is, String name, boolean closeS
*/
public void updateJavaCFX(String name, ClassDefinition cd) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_CFX_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_CFX_SETTING);
if (!hasAccess) throw new SecurityException("no access to change cfx settings");
if (name == null || name.length() == 0) throw new ExpressionException("class name can't be an empty value");
- Struct cfxs = ConfigWebUtil.getAsStruct("cfx", root);
+ Struct cfxs = ConfigUtil.getAsStruct("cfx", root);
Key[] keys = cfxs.keys();
// Update
for (Key key: keys) {
@@ -1352,7 +1342,7 @@ public void updateJavaCFX(String name, ClassDefinition cd) throws PageException
if (n != null && n.equalsIgnoreCase(name)) {
Struct data = Caster.toStruct(cfxs.get(key, null), null);
if (data == null) continue;
- if (!"java".equalsIgnoreCase(ConfigWebUtil.getAsString("type", data, ""))) throw new ExpressionException("there is already a c++ cfx tag with this name");
+ if (!"java".equalsIgnoreCase(ConfigUtil.getAsString("type", data, ""))) throw new ExpressionException("there is already a c++ cfx tag with this name");
setClass(data, CustomTag.class, "", cd);
data.setEL("type", "java");
return;
@@ -1410,7 +1400,7 @@ public void removeCFX(String name) throws ExpressionException, SecurityException
// check parameters
if (name == null || name.length() == 0) throw new ExpressionException("name for CFX Tag can be an empty value");
- Struct cfxs = ConfigWebUtil.getAsStruct("cfx", root);
+ Struct cfxs = ConfigUtil.getAsStruct("cfx", root);
Key[] keys = cfxs.keys();
for (Key key: keys) {
String n = key.getString();
@@ -1464,7 +1454,7 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
// check parameters
if (name == null || name.length() == 0) throw new ExpressionException("name can't be an empty value");
- Struct children = ConfigWebUtil.getAsStruct("dataSources", root);
+ Struct children = ConfigUtil.getAsStruct("dataSources", root);
Key[] keys = children.keys();
boolean isUpdate = false;
@@ -1478,7 +1468,7 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
if (tmp == null) continue;
el = tmp;
isUpdate = true;
- if (password.equalsIgnoreCase("****************")) password = ConfigWebUtil.getAsString("password", el, null);
+ if (password.equalsIgnoreCase("****************")) password = ConfigUtil.getAsString("password", el, null);
if (isNameUpdate) el.setEL("name", newName);
setClass(el, null, "", cd);
@@ -1488,7 +1478,7 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
el.setEL(KeyConstants._dsn, dsn);
el.setEL(KeyConstants._username, username);
- el.setEL(KeyConstants._password, ConfigWebUtil.encrypt(password));
+ el.setEL(KeyConstants._password, ConfigUtil.encrypt(password));
el.setEL(KeyConstants._host, host);
if (!StringUtil.isEmpty(timezone)) el.setEL(KeyConstants._timezone, timezone);
@@ -1548,7 +1538,7 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
else if (el.containsKey(KeyConstants._id)) el.removeEL(KeyConstants._id);
el.setEL(KeyConstants._username, username);
- el.setEL(KeyConstants._password, ConfigWebUtil.encrypt(password));
+ el.setEL(KeyConstants._password, ConfigUtil.encrypt(password));
el.setEL("host", host);
if (!StringUtil.isEmpty(timezone)) el.setEL("timezone", timezone);
@@ -1592,7 +1582,7 @@ private void _removeJDBCDriver(ClassDefinition cd) throws PageException {
if (!cd.isBundle()) throw new ApplicationException("missing bundle name");
- Struct children = ConfigWebUtil.getAsStruct("jdbcDrivers", root);
+ Struct children = ConfigUtil.getAsStruct("jdbcDrivers", root);
Key[] keys = children.keys();
// Remove
for (Key key: keys) {
@@ -1619,7 +1609,7 @@ private void _removeStartupHook(ClassDefinition cd) throws PageException {
if (!cd.isBundle()) throw new ApplicationException("missing bundle name");
- Array children = ConfigWebUtil.getAsArray("startupHooks", root);
+ Array children = ConfigUtil.getAsArray("startupHooks", root);
Key[] keys = children.keys();
// Remove
for (int i = keys.length - 1; i >= 0; i--) {
@@ -1627,7 +1617,7 @@ private void _removeStartupHook(ClassDefinition cd) throws PageException {
Struct tmp = Caster.toStruct(children.get(key, null), null);
if (tmp == null) continue;
- String n = ConfigWebUtil.getAsString("class", tmp, "");
+ String n = ConfigUtil.getAsString("class", tmp, "");
if (n.equalsIgnoreCase(cd.getClassName())) {
children.removeEL(key);
break;
@@ -1650,7 +1640,7 @@ private void _removeStartupHook(ClassDefinition cd) throws PageException {
private void _removeStartupHook(String component) {
- Array children = ConfigWebUtil.getAsArray("startupHooks", root);
+ Array children = ConfigUtil.getAsArray("startupHooks", root);
Key[] keys = children.keys();
// Remove
for (int i = keys.length - 1; i >= 0; i--) {
@@ -1694,7 +1684,7 @@ private void _updateJDBCDriver(String label, String id, ClassDefinition cd, Stri
// check if it is a bundle
if (!cd.isBundle()) throw new ApplicationException("missing bundle name for [" + label + "]");
- Struct children = ConfigWebUtil.getAsStruct("jdbcDrivers", root);
+ Struct children = ConfigUtil.getAsStruct("jdbcDrivers", root);
Key[] keys = children.keys();
// Update
Struct child = null;
@@ -1741,7 +1731,7 @@ private void _updateStartupHook(ClassDefinition cd) throws PageException {
// check if it is a bundle
if (!cd.isBundle()) throw new ApplicationException("missing bundle info");
- Array children = ConfigWebUtil.getAsArray("startupHooks", root);
+ Array children = ConfigUtil.getAsArray("startupHooks", root);
// Update
Struct child = null;
@@ -1749,7 +1739,7 @@ private void _updateStartupHook(ClassDefinition cd) throws PageException {
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
- String n = ConfigWebUtil.getAsString("class", tmp, null);
+ String n = ConfigUtil.getAsString("class", tmp, null);
if (n.equalsIgnoreCase(cd.getClassName())) {
child = tmp;
break;
@@ -1781,7 +1771,7 @@ private void _updateStartupHook(ClassDefinition cd) throws PageException {
private void _updateStartupHook(String component) {
// unloadStartupIfNecessary(config, cd, false);
- Array children = ConfigWebUtil.getAsArray("startupHooks", root);
+ Array children = ConfigUtil.getAsArray("startupHooks", root);
// Update
Struct child = null;
@@ -1789,7 +1779,7 @@ private void _updateStartupHook(String component) {
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
- String n = ConfigWebUtil.getAsString("component", tmp, null);
+ String n = ConfigUtil.getAsString("component", tmp, null);
if (n.equalsIgnoreCase(component)) {
child = tmp;
break;
@@ -1809,7 +1799,7 @@ private void _updateStartupHook(String component) {
public void updateGatewayEntry(String id, ClassDefinition cd, String componentPath, String listenerCfcPath, int startupMode, Struct custom, boolean readOnly)
throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_GATEWAY);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_GATEWAY);
if (!hasAccess) throw new SecurityException("no access to update gateway entry");
_updateGatewayEntry(id, cd, componentPath, listenerCfcPath, startupMode, custom, readOnly);
@@ -1823,7 +1813,7 @@ void _updateGatewayEntry(String id, ClassDefinition cd, String componentPath, St
if ((cd == null || StringUtil.isEmpty(cd.getClassName())) && StringUtil.isEmpty(componentPath)) throw new ExpressionException("you must define className or componentPath");
- Struct children = ConfigWebUtil.getAsStruct("gateways", root);
+ Struct children = ConfigUtil.getAsStruct("gateways", root);
Key[] keys = children.keys();
// Update
@@ -1987,7 +1977,7 @@ public void updateAIConnection(String name, ClassDefinition cd, String _default,
public void updateCacheConnection(String name, ClassDefinition cd, int _default, Struct custom, boolean readOnly, boolean storage) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
if (!hasAccess) throw new SecurityException("no access to update cache connection");
// check parameters
@@ -2051,7 +2041,7 @@ else if (_default == ConfigPro.CACHE_TYPE_WEBSERVICE) {
// Update
// boolean isUpdate=false;
- Struct conns = ConfigWebUtil.getAsStruct("caches", root);
+ Struct conns = ConfigUtil.getAsStruct("caches", root);
Iterator it = conns.keyIterator();
Key key;
while (it.hasNext()) {
@@ -2083,7 +2073,7 @@ private void rem(Struct sct, String key) {
public void removeCacheDefaultConnection(int type) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
if (!hasAccess) throw new SecurityException("no access to update cache connections");
Struct parent = _getRootElement("cache");
@@ -2118,7 +2108,7 @@ else if (type == ConfigPro.CACHE_TYPE_WEBSERVICE) {
public void updateCacheDefaultConnection(int type, String name) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
if (!hasAccess) throw new SecurityException("no access to update cache default connections");
@@ -2165,7 +2155,7 @@ public void removeResourceProvider(String scheme) throws PageException {
public void _removeResourceProvider(String scheme) {
- Array children = ConfigWebUtil.getAsArray("resourceProviders", root);
+ Array children = ConfigUtil.getAsArray("resourceProviders", root);
Key[] keys = children.keys();
// remove
@@ -2174,7 +2164,7 @@ public void _removeResourceProvider(String scheme) {
Struct tmp = Caster.toStruct(children.get(key, null), null);
if (tmp == null) continue;
- String elScheme = ConfigWebUtil.getAsString("scheme", tmp, "");
+ String elScheme = ConfigUtil.getAsString("scheme", tmp, "");
if (elScheme.equalsIgnoreCase(scheme)) {
children.removeEL(key);
break;
@@ -2197,14 +2187,14 @@ public void _updateResourceProvider(String scheme, ClassDefinition cd, Struct ar
// check parameters
if (StringUtil.isEmpty(scheme)) throw new ExpressionException("scheme can't be an empty value");
- Array children = ConfigWebUtil.getAsArray("resourceProviders", root);
+ Array children = ConfigUtil.getAsArray("resourceProviders", root);
// Update
for (int i = 1; i <= children.size(); i++) {
Struct el = Caster.toStruct(children.get(i, null), null);
if (el == null) continue;
- String elScheme = ConfigWebUtil.getAsString("scheme", el, null);
+ String elScheme = ConfigUtil.getAsString("scheme", el, null);
if (elScheme.equalsIgnoreCase(scheme)) {
setClass(el, null, "", cd);
el.setEL("scheme", scheme);
@@ -2229,7 +2219,7 @@ public void updateDefaultResourceProvider(ClassDefinition cd, String arguments)
if (!hasAccess) throw new SecurityException("no access to update resources");
- Array children = ConfigWebUtil.getAsArray("defaultResourceProviders", root);
+ Array children = ConfigUtil.getAsArray("defaultResourceProviders", root);
// Update
for (int i = 1; i <= children.size(); i++) {
@@ -2270,8 +2260,8 @@ private static String encode(String str) {
public Query getResourceProviders() throws PageException {
checkReadAccess();
// check parameters
- Array elProviders = ConfigWebUtil.getAsArray("resourceProviders", root);
- Array elDefaultProviders = ConfigWebUtil.getAsArray("defaultResourceProvider", root);
+ Array elProviders = ConfigUtil.getAsArray("resourceProviders", root);
+ Array elDefaultProviders = ConfigUtil.getAsArray("defaultResourceProvider", root);
ResourceProvider[] providers = config.getResourceProviders();
ResourceProvider defaultProvider = config.getDefaultResourceProvider();
@@ -2294,9 +2284,9 @@ public Query getResourceProviders() throws PageException {
private void getResourceProviders(ResourceProvider[] providers, Query qry, Struct p, int row, Boolean def) throws PageException {
Array support = new ArrayImpl();
- String cn = ConfigWebUtil.getAsString("class", p, null);
- String name = ConfigWebUtil.getAsString("bundleName", p, null);
- String version = ConfigWebUtil.getAsString("bundleVersion", p, null);
+ String cn = ConfigUtil.getAsString("class", p, null);
+ String name = ConfigUtil.getAsString("bundleName", p, null);
+ String version = ConfigUtil.getAsString("bundleVersion", p, null);
ClassDefinition cd = ClassDefinitionImpl.toClassDefinitionImpl(p, null, false, ThreadLocalPageContext.getConfig().getIdentification());
String scheme = Caster.toString(p.get("scheme", null), null);
if (StringUtil.isEmpty(scheme)) {
@@ -2332,7 +2322,7 @@ public void removeJDBCDriver(String className) throws ExpressionException, Secur
// check parameters
if (StringUtil.isEmpty(className)) throw new ExpressionException("class name for jdbc driver cannot be empty");
- Struct children = ConfigWebUtil.getAsStruct("jdbcDrivers", root);
+ Struct children = ConfigUtil.getAsStruct("jdbcDrivers", root);
Key[] keys = children.keys();
for (Key key: keys) {
if (key.getString().equalsIgnoreCase(className)) {
@@ -2353,7 +2343,7 @@ public void removeDataSource(String name) throws ExpressionException, SecurityEx
// check parameters
if (name == null || name.length() == 0) throw new ExpressionException("name for Datasource Connection can be an empty value");
- Struct children = ConfigWebUtil.getAsStruct("dataSources", root);
+ Struct children = ConfigUtil.getAsStruct("dataSources", root);
Key[] keys = children.keys();
for (Key key: keys) {
Struct tmp = Caster.toStruct(children.get(key, null), null);
@@ -2368,7 +2358,7 @@ public void removeDataSource(String name) throws ExpressionException, SecurityEx
public void removeCacheConnection(String name) throws ExpressionException, SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE);
if (!hasAccess) throw new SecurityException("no access to remove cache connection");
// check parameters
@@ -2388,7 +2378,7 @@ public void removeCacheConnection(String name) throws ExpressionException, Secur
if (name.equalsIgnoreCase(Caster.toString(parent.get("defaultWebservice", null), null))) rem(parent, "defaultWebservice");
// remove element
- Struct children = ConfigWebUtil.getAsStruct("caches", root);
+ Struct children = ConfigUtil.getAsStruct("caches", root);
Key[] keys = children.keys();
for (Key key: keys) {
Struct tmp = Caster.toStruct(children.get(key, null), null);
@@ -2418,15 +2408,15 @@ public void removeAIConnection(String name) throws ExpressionException, Security
public boolean cacheConnectionExists(String name) throws ExpressionException, SecurityException {
checkReadAccess();
- if (!ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE)) throw new SecurityException("no access to check cache connection");
+ if (!ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_CACHE)) throw new SecurityException("no access to check cache connection");
if (name == null || name.isEmpty()) throw new ExpressionException("name for Cache Connection can not be an empty value");
- Array children = ConfigWebUtil.getAsArray("cache", "connection", root);
+ Array children = ConfigUtil.getAsArray("cache", "connection", root);
for (int i = 1; i <= children.size(); i++) {
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
- String n = ConfigWebUtil.getAsString("name", tmp, null);
+ String n = ConfigUtil.getAsString("name", tmp, null);
if (n != null && n.equalsIgnoreCase(name)) return true;
}
return false;
@@ -2435,7 +2425,7 @@ public boolean cacheConnectionExists(String name) throws ExpressionException, Se
public void removeGatewayEntry(String name) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_GATEWAY);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_GATEWAY);
if (!hasAccess) throw new SecurityException("no access to remove gateway entry");
_removeGatewayEntry(name);
@@ -2444,7 +2434,7 @@ public void removeGatewayEntry(String name) throws PageException {
protected void _removeGatewayEntry(String name) throws PageException {
if (StringUtil.isEmpty(name)) throw new ExpressionException("name for Gateway Id can be an empty value");
- Struct children = ConfigWebUtil.getAsStruct("gateways", root);
+ Struct children = ConfigUtil.getAsStruct("gateways", root);
Key[] keys = children.keys();
// remove element
for (Key key: keys) {
@@ -2479,20 +2469,20 @@ public void removeRemoteClient(String url) throws ExpressionException, SecurityE
// SNSN
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_REMOTE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_REMOTE);
if (!hasAccess) throw new SecurityException("no access to remove remote client settings");
// check parameters
if (StringUtil.isEmpty(url)) throw new ExpressionException("url for Remote Client can be an empty value");
- Array children = ConfigWebUtil.getAsArray("remoteClients", "remoteClient", root);
+ Array children = ConfigUtil.getAsArray("remoteClients", "remoteClient", root);
Key[] keys = children.keys();
for (int i = keys.length - 1; i >= 0; i--) {
Key key = keys[i];
Struct tmp = Caster.toStruct(children.get(key, null), null);
if (tmp == null) continue;
- String n = ConfigWebUtil.getAsString("url", tmp, null);
+ String n = ConfigUtil.getAsString("url", tmp, null);
if (n != null && n.equalsIgnoreCase(url)) {
children.removeEL(key);
}
@@ -2507,7 +2497,7 @@ public void removeRemoteClient(String url) throws ExpressionException, SecurityE
*/
public void updatePSQ(Boolean psq) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_DATASOURCE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_DATASOURCE);
if (!hasAccess) throw new SecurityException("no access to update datasource connections");
@@ -2516,7 +2506,7 @@ public void updatePSQ(Boolean psq) throws SecurityException {
public void updateInspectTemplate(String inspectTemplate, int inspectTemplateIntervalSlow, int inspectTemplateIntervalFast) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update");
@@ -2528,7 +2518,7 @@ public void updateInspectTemplate(String inspectTemplate, int inspectTemplateInt
public void updateTypeChecking(Boolean typeChecking) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update");
@@ -2539,7 +2529,7 @@ public void updateTypeChecking(Boolean typeChecking) throws SecurityException {
public void updateCachedAfterTimeRange(TimeSpan ts) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update");
if (ts == null) rem(root, "cachedAfter");
@@ -2557,7 +2547,7 @@ public void updateCachedAfterTimeRange(TimeSpan ts) throws SecurityException, Ap
*/
public void updateScopeCascadingType(String type) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2576,7 +2566,7 @@ public void updateScopeCascadingType(String type) throws SecurityException {
*/
public void updateScopeCascadingType(short type) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
if (type == ConfigWeb.SCOPE_STRICT) root.setEL("scopeCascading", "strict");
@@ -2593,7 +2583,7 @@ public void updateScopeCascadingType(short type) throws SecurityException {
*/
public void updateAllowImplicidQueryCall(Boolean allow) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2603,7 +2593,7 @@ public void updateAllowImplicidQueryCall(Boolean allow) throws SecurityException
public void updateMergeFormAndUrl(Boolean merge) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2620,7 +2610,7 @@ public void updateMergeFormAndUrl(Boolean merge) throws SecurityException {
*/
public void updateRequestTimeout(TimeSpan span) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2633,7 +2623,7 @@ public void updateRequestTimeout(TimeSpan span) throws SecurityException, Applic
public void updateApplicationPathTimeout(TimeSpan span) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2652,7 +2642,7 @@ public void updateApplicationPathTimeout(TimeSpan span) throws SecurityException
*/
public void updateSessionTimeout(TimeSpan span) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2670,7 +2660,7 @@ public void updateSessionStorage(String storage) throws SecurityException, Appli
private void updateStorage(String storageName, String storage) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
storage = validateStorage(storage);
@@ -2734,7 +2724,7 @@ private String validateStorage(String storage) throws ApplicationException {
*/
public void updateClientTimeout(TimeSpan span) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2744,7 +2734,7 @@ public void updateClientTimeout(TimeSpan span) throws SecurityException {
public void updateCFMLWriterType(String writerType) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
writerType = writerType.trim();
@@ -2769,7 +2759,7 @@ else if (Decision.isBoolean(writerType)) {
public void updateSuppressContent(Boolean value) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2778,7 +2768,7 @@ public void updateSuppressContent(Boolean value) throws SecurityException {
public void updateShowVersion(Boolean value) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2787,7 +2777,7 @@ public void updateShowVersion(Boolean value) throws SecurityException {
public void updateAllowCompression(Boolean value) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2796,7 +2786,7 @@ public void updateAllowCompression(Boolean value) throws SecurityException {
public void updateContentLength(Boolean value) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2805,7 +2795,7 @@ public void updateContentLength(Boolean value) throws SecurityException {
public void updateBufferOutput(Boolean value) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2820,7 +2810,7 @@ public void updateBufferOutput(Boolean value) throws SecurityException {
*/
public void updateApplicationTimeout(TimeSpan span) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2830,7 +2820,7 @@ public void updateApplicationTimeout(TimeSpan span) throws SecurityException {
public void updateApplicationListener(String type, String mode) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update listener type");
@@ -2840,7 +2830,7 @@ public void updateApplicationListener(String type, String mode) throws SecurityE
public void updateCachedWithin(int type, Object value) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update cachedwithin setting");
String t = AppListenerUtil.toCachedWithinType(type, "");
@@ -2852,7 +2842,7 @@ public void updateCachedWithin(int type, Object value) throws SecurityException,
public void updateProxy(boolean enabled, String server, int port, String username, String password) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update listener type");
@@ -2882,7 +2872,7 @@ public void updateProxy(boolean enabled, String server, int port, String usernam
*/
public void updateSessionManagement(Boolean sessionManagement) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2897,7 +2887,7 @@ public void updateSessionManagement(Boolean sessionManagement) throws SecurityEx
*/
public void updateClientManagement(Boolean clientManagement) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
@@ -2912,7 +2902,7 @@ public void updateClientManagement(Boolean clientManagement) throws SecurityExce
*/
public void updateClientCookies(Boolean clientCookies) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
root.setEL("clientCookies", clientCookies);
@@ -2926,7 +2916,7 @@ public void updateClientCookies(Boolean clientCookies) throws SecurityException
*/
public void updateMode(Boolean developmode) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
root.setEL("developMode", Caster.toString(developmode, ""));
@@ -2940,7 +2930,7 @@ public void updateMode(Boolean developmode) throws SecurityException {
*/
public void updateDomaincookies(Boolean domainCookies) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
root.setEL("domainCookies", Caster.toString(domainCookies, ""));
@@ -2954,7 +2944,7 @@ public void updateDomaincookies(Boolean domainCookies) throws SecurityException
*/
public void updateLocale(String locale) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update regional setting");
root.setEL("locale", locale.trim());
@@ -2971,7 +2961,7 @@ void _updateMonitorEnabled(boolean updateMonitorEnabled) {
public void updateScriptProtect(String strScriptProtect) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update script protect");
root.setEL("scriptProtect", strScriptProtect.trim());
@@ -2979,7 +2969,7 @@ public void updateScriptProtect(String strScriptProtect) throws SecurityExceptio
public void updateAllowURLRequestTimeout(Boolean allowURLRequestTimeout) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update AllowURLRequestTimeout");
root.setEL("requestTimeoutInURL", Caster.toString(allowURLRequestTimeout, ""));
@@ -2997,7 +2987,7 @@ public void updateScriptProtect(int scriptProtect) throws SecurityException {
*/
public void updateTimeZone(String timeZone) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update regional setting");
root.setEL("timezone", timeZone.trim());
@@ -3027,7 +3017,7 @@ public void updateTimeServer(String timeServer, Boolean useTimeServer) throws Pa
}
}
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update regional setting");
root.setEL("timeserver", timeServer.trim());
@@ -3037,7 +3027,7 @@ public void updateTimeServer(String timeServer, Boolean useTimeServer) throws Pa
public void updateComponentDeepSearch(Boolean deepSearch) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component setting");
if (deepSearch != null) root.setEL("componentDeepSearch", Caster.toString(deepSearch.booleanValue()));
else {
@@ -3048,14 +3038,14 @@ public void updateComponentDeepSearch(Boolean deepSearch) throws SecurityExcepti
public void updateComponentDefaultImport(String componentDefaultImport) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component setting");
root.setEL("componentAutoImport", componentDefaultImport);
}
public void updateReturnFormat(String returnFormat) throws SecurityException, ExpressionException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component setting");
root.setEL("returnFormat", UDFUtil.toReturnFormat(UDFUtil.toReturnFormat(returnFormat))); // i make a double toReturnFormat to validate the input
}
@@ -3070,7 +3060,7 @@ public void updateReturnFormat(String returnFormat) throws SecurityException, Ex
public void updateComponentDataMemberDefaultAccess(String strAccess) throws SecurityException, ApplicationException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component setting");
if (StringUtil.isEmpty(strAccess)) {
@@ -3089,7 +3079,7 @@ public void updateComponentDataMemberDefaultAccess(String strAccess) throws Secu
*/
public void updateTriggerDataMember(Boolean triggerDataMember) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update trigger-data-member");
root.setEL("componentImplicitNotation", Caster.toString(triggerDataMember, ""));
@@ -3097,7 +3087,7 @@ public void updateTriggerDataMember(Boolean triggerDataMember) throws SecurityEx
public void updateComponentUseShadow(Boolean useShadow) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update use-shadow");
root.setEL("componentUseVariablesScope", Caster.toString(useShadow, ""));
@@ -3105,7 +3095,7 @@ public void updateComponentUseShadow(Boolean useShadow) throws SecurityException
public void updateComponentLocalSearch(Boolean componentLocalSearch) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component Local Search");
root.setEL("componentLocalSearch", Caster.toString(componentLocalSearch, ""));
@@ -3113,7 +3103,7 @@ public void updateComponentLocalSearch(Boolean componentLocalSearch) throws Secu
public void updateComponentPathCache(Boolean componentPathCache) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component Cache Path");
if (!Caster.toBooleanValue(componentPathCache, false)) config.clearComponentCache();
@@ -3122,7 +3112,7 @@ public void updateComponentPathCache(Boolean componentPathCache) throws Security
public void updateCTPathCache(Boolean ctPathCache) throws SecurityException {
checkWriteAccess();
- if (!ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("no access to update custom tag setting");
+ if (!ConfigUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("no access to update custom tag setting");
if (!Caster.toBooleanValue(ctPathCache, false)) config.clearCTCache();
root.setEL("customTagUseCachePath", Caster.toString(ctPathCache, ""));
@@ -3151,7 +3141,7 @@ public void updateSecurity(String varUsage, Boolean limitEvaluation) throws Secu
public void updateDebug(Boolean debug, Boolean template, Boolean database, Boolean exception, Boolean tracing, Boolean dump, Boolean timer, Boolean implicitAccess,
Boolean queryUsage, Boolean thread) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
if (!hasAccess) throw new SecurityException("no access to change debugging settings");
if (debug != null) root.setEL("debuggingEnabled", debug.booleanValue());
@@ -3187,7 +3177,7 @@ public void updateDebug(Boolean debug, Boolean template, Boolean database, Boole
public void updateMonitoring(Boolean debug, Boolean metric, Boolean doc, Boolean test) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
if (!hasAccess) throw new SecurityException("no access to change monitoring settings");
if (debug != null) root.setEL("showDebug", debug.booleanValue());
@@ -3211,7 +3201,7 @@ public void updateMonitoring(Boolean debug, Boolean metric, Boolean doc, Boolean
*/
public void updateErrorTemplate(int statusCode, String template) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to change error settings");
if (statusCode == 404) root.setEL("errorMissingTemplate", template);
@@ -3220,7 +3210,7 @@ public void updateErrorTemplate(int statusCode, String template) throws Security
public void updateErrorStatusCode(Boolean doStatusCode) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to change error settings");
root.setEL("errorStatusCode", Caster.toString(doStatusCode, ""));
@@ -3228,7 +3218,7 @@ public void updateErrorStatusCode(Boolean doStatusCode) throws SecurityException
public void updateRegexType(String type) throws PageException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to change regex settings");
if (StringUtil.isEmpty(type)) rem(root, "regexType");
@@ -3243,14 +3233,14 @@ public void updateRegexType(String type) throws PageException {
*/
public void updateComponentDumpTemplate(String template) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update component setting");
root.setEL("componentDumpTemplate", template);
}
private Struct _getRootElement(String name) {
- return ConfigWebUtil.getAsStruct(name, root);
+ return ConfigUtil.getAsStruct(name, root);
}
/**
@@ -3319,7 +3309,7 @@ public void updateDefaultSecurity(short accessRead, short accessWrite) throws Se
}
private void removeSecurityFileAccess(Struct parent) {
- Array children = ConfigWebUtil.getAsArray("fileAccess", parent);
+ Array children = ConfigUtil.getAsArray("fileAccess", parent);
Key[] keys = children.keys();
// remove existing
if (children.size() > 0) {
@@ -3336,7 +3326,7 @@ private void updateSecurityFileAccess(Struct parent, Resource[] fileAccess, shor
// insert
if (!ArrayUtil.isEmpty(fileAccess) && file != SecurityManager.VALUE_ALL) {
Struct fa;
- Array children = ConfigWebUtil.getAsArray("fileAccess", parent);
+ Array children = ConfigUtil.getAsArray("fileAccess", parent);
for (int i = 0; i < fileAccess.length; i++) {
fa = new StructImpl();
fa.setEL("path", fileAccess[i].getAbsolutePath());
@@ -3377,7 +3367,7 @@ public void updateSecurity(String id, short setting, short file, Resource[] file
if (!(config instanceof ConfigServer)) throw new SecurityException("can't change security settings from this context");
Struct security = _getRootElement("security");
- Array children = ConfigWebUtil.getAsArray("accessor", security);
+ Array children = ConfigUtil.getAsArray("accessor", security);
Struct accessor = null;
for (int i = 1; i <= children.size(); i++) {
Struct tmp = Caster.toStruct(children.get(i, null), null);
@@ -3453,7 +3443,7 @@ public void removeDefaultPassword() throws SecurityException {
*/
public void updateSessionType(String type) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
type = type.toLowerCase().trim();
@@ -3463,7 +3453,7 @@ public void updateSessionType(String type) throws SecurityException {
public void updateLocalMode(String mode) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("no access to update scope setting");
mode = mode.toLowerCase().trim();
@@ -3514,14 +3504,14 @@ public void updateUpdate(String type, String location) throws SecurityException
*/
public void createSecurityManager(Password password, String id) throws PageException {
checkWriteAccess();
- ConfigServerImpl cs = (ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password);
+ ConfigServerImpl cs = (ConfigServerImpl) ConfigUtil.getConfigServer(config);
SecurityManagerImpl dsm = (SecurityManagerImpl) cs.getDefaultSecurityManager().cloneSecurityManager();
cs.setSecurityManager(id, dsm);
Struct security = _getRootElement("security");
Struct accessor = null;
- Array children = ConfigWebUtil.getAsArray("accessor", security);
+ Array children = ConfigUtil.getAsArray("accessor", security);
for (int i = 1; i <= children.size(); i++) {
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
@@ -3567,16 +3557,16 @@ public void createSecurityManager(Password password, String id) throws PageExcep
*/
public void removeSecurityManager(Password password, String id) throws PageException {
checkWriteAccess();
- ((ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password)).removeSecurityManager(id);
+ ((ConfigServerImpl) ConfigUtil.getConfigServer(config)).removeSecurityManager(id);
- Array children = ConfigWebUtil.getAsArray("security", "accessor", root);
+ Array children = ConfigUtil.getAsArray("security", "accessor", root);
Key[] keys = children.keys();
for (int i = keys.length - 1; i >= 0; i--) {
Key key = keys[i];
Struct tmp = Caster.toStruct(children.get(key, null), null);
if (tmp == null) continue;
- String n = ConfigWebUtil.getAsString("id", tmp, "");
+ String n = ConfigUtil.getAsString("id", tmp, "");
if (id.equals(n)) {
children.removeEL(key);
}
@@ -3588,7 +3578,7 @@ public void removeSecurityManager(Password password, String id) throws PageExcep
@Deprecated
public void runUpdate(Password password) throws PageException {
checkWriteAccess();
- ConfigServerImpl cs = (ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password);
+ ConfigServerImpl cs = (ConfigServerImpl) ConfigUtil.getConfigServer(config);
CFMLEngineFactory factory = cs.getEngine().getCFMLEngineFactory();
synchronized (factory) {
@@ -3619,7 +3609,7 @@ public void removeUpdate(Password password) throws PageException {
private void _removeUpdate(Password password, boolean onlyLatest) throws PageException {
checkWriteAccess();
- ConfigServerImpl cs = (ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password);
+ ConfigServerImpl cs = (ConfigServerImpl) ConfigUtil.getConfigServer(config);
try {
CFMLEngineFactory factory = cs.getEngine().getCFMLEngineFactory();
@@ -3637,7 +3627,7 @@ private void _removeUpdate(Password password, boolean onlyLatest) throws PageExc
public void changeVersionTo(Version version, Password password, IdentificationWeb id) throws PageException {
checkWriteAccess();
- ConfigServerImpl cs = (ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password);
+ ConfigServerImpl cs = (ConfigServerImpl) ConfigUtil.getConfigServer(config);
Log logger = cs.getLog("deploy");
@@ -3687,7 +3677,7 @@ else if (OSGiUtil.isNewerThan(v, version)) {
public void mvnChangeVersionTo(Version version, Password password, IdentificationWeb id) throws PageException {
checkWriteAccess();
- ConfigServerImpl cs = (ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password);
+ ConfigServerImpl cs = (ConfigServerImpl) ConfigUtil.getConfigServer(config);
Log logger = cs.getLog("deploy");
@@ -3863,7 +3853,7 @@ private File mvnDownloadCore(CFMLEngineFactory factory, Version version, Identif
*/
public void restart(Password password) throws PageException {
checkWriteAccess();
- ConfigServerImpl cs = (ConfigServerImpl) ConfigWebUtil.getConfigServer(config, password);
+ ConfigServerImpl cs = (ConfigServerImpl) ConfigUtil.getConfigServer(config);
CFMLEngineFactory factory = cs.getEngine().getCFMLEngineFactory();
synchronized (factory) {
@@ -3938,7 +3928,7 @@ private String checkCharset(String charset) throws PageException {
else if ("os".equalsIgnoreCase(charset)) charset = SystemUtil.getCharset().name();
// check access
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) {
throw new SecurityException("Access Denied to update regional setting");
}
@@ -3980,7 +3970,7 @@ public Object storageGet(Config config, String key) throws ConverterException, I
public void updateCustomTagDeepSearch(boolean customTagDeepSearch) throws SecurityException {
checkWriteAccess();
- if (!ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("Access Denied to update custom tag setting");
+ if (!ConfigUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("Access Denied to update custom tag setting");
root.setEL("customTagDeepSearch", Caster.toString(customTagDeepSearch));
}
@@ -3999,13 +3989,13 @@ public void resetId() throws PageException {
public void updateCustomTagLocalSearch(boolean customTagLocalSearch) throws SecurityException {
checkWriteAccess();
- if (!ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("Access Denied to update custom tag setting");
+ if (!ConfigUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("Access Denied to update custom tag setting");
root.setEL("customTagLocalSearch", Caster.toString(customTagLocalSearch));
}
public void updateCustomTagExtensions(String extensions) throws PageException {
checkWriteAccess();
- if (!ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("Access Denied to update custom tag setting");
+ if (!ConfigUtil.hasAccess(config, SecurityManager.TYPE_CUSTOM_TAG)) throw new SecurityException("Access Denied to update custom tag setting");
// check
Array arr = ListUtil.listToArrayRemoveEmpty(extensions, ',');
@@ -4022,7 +4012,7 @@ public void updateRemoteClient(String label, String url, String type, String sec
// SNSN
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_REMOTE);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_REMOTE);
if (!hasAccess) throw new SecurityException("Access Denied to update remote client settings");
Struct clients = _getRootElement("remoteClients");
@@ -4034,14 +4024,14 @@ public void updateRemoteClient(String label, String url, String type, String sec
securityKey = securityKey.trim();
adminPassword = adminPassword.trim();
- Array children = ConfigWebUtil.getAsArray("remoteClient", clients);
+ Array children = ConfigUtil.getAsArray("remoteClient", clients);
// Update
for (int i = 1; i <= children.size(); i++) {
Struct el = Caster.toStruct(children.get(i, null), null);
if (el == null) continue;
- String _url = ConfigWebUtil.getAsString("url", el, "");
+ String _url = ConfigUtil.getAsString("url", el, "");
if (_url != null && _url.equalsIgnoreCase(url)) {
el.setEL("label", label);
el.setEL("type", type);
@@ -4050,10 +4040,10 @@ public void updateRemoteClient(String label, String url, String type, String sec
el.setEL("proxyServer", proxyServer);
el.setEL("proxyUsername", proxyUsername);
el.setEL("proxyPort", proxyPort);
- el.setEL("securityKey", ConfigWebUtil.encrypt(securityKey));
- el.setEL("adminPassword", ConfigWebUtil.encrypt(adminPassword));
- el.setEL("serverPassword", ConfigWebUtil.encrypt(serverPassword));
- el.setEL("proxyPassword", ConfigWebUtil.encrypt(proxyPassword));
+ el.setEL("securityKey", ConfigUtil.encrypt(securityKey));
+ el.setEL("adminPassword", ConfigUtil.encrypt(adminPassword));
+ el.setEL("serverPassword", ConfigUtil.encrypt(serverPassword));
+ el.setEL("proxyPassword", ConfigUtil.encrypt(proxyPassword));
return;
}
}
@@ -4069,65 +4059,13 @@ public void updateRemoteClient(String label, String url, String type, String sec
el.setEL("proxyServer", proxyServer);
el.setEL("proxyUsername", proxyUsername);
el.setEL("proxyPort", proxyPort);
- el.setEL("securityKey", ConfigWebUtil.encrypt(securityKey));
- el.setEL("adminPassword", ConfigWebUtil.encrypt(adminPassword));
- el.setEL("serverPassword", ConfigWebUtil.encrypt(serverPassword));
- el.setEL("proxyPassword", ConfigWebUtil.encrypt(proxyPassword));
+ el.setEL("securityKey", ConfigUtil.encrypt(securityKey));
+ el.setEL("adminPassword", ConfigUtil.encrypt(adminPassword));
+ el.setEL("serverPassword", ConfigUtil.encrypt(serverPassword));
+ el.setEL("proxyPassword", ConfigUtil.encrypt(proxyPassword));
children.appendEL(el);
}
- public void updateUpdateAdminMode(String mode, boolean merge, boolean keep) throws PageException {
- checkWriteAccess();
-
- if (config.getAdminMode() == ConfigImpl.ADMINMODE_MULTI) {
- // copy the content from all web cfconfig into the server cfconfig
- if (merge) {
- ConfigWeb[] webs = ((ConfigServer) config).getConfigWebs();
- for (ConfigWeb cw: webs) {
- try {
-
- merge(root, ConfigWebFactory.loadDocumentCreateIfFails(cw.getConfigFile(), "web"), EXCLUDE_LIST, ARRAY_INDEX);
- }
- catch (IOException e) {
- throw Caster.toPageException(e);
- }
- }
- }
-
- // move all extension in installed in web context to available in server context
- {
- ConfigWeb[] webs = ((ConfigServer) config).getConfigWebs();
- for (ConfigWeb cw: webs) {
- try {
- for (RHExtension ext: ((ConfigPro) cw).getRHExtensions()) {
- ext.addToAvailable(cw);
- }
- }
- catch (Exception e) {
- LogUtil.log("deploy", "extension", e);
- }
- }
- }
-
- // delete all the server configs
- if (!keep) {
- ConfigWeb[] webs = ((ConfigServer) config).getConfigWebs();
- for (ConfigWeb cw: webs) {
- cw.getConfigFile().delete();
- }
- }
- }
-
- if (StringUtil.isEmpty(mode, true)) return;
- mode = mode.trim();
-
- if (mode.equalsIgnoreCase("m") || mode.equalsIgnoreCase("multi") || mode.equalsIgnoreCase("multiple")) mode = "multi";
- else if (mode.equalsIgnoreCase("s") || mode.equalsIgnoreCase("single")) mode = "single";
- else throw new ApplicationException("invalid mode [" + mode + "], valid modes are [single,multi]");
-
- root.setEL(KeyConstants._mode, mode);
- }
-
/*
* public static void main(String[] args) {
*
@@ -4224,9 +4162,9 @@ public void updateMonitor(ClassDefinition cd, String type, String name, boolean
}
void _updateMonitor(ClassDefinition cd, String type, String name, boolean logEnabled) throws PageException {
- stopMonitor(ConfigWebUtil.toMonitorType(type, Monitor.TYPE_INTERVAL), name);
+ stopMonitor(ConfigUtil.toMonitorType(type, Monitor.TYPE_INTERVAL), name);
- Struct children = ConfigWebUtil.getAsStruct("monitors", root);
+ Struct children = ConfigUtil.getAsStruct("monitors", root);
Key[] keys = children.keys();
Struct monitor = null;
// Update
@@ -4273,14 +4211,14 @@ protected static void removeCacheHandler(ConfigPro config, String id, boolean re
}
private void _removeCache(ClassDefinition cd) {
- Array children = ConfigWebUtil.getAsArray("cacheClasses", root);
+ Array children = ConfigUtil.getAsArray("cacheClasses", root);
Key[] keys = children.keys();
for (int i = keys.length - 1; i >= 0; i--) {
Key key = keys[i];
Struct el = Caster.toStruct(children.get(key, null), null);
if (el == null) continue;
- String _class = ConfigWebUtil.getAsString("virtual", el, null);
+ String _class = ConfigUtil.getAsString("virtual", el, null);
if (_class != null && _class.equalsIgnoreCase(cd.getClassName())) {
children.removeEL(key);
break;
@@ -4289,7 +4227,7 @@ private void _removeCache(ClassDefinition cd) {
}
private void _removeCacheHandler(String id) {
- Struct handlers = ConfigWebUtil.getAsStruct("cacheHandlers", root);
+ Struct handlers = ConfigUtil.getAsStruct("cacheHandlers", root);
Key[] keys = handlers.keys();
for (Key key: keys) {
String _id = key.getString();
@@ -4308,14 +4246,14 @@ public void updateCacheHandler(String id, ClassDefinition cd) throws PageExcepti
}
private void _updateCache(ClassDefinition cd) throws PageException {
- Array children = ConfigWebUtil.getAsArray("cacheClasses", root);
+ Array children = ConfigUtil.getAsArray("cacheClasses", root);
Struct ch = null;
// Update
for (int i = 1; i <= children.size(); i++) {
Struct el = Caster.toStruct(children.get(i, null), null);
if (el == null) continue;
- String _class = ConfigWebUtil.getAsString("class", el, null);
+ String _class = ConfigUtil.getAsString("class", el, null);
if (_class != null && _class.equalsIgnoreCase(cd.getClassName())) {
ch = el;
break;
@@ -4331,7 +4269,7 @@ private void _updateCache(ClassDefinition cd) throws PageException {
}
private void _updateCacheHandler(String id, ClassDefinition cd) throws PageException {
- Struct handlers = ConfigWebUtil.getAsStruct("cacheHandlers", root);
+ Struct handlers = ConfigUtil.getAsStruct("cacheHandlers", root);
Iterator> it = handlers.entryIterator();
Struct ch = null;
// Update
@@ -4369,9 +4307,9 @@ public void removeMonitor(String type, String name) throws SecurityException {
void _removeMonitor(String type, String name) {
- stopMonitor(ConfigWebUtil.toMonitorType(type, Monitor.TYPE_INTERVAL), name);
+ stopMonitor(ConfigUtil.toMonitorType(type, Monitor.TYPE_INTERVAL), name);
- Array children = ConfigWebUtil.getAsArray("monitors", root);
+ Array children = ConfigUtil.getAsArray("monitors", root);
Key[] keys = children.keys();
for (Key key: keys) {
String _name = key.getString();
@@ -4382,7 +4320,7 @@ void _removeMonitor(String type, String name) {
}
public void removeCacheHandler(String id) {
- Struct handlers = ConfigWebUtil.getAsStruct("cacheHandlers", root);
+ Struct handlers = ConfigUtil.getAsStruct("cacheHandlers", root);
Key[] keys = handlers.keys();
for (Key key: keys) {
String _id = key.getString();
@@ -4404,7 +4342,7 @@ public void updateRHExtensionProvider(String strUrl) throws MalformedURLExceptio
}
public void updateExtensionProvider(String strUrl) throws MalformedURLException, PageException {
- Array children = ConfigWebUtil.getAsArray("extensionProviders", root);
+ Array children = ConfigUtil.getAsArray("extensionProviders", root);
strUrl = strUrl.trim();
URL _url = HTTPUtil.toURL(strUrl, HTTPUtil.ENCODED_NO);
@@ -4426,7 +4364,7 @@ public void updateExtensionProvider(String strUrl) throws MalformedURLException,
}
public void removeExtensionProvider(String strUrl) {
- Array children = ConfigWebUtil.getAsArray("extensionProviders", root);
+ Array children = ConfigUtil.getAsArray("extensionProviders", root);
Key[] keys = children.keys();
strUrl = strUrl.trim();
String url;
@@ -4447,7 +4385,7 @@ public void removeRHExtensionProvider(String strUrl) {
}
public void resetORMSetting() throws SecurityException {
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_ORM);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_ORM);
if (!hasAccess) throw new SecurityException("Access Denied to update ORM Settings");
@@ -4456,7 +4394,7 @@ public void resetORMSetting() throws SecurityException {
}
public void updateORMSetting(ORMConfiguration oc) throws SecurityException {
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManagerImpl.TYPE_ORM);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManagerImpl.TYPE_ORM);
if (!hasAccess) throw new SecurityException("Access Denied to update ORM Settings");
@@ -4500,7 +4438,7 @@ public void removeRHExtension(String id) throws PageException {
checkWriteAccess();
if (StringUtil.isEmpty(id, true)) return;
- Array children = ConfigWebUtil.getAsArray("extensions", root);
+ Array children = ConfigUtil.getAsArray("extensions", root);
int[] keys = children.intKeys();
Struct child;
RHExtension rhe;
@@ -4545,7 +4483,7 @@ public static void updateArchive(ConfigPro config, Resource arc, boolean reload)
public static void updateCore(ConfigServerImpl config, Resource core, boolean reload) throws PageException {
try {
// get patches directory
- CFMLEngine engine = ConfigWebUtil.getEngine(config);
+ CFMLEngine engine = ConfigUtil.getEngine(config);
ConfigServerImpl cs = config;
Version v;
v = CFMLEngineFactory.toVersion(core.getName(), null);
@@ -4600,10 +4538,10 @@ public void updateArchive(Config config, Resource archive) throws PageException
readOnly = Caster.toBooleanValue(StringUtil.unwrap(attr.getValue("mapping-readonly")), false);
topLevel = Caster.toBooleanValue(StringUtil.unwrap(attr.getValue("mapping-top-level")), false);
- listMode = ConfigWebUtil.toListenerMode(StringUtil.unwrap(attr.getValue("mapping-listener-mode")), -1);
- listType = ConfigWebUtil.toListenerType(StringUtil.unwrap(attr.getValue("mapping-listener-type")), -1);
+ listMode = ConfigUtil.toListenerMode(StringUtil.unwrap(attr.getValue("mapping-listener-mode")), -1);
+ listType = ConfigUtil.toListenerType(StringUtil.unwrap(attr.getValue("mapping-listener-type")), -1);
- inspect = ConfigWebUtil.inspectTemplate(StringUtil.unwrap(attr.getValue("mapping-inspect")), Config.INSPECT_UNDEFINED);
+ inspect = ConfigUtil.inspectTemplate(StringUtil.unwrap(attr.getValue("mapping-inspect")), Config.INSPECT_UNDEFINED);
if (inspect == Config.INSPECT_UNDEFINED) {
Boolean trusted = Caster.toBoolean(StringUtil.unwrap(attr.getValue("mapping-trusted")), null);
if (trusted != null) {
@@ -4736,7 +4674,7 @@ public void updateRHExtension(Config config, RHExtension rhext, boolean reload,
boolean reloadNecessary = false;
// store to xml
- RHExtension.removeDuplicates(ConfigWebUtil.getAsArray("extensions", root));
+ RHExtension.removeDuplicates(ConfigUtil.getAsArray("extensions", root));
BundleDefinition[] existing = _updateExtension(ci, rhext);
// this must happen after "store"
@@ -5048,31 +4986,31 @@ else if (!StringUtil.isEmpty(cfc, true)) {
primary = map.get("primary");
// inspect
- inspect = ConfigWebUtil.inspectTemplate(map.get("inspect"), Config.INSPECT_UNDEFINED);
+ inspect = ConfigUtil.inspectTemplate(map.get("inspect"), Config.INSPECT_UNDEFINED);
// inspect interval slow
String str = map.get("inspect-interval-slow");
if (StringUtil.isEmpty(str, true)) str = map.get("inspectintervalslow");
if (StringUtil.isEmpty(str, true)) str = map.get("inspectIntervalSlow");
- inspectTemplateIntervalSlow = ConfigWebUtil.toListenerType(str, -1);
+ inspectTemplateIntervalSlow = ConfigUtil.toListenerType(str, -1);
// inspect interval fast
str = map.get("inspect-interval-fast");
if (StringUtil.isEmpty(str, true)) str = map.get("inspectintervalfast");
if (StringUtil.isEmpty(str, true)) str = map.get("inspectIntervalFast");
- inspectTemplateIntervalFast = ConfigWebUtil.toListenerType(str, -1);
+ inspectTemplateIntervalFast = ConfigUtil.toListenerType(str, -1);
// mode
str = map.get("listener-mode");
if (StringUtil.isEmpty(str, true)) str = map.get("listenermode");
if (StringUtil.isEmpty(str, true)) str = map.get("listenerMode");
- lmode = ConfigWebUtil.toListenerMode(str, -1);
+ lmode = ConfigUtil.toListenerMode(str, -1);
// type
String strLType = map.get("listener-type");
if (StringUtil.isEmpty(strLType, true)) strLType = map.get("listenertype");
if (StringUtil.isEmpty(strLType, true)) strLType = map.get("listenerType");
- ltype = ConfigWebUtil.toListenerType(strLType, -1);
+ ltype = ConfigUtil.toListenerType(strLType, -1);
toplevel = Caster.toBooleanValue(map.get("toplevel"), false);
readonly = Caster.toBooleanValue(map.get("readonly"), false);
@@ -5512,7 +5450,7 @@ public void updateFilesystem(String fldDefaultDirectory, String functionDefaultD
String functionAddionalDirectory, String tagAddionalDirectory) throws SecurityException {
checkWriteAccess();
- Struct fs = ConfigWebUtil.getAsStruct("fileSystem", root);
+ Struct fs = ConfigUtil.getAsStruct("fileSystem", root);
if (!StringUtil.isEmpty(fldDefaultDirectory, true)) {
fs.setEL(KeyImpl.init("fldDefaultDirectory"), fldDefaultDirectory);
}
@@ -5736,14 +5674,14 @@ public boolean updateLabel(String hash, String label) {
hash = hash.trim();
label = label.trim();
- Array children = ConfigWebUtil.getAsArray("labels", "label", root);
+ Array children = ConfigUtil.getAsArray("labels", "label", root);
// Update
for (int i = 1; i <= children.size(); i++) {
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
- String h = ConfigWebUtil.getAsString("id", tmp, null);
+ String h = ConfigUtil.getAsString("id", tmp, null);
if (h != null) {
if (h.equals(hash)) {
if (label.equals(tmp.get("name", null))) return false;
@@ -5764,7 +5702,7 @@ public boolean updateLabel(String hash, String label) {
public void updateDebugSetting(int maxLogs) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
if (!hasAccess) throw new SecurityException("Access denied to change debugging settings");
if (maxLogs == -1) rem(root, "debuggingMaxRecordsLogged");
@@ -5773,7 +5711,7 @@ public void updateDebugSetting(int maxLogs) throws SecurityException {
public void updateDebugEntry(String type, String iprange, String label, String path, String fullname, Struct custom) throws SecurityException, IOException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
if (!hasAccess) throw new SecurityException("Access denied to change debugging settings");
// leave this, this method throws an exception when ip range is not valid
@@ -5784,7 +5722,7 @@ public void updateDebugEntry(String type, String iprange, String label, String p
iprange = iprange.trim();
label = label.trim();
- Array children = ConfigWebUtil.getAsArray("debugTemplates", root);
+ Array children = ConfigUtil.getAsArray("debugTemplates", root);
// Update
Struct el = null;
@@ -5792,7 +5730,7 @@ public void updateDebugEntry(String type, String iprange, String label, String p
Struct tmp = Caster.toStruct(children.get(i, null), null);
if (tmp == null) continue;
- String _id = ConfigWebUtil.getAsString("id", tmp, null);
+ String _id = ConfigUtil.getAsString("id", tmp, null);
if (_id != null) {
if (_id.equals(id)) {
el = tmp;
@@ -5818,10 +5756,10 @@ public void updateDebugEntry(String type, String iprange, String label, String p
public void removeDebugEntry(String id) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_DEBUGGING);
if (!hasAccess) throw new SecurityException("Access denied to change debugging settings");
- Array children = ConfigWebUtil.getAsArray("debugTemplates", root);
+ Array children = ConfigUtil.getAsArray("debugTemplates", root);
Key[] keys = children.keys();
String _id;
if (children.size() > 0) {
@@ -5830,7 +5768,7 @@ public void removeDebugEntry(String id) throws SecurityException {
Struct el = Caster.toStruct(children.get(key, null), null);
if (el == null) continue;
- _id = ConfigWebUtil.getAsString("id", el, null);
+ _id = ConfigUtil.getAsString("id", el, null);
if (_id != null && _id.equalsIgnoreCase(id)) {
children.removeEL(key);
}
@@ -5864,7 +5802,7 @@ public void updateLogSettings(String name, int level, ClassDefinition appenderCD
catch (Exception e) {
throw Caster.toPageException(e);
}
- Struct children = ConfigWebUtil.getAsStruct("loggers", root);
+ Struct children = ConfigUtil.getAsStruct("loggers", root);
Key[] keys = children.keys();
// Update
Struct el = null;
@@ -6292,7 +6230,7 @@ public BundleDefinition[] _removeExtension(ConfigPro config, String extensionID,
throws IOException, PageException, BundleException, ConverterException {
if (!Decision.isUUId(extensionID)) throw new IOException("id [" + extensionID + "] is invalid, it has to be a UUID");
- Array children = ConfigWebUtil.getAsArray("extensions", root);
+ Array children = ConfigUtil.getAsArray("extensions", root);
int[] keys = children.intKeys();
// Update
@@ -6310,7 +6248,7 @@ public BundleDefinition[] _removeExtension(ConfigPro config, String extensionID,
id = Caster.toString(el.get(KeyConstants._id), null);
if (extensionID.equalsIgnoreCase(id)) {
- bundles = RHExtension.toBundleDefinitions(ConfigWebUtil.getAsString("bundles", el, null)); // get existing bundles before populate new ones
+ bundles = RHExtension.toBundleDefinitions(ConfigUtil.getAsString("bundles", el, null)); // get existing bundles before populate new ones
// bundles
arr = _removeExtensionCheckOtherUsage(children, el, "bundles");
@@ -6362,7 +6300,7 @@ public BundleDefinition[] _removeExtension(ConfigPro config, String extensionID,
public static void cleanBundles(RHExtension rhe, ConfigPro config, BundleDefinition[] candiatesToRemove) {
if (ArrayUtil.isEmpty(candiatesToRemove)) return;
- BundleCollection coreBundles = ConfigWebUtil.getEngine(config).getBundleCollection();
+ BundleCollection coreBundles = ConfigUtil.getEngine(config).getBundleCollection();
// core master
_cleanBundles(candiatesToRemove, coreBundles.core.getSymbolicName(), coreBundles.core.getVersion());
@@ -6412,7 +6350,7 @@ else if (bd.getVersion() != null && version.equals(bd.getVersion())) {
}
private String[] _removeExtensionCheckOtherUsage(Array children, Struct curr, String type) {
- String currVal = ConfigWebUtil.getAsString(type, curr, null);
+ String currVal = ConfigUtil.getAsString(type, curr, null);
if (StringUtil.isEmpty(currVal)) return null;
Key[] keys = children.keys();
String otherVal;
@@ -6427,7 +6365,7 @@ private String[] _removeExtensionCheckOtherUsage(Array children, Struct curr, St
other = tmp;
if (other == curr) continue;
- otherVal = ConfigWebUtil.getAsString(type, other, null);
+ otherVal = ConfigUtil.getAsString(type, other, null);
if (StringUtil.isEmpty(otherVal)) continue;
otherArr = ListUtil.trimItems(ListUtil.listToStringArray(otherVal, ','));
for (int y = 0; y < otherArr.length; y++) {
@@ -6449,7 +6387,7 @@ private String[] _removeExtensionCheckOtherUsage(Array children, Struct curr, St
*/
public BundleDefinition[] _updateExtension(ConfigPro config, RHExtension ext) throws IOException, BundleException, PageException {
if (!Decision.isUUId(ext.getId())) throw new IOException("id [" + ext.getId() + "] is invalid, it has to be a UUID");
- Array children = ConfigWebUtil.getAsArray("extensions", root);
+ Array children = ConfigUtil.getAsArray("extensions", root);
int[] keys = children.intKeys();
int key;
// Update
@@ -6467,7 +6405,7 @@ public BundleDefinition[] _updateExtension(ConfigPro config, RHExtension ext) th
id = Caster.toString(el.get(KeyConstants._id, null), null);
if (StringUtil.isEmpty(id)) hasNoneId = true;
if (ext.getId().equalsIgnoreCase(id)) {
- old = RHExtension.toBundleDefinitions(ConfigWebUtil.getAsString("bundles", el, null)); // get existing bundles before populate new ones
+ old = RHExtension.toBundleDefinitions(ConfigUtil.getAsString("bundles", el, null)); // get existing bundles before populate new ones
ext.populate(el, false);
old = minus(old, OSGiUtil.toBundleDefinitions(ext.getBundles()));
return old;
@@ -6494,7 +6432,7 @@ public BundleDefinition[] _updateExtension(ConfigPro config, RHExtension ext) th
try {
RHExtension _ext = RHExtension.getInstance(config, r);// TODO not load it again!
if (_ext != null && _ext.getId().equalsIgnoreCase(ext.getId())) {
- old = RHExtension.toBundleDefinitions(ConfigWebUtil.getAsString("bundles", el, null)); // get existing bundles before populate new ones
+ old = RHExtension.toBundleDefinitions(ConfigUtil.getAsString("bundles", el, null)); // get existing bundles before populate new ones
ext.populate(el, false);
old = minus(old, OSGiUtil.toBundleDefinitions(ext.getBundles()));
return old;
@@ -6535,7 +6473,7 @@ private BundleDefinition[] minus(BundleDefinition[] oldBD, BundleDefinition[] ne
}
private RHExtension getRHExtension(final ConfigPro config, final String id, final RHExtension defaultValue) {
- Array children = ConfigWebUtil.getAsArray("extensions", root);
+ Array children = ConfigUtil.getAsArray("extensions", root);
if (children != null) {
int[] keys = children.intKeys();
@@ -6575,7 +6513,7 @@ public static RHExtension hasRHExtensionInstalled(ConfigPro config, ExtensionDef
private RHExtension _hasRHExtensionInstalled(ConfigPro config, ExtensionDefintion ed) throws PageException {
- Array children = ConfigWebUtil.getAsArray("extensions", root);
+ Array children = ConfigUtil.getAsArray("extensions", root);
int[] keys = children.intKeys();
RHExtension tmp;
try {
@@ -6732,7 +6670,7 @@ public static boolean doAccept(Resource res) {
public void updateQueue(Integer max, Integer timeout, Boolean enable) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("Accces Denied to update queue settings");
// max
@@ -6748,7 +6686,7 @@ public void updateQueue(Integer max, Integer timeout, Boolean enable) throws Sec
public void updateCGIReadonly(Boolean cgiReadonly) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("Accces Denied to update scope setting");
root.setEL("cgiScopeReadOnly", Caster.toString(cgiReadonly, ""));
@@ -6756,7 +6694,7 @@ public void updateCGIReadonly(Boolean cgiReadonly) throws SecurityException {
public void updateFormUrlAsStruct(Boolean formUrlAsStruct) throws SecurityException {
checkWriteAccess();
- boolean hasAccess = ConfigWebUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
+ boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
if (!hasAccess) throw new SecurityException("Accces Denied to update scope setting");
root.setEL("formUrlAsStruct", Caster.toString(formUrlAsStruct, ""));
diff --git a/core/src/main/java/lucee/runtime/config/ConfigFactory.java b/core/src/main/java/lucee/runtime/config/ConfigFactory.java
index f2217cef4c..59244dd837 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigFactory.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigFactory.java
@@ -261,13 +261,13 @@ else if (old instanceof InputSource) {
else {
new ConverterException("inputing data is invalid, cannot cast [" + old.getClass().getName() + "] to a Resource or an InputSource");
}
- Struct root = ConfigWebUtil.getAsStruct(reader.getData(), false, "cfLuceeConfiguration", "luceeConfiguration", "lucee-configuration");
+ Struct root = ConfigUtil.getAsStruct(reader.getData(), false, "cfLuceeConfiguration", "luceeConfiguration", "lucee-configuration");
//////////////////// charset ////////////////////
{
- Struct charset = ConfigWebUtil.getAsStruct("charset", root);
- Struct regional = ConfigWebUtil.getAsStruct("regional", root);
- Struct fileSystem = ConfigWebUtil.getAsStruct("fileSystem", root);
+ Struct charset = ConfigUtil.getAsStruct("charset", root);
+ Struct regional = ConfigUtil.getAsStruct("regional", root);
+ Struct fileSystem = ConfigUtil.getAsStruct("fileSystem", root);
copy("charset", "templateCharset", fileSystem, root);// deprecated but still supported
copy("encoding", "templateCharset", fileSystem, root);// deprecated but still supported
move("templateCharset", charset, root);
@@ -285,15 +285,15 @@ else if (old instanceof InputSource) {
}
//////////////////// regional ////////////////////
{
- Struct regional = ConfigWebUtil.getAsStruct("regional", root);
+ Struct regional = ConfigUtil.getAsStruct("regional", root);
move("timezone", regional, root);
move("locale", regional, root);
rem("regional", root);
}
//////////////////// application ////////////////////
{
- Struct application = ConfigWebUtil.getAsStruct("application", root);
- Struct scope = ConfigWebUtil.getAsStruct("scope", root);
+ Struct application = ConfigUtil.getAsStruct("application", root);
+ Struct scope = ConfigUtil.getAsStruct("scope", root);
move("listenerType", application, root);
move("listenerMode", application, root);
move("typeChecking", application, root);
@@ -316,9 +316,9 @@ else if (old instanceof InputSource) {
//////////////////// caches ////////////////////
{
- Struct cache = ConfigWebUtil.getAsStruct("cache", root);
- Struct caches = ConfigWebUtil.getAsStruct("caches", root);
- Array conns = ConfigWebUtil.getAsArray("connection", cache);
+ Struct cache = ConfigUtil.getAsStruct("cache", root);
+ Struct caches = ConfigUtil.getAsStruct("caches", root);
+ Array conns = ConfigUtil.getAsArray("connection", cache);
// classes
move("cache", "cacheClasses", caches, root);
@@ -339,8 +339,8 @@ else if (old instanceof InputSource) {
//////////////////// cache handlers ////////////////////
{
- Struct handlers = ConfigWebUtil.getAsStruct("cacheHandlers", root);
- Array handler = ConfigWebUtil.getAsArray("cacheHandler", handlers);
+ Struct handlers = ConfigUtil.getAsStruct("cacheHandlers", root);
+ Array handler = ConfigUtil.getAsArray("cacheHandler", handlers);
Key[] keys = handler.keys();
for (int i = keys.length - 1; i >= 0; i--) {
@@ -354,9 +354,9 @@ else if (old instanceof InputSource) {
//////////////////// CFX ////////////////////
{
- Struct extTags = ConfigWebUtil.getAsStruct("extTags", root);
- Array extTag = ConfigWebUtil.getAsArray("extTag", extTags);
- Struct cfx = ConfigWebUtil.getAsStruct("cfx", root);
+ Struct extTags = ConfigUtil.getAsStruct("extTags", root);
+ Array extTag = ConfigUtil.getAsArray("extTag", extTags);
+ Struct cfx = ConfigUtil.getAsStruct("cfx", root);
Iterator it = extTag.getIterator();
while (it.hasNext()) {
@@ -369,7 +369,7 @@ else if (old instanceof InputSource) {
//////////////////// Compiler ////////////////////
{
- Struct compiler = ConfigWebUtil.getAsStruct("compiler", root);
+ Struct compiler = ConfigUtil.getAsStruct("compiler", root);
moveAsBool("supressWsBeforeArg", "suppressWhitespaceBeforeArgument", compiler, root);// deprecated but still supported
moveAsBool("suppressWsBeforeArg", "suppressWhitespaceBeforeArgument", compiler, root);
moveAsBool("dotNotationUpperCase", "dotNotationUpperCase", compiler, root);
@@ -382,7 +382,7 @@ else if (old instanceof InputSource) {
//////////////////// Component ////////////////////
{
- Struct component = ConfigWebUtil.getAsStruct("component", root);
+ Struct component = ConfigUtil.getAsStruct("component", root);
move("componentDefaultImport", "componentAutoImport", component, root);
move("base", "componentBase", component, root);// deprecated but still supported
move("baseCfml", "componentBase", component, root);
@@ -398,14 +398,14 @@ else if (old instanceof InputSource) {
moveAsBool("useShadow", "componentUseVariablesScope", component, root);
// mappings
- Array ctMappings = ConfigWebUtil.getAsArray("mapping", component);
+ Array ctMappings = ConfigUtil.getAsArray("mapping", component);
add(ctMappings, "componentMappings", root);
rem("mapping", component);
}
//////////////////// Custom tags ////////////////////
{
- Struct ct = ConfigWebUtil.getAsStruct("customTag", root);
+ Struct ct = ConfigUtil.getAsStruct("customTag", root);
moveAsBool("customTagUseCachePath", "customTagUseCachePath", ct, root);
moveAsBool("useCachePath", "customTagUseCachePath", ct, root);
moveAsBool("customTagLocalSearch", "customTagLocalSearch", ct, root);
@@ -414,15 +414,15 @@ else if (old instanceof InputSource) {
moveAsBool("customTagDeepSearch", "customTagDeepSearch", ct, root);
move("extensions", "customTagExtensions", ct, root);
move("customTagExtensions", "customTagExtensions", ct, root);
- Array ctMappings = ConfigWebUtil.getAsArray("mapping", ct);
+ Array ctMappings = ConfigUtil.getAsArray("mapping", ct);
add(ctMappings, "customTagMappings", root);
rem("mapping", ct);
}
//////////////////// Constants ////////////////////
{
- Struct constants = ConfigWebUtil.getAsStruct("constants", root);
- Array constant = ConfigWebUtil.getAsArray("constant", constants);
+ Struct constants = ConfigUtil.getAsStruct("constants", root);
+ Array constant = ConfigUtil.getAsArray("constant", constants);
rem("constant", constants);
Key[] keys = constant.keys();
@@ -437,9 +437,9 @@ else if (old instanceof InputSource) {
//////////////////// JDBC ////////////////////
{
- Struct jdbc = ConfigWebUtil.getAsStruct("jdbc", root);
- Array driver = ConfigWebUtil.getAsArray("driver", jdbc);
- Struct jdbcDrivers = ConfigWebUtil.getAsStruct("jdbcDrivers", root);
+ Struct jdbc = ConfigUtil.getAsStruct("jdbc", root);
+ Array driver = ConfigUtil.getAsArray("driver", jdbc);
+ Struct jdbcDrivers = ConfigUtil.getAsStruct("jdbcDrivers", root);
Key[] keys = driver.keys();
for (int i = keys.length - 1; i >= 0; i--) {
@@ -454,7 +454,7 @@ else if (old instanceof InputSource) {
//////////////////// Datasource ////////////////////
{
- Struct dataSources = ConfigWebUtil.getAsStruct("dataSources", root);
+ Struct dataSources = ConfigUtil.getAsStruct("dataSources", root);
// preserveSingleQuote
Boolean b = Caster.toBoolean(dataSources.get("psq", null), null);
if (b == null) {
@@ -463,7 +463,7 @@ else if (old instanceof InputSource) {
}
if (b != null) root.setEL("preserveSingleQuote", b.booleanValue());
- Array dataSource = ConfigWebUtil.getAsArray("dataSource", dataSources);
+ Array dataSource = ConfigUtil.getAsArray("dataSource", dataSources);
Key[] keys = dataSource.keys();
for (int i = keys.length - 1; i >= 0; i--) {
@@ -477,7 +477,7 @@ else if (old instanceof InputSource) {
//////////////////// Debugging ////////////////////
{
- Struct debugging = ConfigWebUtil.getAsStruct("debugging", root);
+ Struct debugging = ConfigUtil.getAsStruct("debugging", root);
moveAsBool("debug", "debuggingEnabled", debugging, root);
moveAsBool("debugLogOutput", "debuggingLogOutput", debugging, root);
moveAsBool("database", "debuggingDatabase", debugging, root);
@@ -492,22 +492,22 @@ else if (old instanceof InputSource) {
moveAsBool("thread", "debuggingThread", debugging, root);
moveAsInt("maxRecordsLogged", "debuggingMaxRecordsLogged", debugging, root);
- Array entries = ConfigWebUtil.getAsArray("debugEntry", debugging);
+ Array entries = ConfigUtil.getAsArray("debugEntry", debugging);
add(entries, "debugTemplates", root);
rem("debugEntry", debugging);
}
//////////////////// Dump Writer ////////////////////
{
- Struct dumpWriters = ConfigWebUtil.getAsStruct("dumpWriters", root);
- Array dumpWriter = ConfigWebUtil.getAsArray("dumpWriter", dumpWriters);
+ Struct dumpWriters = ConfigUtil.getAsStruct("dumpWriters", root);
+ Array dumpWriter = ConfigUtil.getAsArray("dumpWriter", dumpWriters);
add(dumpWriter, "dumpWriters", root);
rem("dumpWriter", dumpWriters);
}
//////////////////// Error ////////////////////
{
- Struct error = ConfigWebUtil.getAsStruct("error", root);
+ Struct error = ConfigUtil.getAsStruct("error", root);
String tmpl = Caster.toString(error.get("template", null), null);
String tmpl500 = Caster.toString(error.get("template500", null), null);
String tmpl404 = Caster.toString(error.get("template404", null), null);
@@ -526,8 +526,8 @@ else if (old instanceof InputSource) {
//////////////////// Extensions ////////////////////
{
- Struct extensions = ConfigWebUtil.getAsStruct("extensions", root);
- Array rhextension = ConfigWebUtil.getAsArray("rhextension", extensions);
+ Struct extensions = ConfigUtil.getAsStruct("extensions", root);
+ Array rhextension = ConfigUtil.getAsArray("rhextension", extensions);
Array newExtensions = new ArrayImpl();
rem("enabled", extensions);
rem("extension", extensions);
@@ -555,8 +555,8 @@ else if (old instanceof InputSource) {
}
// providers
- Array rhprovider = ConfigWebUtil.getAsArray("rhprovider", extensions);
- Array extensionProviders = ConfigWebUtil.getAsArray("extensionProviders", root);
+ Array rhprovider = ConfigUtil.getAsArray("rhprovider", extensions);
+ Array extensionProviders = ConfigUtil.getAsArray("extensionProviders", root);
Iterator