Merge branch '7.0' into 7.1

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

Author: michaeloffner

core/src/main/java/lucee/commons/io/log/LogUtil.java

@@ -305,6 +305,10 @@ public static void logGlobal(Config config, String type, String msg, Throwable t
 		logGlobal(config, Log.LEVEL_ERROR, type, msg + ";" + ExceptionUtil.getStacktrace(t, true));
 	}
 
+	public static boolean does(int logLevel) {
+		return does(ThreadLocalPageContext.getLog("application"), logLevel);
+	}
+
 	public static boolean does(Log log, int logLevel) {
 		return (log != null && log.getLogLevel() <= logLevel);
 	}

core/src/main/java/lucee/commons/io/log/LoggingPrintStream.java

@@ -0,0 +1,62 @@
+package lucee.commons.io.log;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+import lucee.runtime.op.Caster;
+
+/**
+ * A PrintStream that redirects all output to a Lucee Log instance.
+ */
+public class LoggingPrintStream extends PrintStream {
+
+	private final Log log;
+	private final String logName;
+	private final int logLevel;
+
+	public LoggingPrintStream(Log log, String logName, int logLevel) {
+		super(new OutputStream() {
+			@Override
+			public void write(int b) {
+				// Required but not used - we override the print methods
+			}
+		});
+		this.log = log;
+		this.logName = logName;
+		this.logLevel = logLevel;
+	}
+
+	@Override
+	public void println(String x) {
+		if (x != null && !x.trim().isEmpty()) {
+			log.log(logLevel, logName, x);
+		}
+	}
+
+	@Override
+	public void print(String s) {
+		if (s != null && !s.trim().isEmpty()) {
+			log.log(logLevel, logName, s);
+		}
+	}
+
+	@Override
+	public void println(Object x) {
+		if (x != null) {
+			log.log(logLevel, logName, Caster.toString(x, null));
+		}
+	}
+
+	@Override
+	public void print(Object obj) {
+		if (obj != null) {
+			log.log(logLevel, logName, Caster.toString(obj, null));
+		}
+	}
+
+	@Override
+	public PrintStream format(String format, Object... args) {
+		log.log(logLevel, logName, String.format(format, args));
+		return this;
+	}
+}

core/src/main/java/lucee/commons/lang/PhysicalClassLoader.java

@@ -54,16 +54,18 @@ public final class PhysicalClassLoader extends URLClassLoader implements Extenda
 		boolean res = registerAsParallelCapable();
 	}
 
-	private static final double CLASSLOADER_INSPECTION_SIZE = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.template.classloader.inspection.size", null), 2000);
+	private static final double CLASSLOADER_INSPECTION_SIZE = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.template.classloader.inspection.size", null), 100);
+	private static final double CLASSLOADER_INSPECTION_SIZEBYTES = CLASSLOADER_INSPECTION_SIZE * 1024 * 1024;
+	private static final double CLASSLOADER_INSPECTION_COUNT = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.template.classloader.inspection.count", null), 1000);
 	private static final double CLASSLOADER_INSPECTION_RATIO = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.template.classloader.inspection.ratio", null), 3);
 
 	private final Resource directory;
 	private ConfigPro config;
 	private final ClassLoader addionalClassLoader;
 	private final List<Resource> resources;
 
-	private Map<String, String> loadedClasses = new ConcurrentHashMap<>();
-	private Map<String, String> allLoadedClasses = new ConcurrentHashMap<>(); // this includes all renames
+	private Map<String, Integer> loadedClasses = new ConcurrentHashMap<>();
+	private Map<String, Integer> allLoadedClasses = new ConcurrentHashMap<>(); // this includes all renames
 	private Map<String, String> unavaiClasses = new ConcurrentHashMap<>();
 
 	private PageSourcePool pageSourcePool;
