LDEV-3335 store component properties per class

CONTRIBUTING.md

@@ -26,7 +26,7 @@ Please read our docs on working with the Lucee source code: https://docs.lucee.o
 
 # Branch Status
 
-6.0 is the active development branch, any new cool stuff should be done against this branch
+7.0 is the active development branch, any new cool stuff should be done against this branch
 
 5.4 is our LTS branch, mainly only bugfixes
 

core/src/main/cfml/context/admin/ext.functions.cfm

@@ -316,6 +316,7 @@
 			loop query="#locals#" {
 				var row=queryAddRow(qry);
 				qry.setCell("provider","local",row);
+				qry.setCell("otherVersions",[],row);
 				loop list="#locals.columnlist()#" item="local.k" {
             		qry.setCell(k,locals[k],row);
             	}

core/src/main/cfml/context/admin/resources.mapping.compileError.cfm

@@ -0,0 +1,26 @@
+<cfif structKeyExists( request, "compileErrors" ) && isStruct( request.compileErrors ) && structCount( request.compileErrors ) GT 0>
+	<div class="error">
+		<h3><cfoutput>#stText.Mappings.compileErrorsTitle#</cfoutput></h3>
+		<cfif isDefined( "errorContext" )>
+			<p><cfoutput>#replace( stText.Mappings.compileErrorsIntro, "{context}", errorContext )#</cfoutput></p>
+		<cfelse>
+			<p><cfoutput>#stText.Mappings.compileErrorsDesc#</cfoutput></p>
+		</cfif>
+		<cfloop collection="#request.compileErrors#" item="errorFile">
+			<cfset errorInfo = request.compileErrors[ errorFile ]>
+			<div style="margin: 10px 0; padding: 10px; background: ##f9f9f9; border-left: 3px solid ##cc0000; font-family: monospace; font-size: 0.9em;">
+				<div style="font-weight: bold; color: ##cc0000;">
+					<cfoutput>
+						#errorFile#<cfif structKeyExists( errorInfo, "line" ) && errorInfo.line NEQ "">:#errorInfo.line#<cfif structKeyExists( errorInfo, "column" ) && errorInfo.column NEQ "">,#errorInfo.column#</cfif></cfif>
+					</cfoutput>
+				</div>
+				<cfoutput>
+					<div style="margin-top: 5px;">#HTMLEditFormat( errorInfo.message ?: "" )#</div>
+					<cfif structKeyExists( errorInfo, "detail" ) && len( trim( errorInfo.detail ) )>
+						<div style="margin-top: 5px; color: ##666;">#HTMLEditFormat( errorInfo.detail )#</div>
+					</cfif>
+				</cfoutput>
+			</div>
+		</cfloop>
+	</div>
+</cfif>

core/src/main/cfml/context/admin/resources.mappings.cfm

@@ -28,7 +28,7 @@ Defaults --->
 	<cfswitch expression="#form.mainAction#">
 	<!--- UPDATE --->
 		<cfcase value="#stText.Buttons.save#">
-		<!--- compile all --->
+			<!--- compile all --->
 			<cfif form.subAction EQ "#stText.Buttons.compileAll#">
 				<cfsetting requesttimeout="3000">		
 				<cfset data.virtuals=toArrayFromForm("virtual")>
@@ -38,19 +38,20 @@ Defaults --->
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
 					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
 						<cfset data.stoponerrors[idx]=(data.stoponerrors[idx]?:false)>
-					<cfadmin 
-						action="compileMapping"
-						type="#request.adminType#"
-						password="#session["password"&request.adminType]#"
-
-						virtual="#data.virtuals[idx]#"
-						stoponerror="#data.stoponerrors[idx]#"
-			remoteClients="#request.getRemoteClients()#">
-
+						<cfadmin
+							action="compileMapping"
+							type="#request.adminType#"
+							password="#session["password"&request.adminType]#"
+							virtual="#data.virtuals[idx]#"
+							stoponerror="#data.stoponerrors[idx]#"
+							errorVariable="request.compileErrors"
+							remoteClients="#request.getRemoteClients()#">
+						<cfset errorContext = "compiling #data.virtuals[idx]#">
+						<cfinclude template="resources.mapping.compileError.cfm">
 					</cfif>
 				</cfloop>
 			</cfif>
-		<!--- downloadArchive --->
+			<!--- downloadArchive --->
 			<cfset doDownload=form.subAction EQ stText.Buttons.downloadArchive>
 			<cfif doDownload or form.subAction EQ stText.Buttons.addArchive>
 				<cfsetting requesttimeout="3000">		
@@ -64,43 +65,46 @@ Defaults --->
 						<cfset data.addCFMLFiles[idx]=(data.addCFMLFiles[idx]?:false)>
 						<cfset data.addNonCFMLFiles[idx]=(data.addNonCFMLFiles[idx]?:false)>
 
-					<cfset ext="lar">
-					<cfset target=getTempDirectory() & Rand() & "."&ext>
-					<cfset filename=data.virtuals[idx]>
-					<cfset filename=mid(filename,2,len(filename))>
-					<cfif len(filename)>
-						<cfset filename="archive-"&filename&"."&ext>
-					<cfelse>
-						<cfset filename="archive-root."&ext>
-					</cfif>
-					<cfset filename=Replace(filename,"/","-","all")>
-
-
-					<cfif not doDownload>
-						<cfset target=expandPath("#cgi.context_path#/lucee/archives/"&filename)>
-						<cfset count=0>
-						<cfwhile fileExists(target)>
-							<cfset count=count+1>
-							<cfset target="#cgi.context_path#/lucee/archives/"&filename>
-							<cfset target=replace(target,'.'&ext,count&'.'&ext)>
-							<cfset target=expandPath(target)>
-						</cfwhile>
-					</cfif>
-					<cfadmin 
-						action="createArchive"
-						type="#request.adminType#"
-						password="#session["password"&request.adminType]#"
+						<cfset ext="lar">
+						<cfset target=getTempDirectory() & Rand() & "."&ext>
+						<cfset filename=data.virtuals[idx]>
+						<cfset filename=mid(filename,2,len(filename))>
+						<cfif len(filename)>
+							<cfset filename="archive-"&filename&"."&ext>
+						<cfelse>
+							<cfset filename="archive-root."&ext>
+						</cfif>
+						<cfset filename=Replace(filename,"/","-","all")>
 
-						file="#target#"
-						virtual="#data.virtuals[idx]#"
-						addCFMLFiles="#data.addCFMLFiles[idx]#"
-						addNonCFMLFiles="#data.addNonCFMLFiles[idx]#"
-						append="#not doDownload#"
-						remoteClients="#request.getRemoteClients()#">
-						<cfif not doDownload>
 
-						<cfelse><cfheader name="Content-Disposition" value="inline; filename=#filename#"><!---
-						 ---><cfcontent file="#target#" deletefile="yes" type="application/unknow"></cfif>
+						<cfif not doDownload>
+							<cfset target=expandPath("#cgi.context_path#/lucee/archives/"&filename)>
+							<cfset count=0>
+							<cfwhile fileExists(target)>
+								<cfset count=count+1>
+								<cfset target="#cgi.context_path#/lucee/archives/"&filename>
+								<cfset target=replace(target,'.'&ext,count&'.'&ext)>
+								<cfset target=expandPath(target)>
+							</cfwhile>
+						</cfif>
+						<cfadmin
+							action="createArchive"
+							type="#request.adminType#"
+							password="#session["password"&request.adminType]#"
+
+							file="#target#"
+							virtual="#data.virtuals[idx]#"
+							addCFMLFiles="#data.addCFMLFiles[idx]#"
+							addNonCFMLFiles="#data.addNonCFMLFiles[idx]#"
+							append="#not doDownload#"
+							errorVariable="request.compileErrors"
+							remoteClients="#request.getRemoteClients()#">
+						<cfset errorContext = "creating archive. The archive was not created">
+						<cfinclude template="resources.mapping.compileError.cfm">
+					<cfelseif not doDownload>
+
+					<cfelse><cfheader name="Content-Disposition" value="inline; filename=#filename#"><!---
+					 ---><cfcontent file="#target#" deletefile="yes" type="application/unknow">
 					</cfif>
 				</cfloop>
 			</cfif>
@@ -123,22 +127,21 @@ Defaults --->
 					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
 						<cfset data.inspects[idx]=data.inspects[idx]?:"">
 						<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
-					<cfadmin 
-						action="updateMapping"
-						type="#request.adminType#"
-						password="#session["password"&request.adminType]#"
-
-						virtual="#data.virtuals[idx]#"
-						physical="#data.physicals[idx]#"
-						archive="#data.archives[idx]#"
-						primary="#data.primaries[idx]#"
-						inspect="#data.inspects[idx]#"
-						inspectTemplateIntervalSlow="#data.inspectTemplateIntervalSlow[idx]#"
-						inspectTemplateIntervalFast="#data.inspectTemplateIntervalFast[idx]#"
-						toplevel="#data.toplevels[idx]#"
-						listenerMode="#data.listenerMode[idx]#"
-						listenerType="#data.listenerType[idx]#"
-			remoteClients="#request.getRemoteClients()#">
+						<cfadmin 
+							action="updateMapping"
+							type="#request.adminType#"
+							password="#session["password"&request.adminType]#"
+							virtual="#data.virtuals[idx]#"
+							physical="#data.physicals[idx]#"
+							archive="#data.archives[idx]#"
+							primary="#data.primaries[idx]#"
+							inspect="#data.inspects[idx]#"
+							inspectTemplateIntervalSlow="#data.inspectTemplateIntervalSlow[idx]#"
+							inspectTemplateIntervalFast="#data.inspectTemplateIntervalFast[idx]#"
+							toplevel="#data.toplevels[idx]#"
+							listenerMode="#data.listenerMode[idx]#"
+							listenerType="#data.listenerType[idx]#"
+							remoteClients="#request.getRemoteClients()#">
 
 					</cfif>
 				</cfloop>
@@ -148,29 +151,28 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-
 					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
-					<cfadmin 
-						action="removeMapping"
-						type="#request.adminType#"
-						password="#session["password"&request.adminType]#"
-
-						virtual="#data.virtuals[idx]#"
-			remoteClients="#request.getRemoteClients()#">
+						<cfadmin 
+							action="removeMapping"
+							type="#request.adminType#"
+							password="#session["password"&request.adminType]#"
+							virtual="#data.virtuals[idx]#"
+							remoteClients="#request.getRemoteClients()#">
 					</cfif>
 				</cfloop>
 			</cfif>
 		</cfcase>
 	</cfswitch>
 	<cfcatch>
+		<cfoutput><pre>#cfcatch.stacktrace#</pre></cfoutput>
 		<cfset error.message=cfcatch.message>
 		<cfset error.detail=cfcatch.Detail>
 	</cfcatch>
 </cftry>
 
-<!--- 
+<!---
 Redirtect to entry --->
-<cfif cgi.request_method EQ "POST" and error.message EQ "">
+<cfif cgi.request_method EQ "POST" and error.message EQ "" and not (structKeyExists(request, "compileErrors") and structCount(request.compileErrors) GT 0)>
 	<!--- <cfif isDefined("url.action2")>
 		<cfif isDefined("url.virtual")>
 			<cflocation url="#request.self#?action=#url.action#&action2=#url.action2#&virtual=#url.virtual#" addtoken="no">

core/src/main/cfml/context/admin/resources/css/darkmode.css

@@ -179,7 +179,6 @@ body.dark-mode .comment {
 body.dark-mode div.error {
   border: 1px solid var(--error-color);
   color: var(--error-color) !important;
-  background-color: rgba(255, 0, 0, 0.1);
 }
 
 body.dark-mode div.error a,

core/src/main/cfml/context/admin/resources/language/de.json

@@ -652,6 +652,9 @@
 			"compilestoponerror": "Bei Fehler stoppen",
 			"compilestoponerrordesc": "Legt fest, ob bei einem Fehler die weitere Kompilierung gestoppt werden soll",
 			"compiletitle": "kompilieren",
+			"compileErrorsTitle": "Kompilierungsfehler",
+			"compileErrorsIntro": "Die folgenden Fehler sind beim {context} aufgetreten. Bitte beheben Sie diese Fehler und versuchen Sie es erneut.",
+			"compileErrorsDesc": "Die folgenden Kompilierungsfehler sind aufgetreten. Bitte beheben Sie diese Fehler und versuchen Sie es erneut.",
 			"editdesc": "Hier können Sie ein einzelnes Mapping bearbeiten oder aus einem bestehenden Mapping ein Lucee Archiv erstellen.",
 			"introtext": "Bitte beachten Sie, dass nur Seiten, die von Lucee verarbeitet werden diese Mappings kennen (cfm, cfml, cfc). Wenn Sie auch Dateien, die nicht von Lucee verarbeitet werden verwenden möchten, müssen Sie virtuelle Mappings auf Ihrem Applikationsserver erstellen.",
 			"physical": "Ressource",
@@ -1337,10 +1340,13 @@
 				"short": {
 					"pre_release": "Pre Releases",
 					"release": "Releases",
-					"snapshot": "Snapshots"
+					"snapshot": "Snapshots",
+					"alphas": "Alphas"
 				},
 				"snapShot": "SnapShot",
 				"snapShotDesc": "Snapshots are generated automatically with every push to the repository, when all bundled test cases pass successfully. Snapshots are NOT recommended for production environments.",
+				"alpha": "Alpha",
+				"alphaDesc": "Alphas are early versions that may be unstable and are intended for testing purposes only.",
 				"loaderMinVersion": "You cannot downgrade below {min-version} because your lucee.jar has bundled this version.",
 				"loaderPath": "To downgrade below this version you need to replace your lucee.jar, found at [ {loaderPath} ] with an older version.",
 				"type": "Typ",

core/src/main/cfml/context/admin/resources/language/en.json

@@ -461,8 +461,7 @@
       "upDown": "Update / Downgrade / Uninstall",
       "upDownDesc": "Update or downgrade your already installed version.",
       "upload": "upload",
-      "uploadextension": "Upload new extension
-      ",
+      "uploadextension": "Upload new extension",
       "uploadextensiondesc": "If you downloaded an extension, you can add the extension here.",
       "version": "Version",
       "viewdetails": "View details"
@@ -662,6 +661,9 @@
       "compilestoponerror": "Stop on error",
       "compilestoponerrordesc": "Sets whether the compile process should be aborted on errors",
       "compiletitle": "compile",
+      "compileErrorsTitle": "Compilation Errors",
+      "compileErrorsIntro": "The following errors occurred whilst {context}. Please fix these errors and try again.",
+      "compileErrorsDesc": "The following compilation errors occurred. Please fix these errors and try again.",
       "editdesc": "Here you can edit a certain mapping or create a Lucee archive out of an existing one.",
       "introtext": "Please note that only pages processed by Lucee are aware of these mappings (cfm, cfml, cfc). If you want to use files not processed by Lucee for these special mapping directories, you have to add virtual mappings to these directories to your application server.",
       "physical": "Resource",
@@ -1357,8 +1359,11 @@
         "short": {
           "pre_release": "Pre Releases",
           "release": "Releases",
-          "snapshot": "Snapshots"
+          "snapshot": "Snapshots",
+          "alpha": "Alphas"
         },
+        "alpha": "Alpha",
+        "alphaDesc": "Alpha versions are early development builds that may contain incomplete features or bugs. They are NOT recommended for production environments.",
         "snapShot": "SnapShots",
         "snapShotDesc": "Snapshots are generated automatically with every push to the repository, when all bundled test cases pass successfully. Snapshots are NOT recommended for production environments.",
         "titleDesc": "Upgrade or Downgrade the version by selecting from the drop-down box below.",

core/src/main/cfml/context/admin/resources/language/es.json

@@ -650,6 +650,9 @@
 			"compilestoponerror": "Detener en caso de error",
 			"compilestoponerrordesc": "Establece si el proceso de compilación debe detenerse en caso de errores",
 			"compiletitle": "compilar",
+			"compileErrorsTitle": "Errores de Compilación",
+			"compileErrorsIntro": "Ocurrieron los siguientes errores mientras {context}. Por favor corrija estos errores e intente nuevamente.",
+			"compileErrorsDesc": "Ocurrieron los siguientes errores de compilación. Por favor corrija estos errores e intente nuevamente.",
 			"editdesc": "Aquí puedes editar un mapeo específico o crear un archivo de Lucee a partir de uno existente.",
 			"introtext": "Ten en cuenta que solo las páginas procesadas por Lucee son conscientes de estos mapeos (cfm, cfml, cfc). Si deseas utilizar archivos no procesados por Lucee en estos directorios de mapeo especiales, debes agregar mapeos virtuales a estos directorios en tu servidor de aplicaciones.",
 			"physical": "Recurso",