Merge branch '7.0' into 7.1

# Conflicts:
#	loader/build.xml
#	loader/pom.xml

Author: michaeloffner

core/src/main/java/lucee/runtime/config/DeployHandler.java

@@ -314,6 +314,9 @@ public static boolean deployExtensions(Config config, List<ExtensionDefintion> e
 	 */
 	public static RHExtension deployExtension(Config config, ExtensionDefintion ed, ResetFilter filter, Log log, boolean reload, boolean force, boolean throwOnError,
 			RefBoolean installDone) throws PageException {
+
+		if (log != null) log.info("extension", "Installing extension [" + ed + "]");
+
 		ConfigPro ci = (ConfigPro) config;
 		String coreVersion = ConfigUtil.getCFMLEngine(config).getInfo().getVersion().toString();
 		// is the extension already installed
@@ -337,6 +340,7 @@ public static RHExtension deployExtension(Config config, ExtensionDefintion ed,
 
 			RHExtension _ext = ConfigAdmin._updateRHExtension((ConfigPro) config, local, filter, reload, force, RHExtension.ACTION_COPY);
 			installDone.setValue(true);
+			if (log != null) log.info("extension", "Installed extension [" + ed + "] from provided file");
 			return _ext;
 		}
 
@@ -366,6 +370,7 @@ public static RHExtension deployExtension(Config config, ExtensionDefintion ed,
 					IOUtil.copy(ext.getSource(), res);
 					RHExtension _ext = ConfigAdmin._updateRHExtension((ConfigPro) config, res, filter, reload, force, RHExtension.ACTION_MOVE);
 					installDone.setValue(true);
+					if (log != null) log.info("extension", "Installed extension [" + ed + "] from local provider");
 					return _ext;
 				}
 				catch (Exception e) {
@@ -449,6 +454,7 @@ public static RHExtension deployExtension(Config config, ExtensionDefintion ed,
 				IOUtil.copy(ext.getSource(), res);
 				RHExtension _ext = ConfigAdmin._updateRHExtension((ConfigPro) config, res, filter, reload, force, RHExtension.ACTION_MOVE);
 				installDone.setValue(true);
+				if (log != null) log.info("extension", "Installed extension [" + ed + "] from local provider");
 				return _ext;
 			}
 			catch (Exception e) {
@@ -463,6 +469,7 @@ public static RHExtension deployExtension(Config config, ExtensionDefintion ed,
 			try {
 				RHExtension _ext = ConfigAdmin._updateRHExtension((ConfigPro) config, res, filter, reload, force, RHExtension.ACTION_MOVE);
 				installDone.setValue(true);
+				if (log != null) log.info("extension", "Installed extension [" + ed + "] from remote extension provider");
 				return _ext;
 			}
 			catch (Exception e) {
@@ -607,8 +614,7 @@ public static Resource getExtension(Config config, ExtensionDefintion ed, Log lo
 					return res;
 				}
 			}
-			catch (Exception e) {
-			}
+			catch (Exception e) {}
 		}
 		// remote
 		try {

core/src/main/java/lucee/runtime/extension/RHExtension.java

@@ -1177,8 +1177,7 @@ private static Collection _populate(Collection coll, ExtensionMetadata md) {
 			try {
 				qryBundles = new QueryImpl(new Key[] { KeyConstants._name, KeyConstants._version }, bfs == null ? 0 : bfs.length, "bundles");
 			}
-			catch (DatabaseException e) {
-			}
+			catch (DatabaseException e) {}
 			if (qryBundles != null) {
 				for (int i = 0; i < bfs.length; i++) {
 					qryBundles.setAtEL(KeyConstants._name, i + 1, bfs[i].getSymbolicName());
@@ -1466,7 +1465,7 @@ public static ExtensionDefintion toExtensionDefinition(Config config, String id,
 			name = entry.getKey().trim();
 			if (!"id".equalsIgnoreCase(name)) ed.setParam(name, entry.getValue().trim());
 			if ("path".equalsIgnoreCase(name) || "url".equalsIgnoreCase(name) || "resource".equalsIgnoreCase(name)) {
-				res = ResourceUtil.toResourceExisting(config, entry.getValue().trim(), null);
+				res = ResourceUtil.toResourceExisting(config, ConfigUtil.replaceConfigPlaceHolder(config, entry.getValue().trim()), null);
 				if (res != null && res.isFile()) {
 					ed.setSource(config, res);
 					if (ed.getId() == null) {

core/src/main/java/resource/fld/core-base.fld

@@ -6787,7 +6787,7 @@ When used, the function automatically validates that the secret exists and throw
 	<function>
 		<name>GetSystemMetrics</name>
 		<class>lucee.runtime.functions.system.GetSystemInfo</class>
-		<status>hidden</status>
+		<introduced>5.2.5.7</introduced>
 		<description></description>
 		<return>
 			<type>struct</type>

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="7.1.0.46-SNAPSHOT"/>
+  <property name="version" value="7.1.0.47-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.1.0.46-SNAPSHOT</version>
+  <version>7.1.0.47-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>