@@ -109,20 +111,55 @@ public static PhysicalClassLoader flush(PhysicalClassLoader existing, Config con
 		count += ClazzDynamic.remove(existing);
 		int all = existing.allLoadedClasses.size();
 		int unique = existing.loadedClasses.size();
-		LogUtil.log(Log.LEVEL_INFO, "physical-classloader", "flush physical classloader [" + existing.getDirectory() + "] because we reached the size limit (all loaded classes: "
-				+ all + "; unique loaded classes: " + unique + "; ratio: " + (all / unique) + "), removed " + count + " cache elements from dynamic invoker");
+		int allClassesBytes = 0;
+		for (Integer i: existing.allLoadedClasses.values()) {
+			allClassesBytes += i.intValue();
+		}
+		LogUtil.log(Log.LEVEL_INFO, "physical-classloader",
+				"flush physical classloader [" + existing.getDirectory() + "] because we reached the size limit (all loaded classes count/size: " + all + "/"
+						+ StringUtil.byteFormat(allClassesBytes) + "; unique loaded classes: " + unique + "; ratio: " + (all / unique) + "), removed " + count
+						+ " cache elements from dynamic invoker");
 
 		return clone;
 	}
 
 	public static PhysicalClassLoader flushIfNecessary(PhysicalClassLoader existing, Config config) {
 		double all;
 
+		if (LogUtil.does(Log.LEVEL_DEBUG)) {
+			int allClasses = existing.allLoadedClasses.size();
+			int allClassesBytes = 0;
+			int uniqueClasses = existing.loadedClasses.size();
+			double ratio = uniqueClasses > 0 ? (double) allClasses / uniqueClasses : 0;
+
+			for (Integer i: existing.allLoadedClasses.values()) {
+				allClassesBytes += i.intValue();
+			}
+
+			LogUtil.log(Log.LEVEL_DEBUG, "physical-classloader",
+					"checking if flush necessary for physical classloader [" + existing.getDirectory() + "]: " + "all loaded classes: " + allClasses + " ("
+							+ StringUtil.byteFormat(allClassesBytes) + "), " + "unique loaded classes: " + uniqueClasses + ", " + "ratio: " + String.format("%.2f", ratio) + ", "
+							+ "inspection size threshold: " + Caster.toString(CLASSLOADER_INSPECTION_COUNT) + "/" + Caster.toString(CLASSLOADER_INSPECTION_SIZE) + ", "
+							+ "inspection ratio threshold: " + CLASSLOADER_INSPECTION_RATIO + " - "
+							+ (allClasses > CLASSLOADER_INSPECTION_SIZE
+									? (ratio > CLASSLOADER_INSPECTION_RATIO ? "FLUSHING (size and ratio thresholds exceeded)"
+											: "NOT flushing (ratio " + String.format("%.2f", ratio) + " below threshold " + CLASSLOADER_INSPECTION_RATIO + ")")
+									: "NOT flushing (size " + allClasses + " below threshold " + CLASSLOADER_INSPECTION_SIZE + ")"));
+		}
+
 		// check size
-		if ((all = existing.allLoadedClasses.size()) > CLASSLOADER_INSPECTION_SIZE) {
+		if ((all = existing.allLoadedClasses.size()) > CLASSLOADER_INSPECTION_COUNT) {
 			if ((all / existing.loadedClasses.size()) > CLASSLOADER_INSPECTION_RATIO) {
 				return flush(existing, config);
 			}
+
+			int allClassesBytes = 0;
+			for (Integer i: existing.allLoadedClasses.values()) {
+				allClassesBytes += i.intValue();
+			}
+			if (allClassesBytes > CLASSLOADER_INSPECTION_SIZEBYTES) {
+				return flush(existing, config);
+			}
 		}
 		return null;
 	}
@@ -276,6 +313,13 @@ public Class<?> loadClass(String name, byte[] barr) throws UnmodifiableClassExce
 		synchronized (getClassLoadingLock(name)) {
 			Class<?> clazz = findLoadedClass(name);
 			if (clazz == null) return _loadClass(name, barr, false);
+
+			/*
+			 * Instrumentation instr = InstrumentationFactory.getInstrumentation(config); if (instr != null) {
+			 * try { instr.redefineClasses(new ClassDefinition(clazz, barr)); return clazz; } catch (Exception
+			 * e) { LogUtil.log(InstrumentationFactory.class.getName(), e); } }
+			 */
+
 			return rename(clazz, barr);
 		}
 	}
