frontend update to 23.04.000.199

frontend/build-birt.properties.default

@@ -8,8 +8,8 @@ CATALINA_HOME=/opt/agnitas.com/software/tomcat
 # Main directory, to put webapplications in, mostly "/home/<username>/webapps"
 deploydir=${user.home}/webapps
 
-# Buildname example: openemm-statistics-20.10.000.000
-appname=/openemm-statistics-20.10.000.000
+# Buildname example: openemm-statistics-23.04.000.000
+appname=/openemm-statistics-23.04.000.000
 
 # Deploytarget:
 deploytarget=openemm.birt

frontend/build-birt.xml

@@ -309,7 +309,7 @@
 				<include name="commons-configuration-*" />
 				<include name="commons-dbcp-*" />
 				<include name="commons-httpclient-*" />
-				<include name="commons-lang-*" />
+				<include name="commons-lang*" />
 				<include name="commons-logging-*" />
 				<include name="commons-io-*" />
 				<include name="commons-email-*" />
@@ -327,6 +327,7 @@
 				<include name="jcommon*" />
 				<include name="jackson*" />
 				<include name="http*" />
+				<include name="jakarta.mail-*" />
 			</fileset>
 		</copy>
 

frontend/build-ui-test.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<project basedir="." default="test" name="EMM_TEST_UI">
+    <macrodef name="exec-node">
+      <attribute name="module" description="The name of the NodeJS module to execute" />
+      <attribute name="failonerror" default="true" description="Fail if the exit code is not 0" />
+      <attribute name="dir" description="Directory to execute task" />
+      <element name="args" implicit="yes" description="Argument to pass to the exec task" />
+      <sequential>
+        <exec executable="cmd.exe" dir="@{dir}" failonerror="@{failonerror}" osfamily="winnt">
+          <arg line="/c  @{module}" />
+          <args />
+        </exec>
+        <exec executable="@{module}" dir="@{dir}" failonerror="@{failonerror}" osfamily="unix" logError="true">
+          <args />
+        </exec>
+      </sequential>
+    </macrodef>
+
+    <target name="test">
+        <exec-node dir="./test-ui" module="npm" failonerror="false" >
+          <arg value="test" />
+          <arg value="--" />
+          <arg value="--reporter=list" />
+        </exec-node>
+    </target>
+</project>

frontend/build-ws.xml

@@ -193,7 +193,6 @@
 			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/mailingbase']" />
 			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/mailingcontent']" />
 			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/mailingcontent']" />
-			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/mailingsend_ajax']" />
 			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/mcomponents']" />
 			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/formcomponents']" />
 			<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/month_stats']" />

frontend/build.properties.default

@@ -9,8 +9,8 @@ CATALINA_HOME=/opt/agnitas.com/software/tomcat
 deploydir=${user.home}/webapps
 
 # Webapplication directory name (may contain version tag info like "/css_8.10.334-hf1" to be seen in GUI, mostly for localhost tests "/css")
-# Buildname example: openemm-19.10.000.000
-appname=/openemm-19.10.000.000
+# Buildname example: openemm-23.04.000.000
+appname=/openemm-23.04.000.000
 
 # Deploytarget:
 deploytarget=openemm.asp

frontend/build.xml

@@ -464,7 +464,6 @@
 				<exclude name="**/grunt_config.json" />
 				<exclude name="**/Gruntfile.js" />
 				<exclude name="**/grunt/**" />
-				<exclude name="**/assets/sass/**" />
 				<exclude name="**/node_modules/**" />
 
 				<exclude name="**/package.json" />
@@ -513,14 +512,6 @@
 			<fileset dir="${emmSourcePath}/view/WEB-INF/conf" />
 		</copy>
 
-		<!-- Set source path for ACE editor addons and its deployment target -->
-		<property name="aceeditor.addons.dir" location="${emmSourcePath}/view/assets/js/ace-addons" />
-		<property name="aceeditor.deploydir" location="${deploydir}${appname}/assets/js/vendor/ace_20.12.14" />
-
-		<copy todir="${aceeditor.deploydir}">
-			<fileset dir="${aceeditor.addons.dir}" includes="**.js" />
-		</copy>
-
 		<copy file="${deploydir}${appname}/WEB-INF/tiles-defs-basic.xml" tofile="${deploydir}${appname}/WEB-INF/tiles-defs.xml"/>
 		<delete file="${deploydir}${appname}/WEB-INF/tiles-defs-basic.xml" />
 