@@ -350,8 +394,8 @@ private Class<?> _loadClass(String name, byte[] barr, boolean rename) {
 			Class<?> clazz = defineClass(name, barr, 0, barr.length);
 
 			if (clazz != null) {
-				if (!rename) loadedClasses.put(name, name);
-				allLoadedClasses.put(name, name);
+				if (!rename) loadedClasses.put(name, barr.length);
+				allLoadedClasses.put(name, barr.length);
 
 				resolveClass(clazz);
 			}

core/src/main/java/lucee/commons/lang/StringUtil.java

@@ -103,6 +103,8 @@ public final class StringUtil {
 	private static final Pattern SPACES = Pattern.compile("\\s+");
 
 	private static final char[] SURROGATE_CHARACTERS_RANGE = new char[] { (char) 55296, (char) 57343 };
+	private static final Pair<Long, String>[] byteValues = new Pair[] { new Pair<Long, String>(1099511627776L, "TB"), new Pair<Long, String>(1073741824L, "GB"),
+			new Pair<Long, String>(1048576L, "MB"), new Pair<Long, String>(1024L, "KB") };
 
 	/**
 	 * do first Letter Upper case
@@ -1584,4 +1586,14 @@ public static String normalize(String str) {
 		}
 		return SPACES.matcher(str).replaceAll(" ");
 	}
+
+	public static String byteFormat(long size) {
+		for (Pair<Long, String> pair: byteValues) {
+			if (size >= pair.getName()) {
+				double result = (double) size / pair.getName();
+				return Caster.toString(Caster.toLongValue(result)) + "" + pair.getValue();
+			}
+		}
+		return size + "B";
+	}
 }

core/src/main/java/lucee/runtime/config/maven/MavenUpdateProvider.java

@@ -56,11 +56,7 @@ public final class MavenUpdateProvider {
 	private static final Repository DEFAULT_REPOSITORY_SONATYPE_LAST90 = new Repository("Sonatype Repositry for Snapshots (last 90 days)",
 			"https://central.sonatype.com/repository/maven-snapshots/", Repository.TIMEOUT_15MINUTES, Repository.TIMEOUT_NEVER);
 
-	// old up to version 7.0.0.275-SNAPSHOT
-	private static final Repository DEFAULT_REPOSITORY_SONATYPE_LEGACY = new Repository("Old Sonatype Repositry for Snapshots",
-			"https://oss.sonatype.org/content/repositories/snapshots/", Repository.TIMEOUT_NEVER, Repository.TIMEOUT_NEVER);
-
-	private static final Repository[] DEFAULT_REPOSITORY_SNAPSHOTS_CORE = new Repository[] { DEFAULT_REPOSITORY_SONATYPE_LAST90, DEFAULT_REPOSITORY_SONATYPE_LEGACY };
+	private static final Repository[] DEFAULT_REPOSITORY_SNAPSHOTS_CORE = new Repository[] { DEFAULT_REPOSITORY_SONATYPE_LAST90 };
 	private static final Repository[] DEFAULT_REPOSITORY_SNAPSHOTS_EXTENSIONS = new Repository[] { DEFAULT_REPOSITORY_SONATYPE_LAST90 };
 
 	private static final Repository[] DEFAULT_REPOSITORY_RELEASES = new Repository[] {
@@ -396,7 +392,6 @@ private Map<String, Object> readFromCache(Repository repository, String artifact
 		try {
 			Resource resLastmod = repository.cacheDirectory
 					.getRealResource("detail_" + HashUtil.create64BitHashAsString(group + "_" + artifact + "_" + version + "_lastmod", Character.MAX_RADIX));
-
 			if (resLastmod.isFile()) {
 				long lastmod = repository.timeoutDetail == Repository.TIMEOUT_NEVER ? Repository.TIMEOUT_NEVER
 						: Caster.toLongValue(IOUtil.toString(resLastmod, CharsetUtil.UTF8), 0L);

core/src/main/java/lucee/runtime/exp/TemplateException.java

@@ -81,7 +81,7 @@ public TemplateException(PageSource ps, int line, int column, Throwable t) {
 	 * @param message
 	 */
 	public TemplateException(SourceCode sc, String message) {
-		this(getPageSource(sc), sc.getLine(), sc.getColumn(), message);
+		this(getPageSource(sc), sc.getLine(), sc.getColumn(), message + ", at [" + sc.getLine() + ":" + sc.getColumn() + "] in [" + sc.getLineAsString() + "]");
 	}
 
 	public TemplateException(SourceCode sc, int line, int column, String message) {