frontend/build/properties/openemm.emm.license.xml

@@ -6,6 +6,7 @@
 	<expirationDate></expirationDate>
 	<maximumNumberOfCompanies>-1</maximumNumberOfCompanies>
 	<maximumNumberOfSupervisors>-1</maximumNumberOfSupervisors>
+	<maximumNumberOfGuiAdmins>-1</maximumNumberOfGuiAdmins>
 	<maximumNumberOfAdmins>-1</maximumNumberOfAdmins>
 	<maximumNumberOfWebserviceUsers>-1</maximumNumberOfWebserviceUsers>
 	<maximumNumberOfRestfulUsers>-1</maximumNumberOfRestfulUsers>

frontend/build/templates/log4j2-emm.xml

@@ -180,6 +180,12 @@
 		<Logger name="com.agnitas.spring.WebSecurityConfiguration" level="debug">
 			<AppenderRef ref="SPRING_SECURITY_LOG" />
 		</Logger>
+
+		<Logger name="de.larsgrefer.sass.embedded.SassCompiler" level="error">
+			<AppenderRef ref="ROOT_CONSOLE" />
+			<AppenderRef ref="APPLICATIONLOGFILE" />
+			<AppenderRef ref="APPLICATIONERRORLOGFILE" />
+		</Logger>
 
 	</Loggers>
 </Configuration>

frontend/build/templates/startup-jobs.whitelist

@@ -8,10 +8,3 @@
 #
 
 # Add new jobs here. Leave a comment on each job (JIRA issue, short description, ...)
-
-#
-# Assigns random tokens to companies without one.
-# EMM-8238
-# (Check for removal in LTS 23.04)
-#
-com.agnitas.startuplistener.startupjobs.AssignCompanyTokenStartupJob

frontend/build/templates/web-basic.xml

@@ -13,7 +13,7 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>/WEB-INF/applicationContext.xml /WEB-INF/applicationContext-actions-basic.xml /WEB-INF/applicationContext-permissions.xml /WEB-INF/dataAccessContext.xml /WEB-INF/cronContext.xml</param-value>
 	</context-param>
-
+	
 	<!-- Default encoding filter: Sets encoding if request encoding is not set by headers -->
 	<filter>
 		<filter-name>charsetFilter</filter-name>
@@ -141,7 +141,6 @@
 		<filter-name>SessionHijackingPreventionFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-
 
 	<!-- interceptor for AjaxAnywhere library -->
 	<filter>
@@ -216,10 +215,10 @@
 	<listener>
 		<listener-class>com.agnitas.util.ResetJobQueueContextListener</listener-class>
 	</listener>
-
+
+	<!-- listener for resetting old server command entries on host startup -->
 	<listener>
-		<!-- cleanup session before startup to prevent accidental cross account access after restart -->
-		<listener-class>org.agnitas.util.web.SessionCleanUpListener</listener-class>
+		<listener-class>com.agnitas.util.ResetServerCommandsContextListener</listener-class>
 	</listener>
 
 	<!-- Cleanup session data when user logs out or session is destroyed (after inactivity timeout or user closed browser) -->
@@ -303,6 +302,15 @@
 		<url-pattern>/image</url-pattern>
 		<url-pattern>/image/*</url-pattern>
 	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>CssServlet</servlet-name>
+		<servlet-class>com.agnitas.web.CssServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>CssServlet</servlet-name>
+		<url-pattern>/application.min.css</url-pattern>
+	</servlet-mapping>
 
 	<servlet>
 		<servlet-name>LayoutServlet</servlet-name>

frontend/etc/reportdesigns/WEB-INF/applicationContext.xml

@@ -41,6 +41,8 @@
    		<property name="serverMessageDao" ref="serverMessageDao" />
    		<property name="profileFieldService" ref="profileFieldService" />
    	</bean>
+
+	<bean id="WorkflowDataParser" class="com.agnitas.emm.core.workflow.service.ComWorkflowDataParser" />
 
     <bean id="permissionService" class="com.agnitas.emm.core.permission.service.PermissionServiceImpl">
     	<property name="permissionDao" ref="permissionDao" />