Skip to content

Commit fd5cf18

Browse files
agnitas-wknagnitas-wkn
committed
frontend update to 24.10.000.073
1 parent f50d69d commit fd5cf18

File tree

1,823 files changed

+129611
-120765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,823 files changed

+129611
-120765
lines changed

‎frontend/build-birt.xml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@
151151
<classpath refid="build.classpath" />
152152
<classpath refid="build.containerPath" />
153153
<include name="com/agnitas/reporting/**" />
154+
<include name="com/agnitas/emm/core/service/**/RecipientFieldsCache*" />
155+
<include name="com/agnitas/emm/core/dao/**/RecipientFieldDao*" />
156+
<include name="com/agnitas/emm/core/dao/**/RecipientProfileHistory*" />
157+
<include name="com/agnitas/dao/**/ProfileFieldDao*" />
158+
<include name="com/agnitas/emm/core/recipient/service/**/RecipientProfileHistoryService*" />
154159
</javac>
155160
</target>
156161

@@ -411,7 +416,7 @@
411416

412417
<xmltask source="${deploydir}${appname}/WEB-INF/web.xml" dest="${deploydir}${appname}/WEB-INF/web.xml">
413418
<!-- Springframework insert -->
414-
<insert path="/:web-app/:display-name[last()]" position="after">
419+
<insert path="/*[local-name()='web-app']/*[local-name()='display-name'][last()]" position="after">
415420
<![CDATA[&#09;
416421
<!-- Springframework -->
417422
<context-param>
@@ -422,12 +427,12 @@
422427
</insert>
423428

424429
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=538142 -->
425-
<replace path="/:web-app/:context-param[:param-name='BIRT_VIEWER_DOCUMENT_FOLDER']/:param-value">
426-
<![CDATA[<param-value>${birt.viewer.working.path}/WEB-INF/documents</param-value>]]>
430+
<replace path="/*[local-name()='web-app']/*[local-name()='context-param'][*[local-name()='param-name']/text()='BIRT_VIEWER_DOCUMENT_FOLDER']/*[local-name()='param-value']/text()">
431+
<![CDATA[${birt.viewer.working.path}/WEB-INF/documents]]>
427432
</replace>
428433

429434
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=538142 -->
430-
<insert path="/:web-app/:context-param[last()]" position="after">
435+
<insert path="/*[local-name()='web-app']/*[local-name()='context-param'][last()]" position="after">
431436
<![CDATA[&#09;
432437
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=538142 -->
433438
<filter>
@@ -445,10 +450,10 @@
445450
]]>
446451
</insert>
447452

448-
<insert path="/:web-app/:display-name[last()]" position="after" xml="&#10;&#10;&#09;&lt;!-- *.properties --&gt;&#10;&#09;" />
453+
<insert path="/*[local-name()='web-app']/*[local-name()='display-name'][last()]" position="after" xml="&#10;&#10;&#09;&lt;!-- *.properties --&gt;&#10;&#09;" />
449454

450455
<!-- SecurityInterceptor insert -->
451-
<insert path="/:web-app/:context-param[last()]" position="after">
456+
<insert path="/*[local-name()='web-app']/*[local-name()='context-param'][last()]" position="after">
452457
<![CDATA[&#09;
453458
<!-- SecurityInterceptor -->
454459
<filter>
@@ -463,7 +468,7 @@
463468
</insert>
464469

465470
<!-- Language filter insert -->
466-
<insert path="/:web-app/:context-param[last()]" position="after">
471+
<insert path="/*[local-name()='web-app']/*[local-name()='context-param'][last()]" position="after">
467472
<![CDATA[&#09;
468473
<!-- Language filter -->
469474
<filter>
@@ -478,7 +483,7 @@
478483
</insert>
479484

480485
<!-- Viewer Auto Reports Listener insert -->
481-
<insert path="/:web-app/:filter-mapping[last()]" position="after">
486+
<insert path="/*[local-name()='web-app']/*[local-name()='filter-mapping'][last()]" position="after">
482487
<![CDATA[&#09;
483488
<!-- Viewer Auto Reports Listener -->
484489
<listener>
@@ -487,7 +492,7 @@
487492
]]>
488493
</insert>
489494

490-
<insert path="/:web-app/:listener[last()]" position="after">
495+
<insert path="/*[local-name()='web-app']/*[local-name()='listener'][last()]" position="after">
491496
<![CDATA[&#09;
492497
<!-- Birt Messages Listener -->
493498
<listener>
@@ -496,7 +501,7 @@
496501
]]>
497502
</insert>
498503

499-
<insert path="/:web-app/:servlet-mapping[last()]" position="after">
504+
<insert path="/*[local-name()='web-app']/*[local-name()='servlet-mapping'][last()]" position="after">
500505
<![CDATA[<servlet>
501506
<servlet-name>DashboardInfo</servlet-name>
502507
<servlet-class>com.agnitas.reporting.birt.external.web.ajax.DashboardInfo</servlet-class>
@@ -508,15 +513,15 @@
508513
]]>
509514
</insert>
510515

511-
<insert path="/:web-app/:jsp-config[last()]" position="after">
516+
<insert path="/*[local-name()='web-app']/*[local-name()='jsp-config'][last()]" position="after">
512517
<![CDATA[&#09;
513518
<!-- Welcomepages -->
514519
<welcome-file-list>
515520
<welcome-file>/WEB-INF/jsp/empty.jsp</welcome-file>
516521
</welcome-file-list>]]>
517522
</insert>
518523

519-
<insert path="/:web-app/:jsp-config[last()]" position="after">
524+
<insert path="/*[local-name()='web-app']/*[local-name()='jsp-config'][last()]" position="after">
520525
<![CDATA[&#09;
521526
<security-constraint>
522527
<web-resource-collection>
@@ -653,10 +658,9 @@
653658
<target name="applicationContext" depends="deploy">
654659
<echo message="rewriting applicationContext for statistics" />
655660
<delete file="${deploydir}${appname}/WEB-INF/applicationContext.xml" />
656-
<xmltask source="${emmSourcePath}/view/WEB-INF/applicationContext.xml" dest="${deploydir}${appname}/WEB-INF/applicationContext.xml" preserveType="true">
657-
<!-- Remove beans not wanted/needed in statistics -->
658-
<!-- Nothing to remove applicationContext.action.xml is not loaded for birt application-->
659-
</xmltask>
661+
<copy file="${emmSourcePath}/view/WEB-INF/applicationContext.xml" tofile="${deploydir}${appname}/WEB-INF/applicationContext.xml" />
662+
<!-- Remove beans not wanted/needed in statistics -->
663+
<!-- Nothing to remove applicationContext.action.xml is not loaded for birt application-->
660664
<echo message="...applicationContext.xml done" />
661665
</target>
662666

‎frontend/build-ws.xml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -241,41 +241,40 @@
241241
<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/trackuserformlink']" />
242242
<remove path="/*[local-name()='beans']/*[local-name()='bean'][@name='/trackuserformlinkstat']" />
243243
</xmltask>
244+
245+
<!-- Remove unwanted namespace attributes -->
246+
<replace file="${deploydir}${appname}/WEB-INF/applicationContext.xml" value="">
247+
<replacetoken> xmlns=""</replacetoken>
248+
</replace>
244249

245250
<delete file="${deploydir}${appname}/WEB-INF/applicationContext-service-basic.xml" />
246251
<xmltask source="${emmSourcePath}/view/WEB-INF/applicationContext-service-basic.xml" dest="${deploydir}${appname}/WEB-INF/applicationContext-service-basic.xml" preserveType="true">
247252
<remove path="/*[local-name()='beans']/*[local-name()='bean'][@id='LogonService']" />
248253
</xmltask>
249-
<xmltask
250-
source="${emmEtcPath}/spring-ws/webapp/WEB-INF/spring-ws-common.xml"
251-
dest="${deploydir}${appname}/WEB-INF/spring-ws-common.xml"
252-
preserveType="true">
253-
<insert path="/:beans/:bean[last()]" position="after">
254-
<![CDATA[
255-
<bean id="WebserviceSubscriptionRejectionService" class="com.agnitas.emm.springws.subscriptionrejection.service.NullSubscriptionRejectionServiceImpl" />
256-
]]>
257-
</insert>
258-
</xmltask>
259-
260-
<delete file="${deploydir}${appname}/WEB-INF/applicationContext-actions-basic.xml" />
261-
<delete file="${deploydir}${appname}/WEB-INF/applicationContext-actions-openemm.xml" />
262-
<delete file="${deploydir}${appname}/WEB-INF/applicationContext-permissions-basic.xml" />
254+
255+
<!-- Remove unwanted namespace attributes -->
256+
<replace file="${deploydir}${appname}/WEB-INF/applicationContext-service-basic.xml" value="">
257+
<replacetoken> xmlns=""</replacetoken>
258+
</replace>
263259

264260
<xmltask
265261
source="${emmEtcPath}/spring-ws/webapp/WEB-INF/spring-ws-common.xml"
266262
dest="${deploydir}${appname}/WEB-INF/spring-ws-common.xml"
267263
preserveType="true">
268-
<insert path="/:beans/:bean[last()]" position="after">
264+
<insert path="/*[local-name()='beans']/*[local-name()='bean'][last()]" position="after">
269265
<![CDATA[
270266
<bean id="WebserviceSubscriptionRejectionService" class="com.agnitas.emm.springws.subscriptionrejection.service.NullSubscriptionRejectionServiceImpl" />
271267
]]>
272268
</insert>
273269
</xmltask>
274-
270+
271+
<!-- Remove unwanted namespace attributes -->
275272
<replace file="${deploydir}${appname}/WEB-INF/spring-ws-common.xml" value="">
276273
<replacetoken> xmlns=""</replacetoken>
277274
</replace>
278275

276+
<delete file="${deploydir}${appname}/WEB-INF/applicationContext-permissions-basic.xml" />
277+
279278
<echo message="...applicationContext.xml done" />
280279
</target>
281280

‎frontend/build.xml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project basedir="." default="all" name="OpenEMM">
33
<tstamp />
44

5-
<taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="lib_ant/xmltask.jar" />
5+
<taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="lib_ant/ant-xmltask-1.17.jar" />
66
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="lib_ant/ant-contrib-1.0b3.jar" />
77
<taskdef name="mergexml" classname="com.agnitas.ant.MergeXml" classpath="lib_ant/mergexml.jar" />
88

@@ -32,7 +32,7 @@
3232
<isset property="javaVersion" />
3333
</not>
3434
<then>
35-
<property name="javaVersion" value="11" />
35+
<property name="javaVersion" value="17" />
3636
</then>
3737
</if>
3838
<echo message="Using Java version ${javaVersion}" />
@@ -358,7 +358,7 @@
358358
<mergexml source="${basecss}/build/templates/web-basic.xml" change="${basecss}/build/templates/web-openemm.xml" dest="${deploydir}${appname}/WEB-INF/web.xml" />
359359

360360
<xmltask source="${deploydir}${appname}/WEB-INF/web.xml" dest="${deploydir}${appname}/WEB-INF/web.xml" preserveType="true">
361-
<insert path="/:web-app/:welcome-file-list[1]" position="after">
361+
<insert path="/*[local-name()='web-app']/*[local-name()='welcome-file-list'][1]" position="after">
362362
<![CDATA[&#09;
363363
<context-param>
364364
<param-name>sessionfilestore</param-name>
@@ -442,7 +442,7 @@
442442
<!-- RESTful services mappings in web.xml -->
443443
<echo message="Including Restful Services" />
444444
<xmltask source="${deploydir}${appname}/WEB-INF/web.xml" dest="${deploydir}${appname}/WEB-INF/web.xml" preserveType="true">
445-
<insert path="/:web-app/:servlet-mapping[last()]" position="after">
445+
<insert path="/*[local-name()='web-app']/*[local-name()='servlet-mapping'][last()]" position="after">
446446
<![CDATA[&#09;
447447
<!-- RESTful services -->
448448
<servlet>
@@ -456,6 +456,11 @@
456456
]]>
457457
</insert>
458458
</xmltask>
459+
460+
<!-- Remove unwanted namespace attributes -->
461+
<replace file="${deploydir}${appname}/WEB-INF/web.xml" value="">
462+
<replacetoken> xmlns=""</replacetoken>
463+
</replace>
459464

460465
<!-- Deactivate jobqueue (default: keep job queue)-->
461466
<property name = "deactivateJobQueue" value="false" />
@@ -465,8 +470,13 @@
465470
<echo message="Deactivating job queue" />
466471
<delete file="${deploydir}${appname}/WEB-INF/cronContext.xml" />
467472
<xmltask source="${deploydir}${appname}/WEB-INF/web.xml" dest="${deploydir}${appname}/WEB-INF/web.xml" preserveType="true">
468-
<replace path="/:web-app/:context-param[:param-name='contextConfigLocation']/:param-value/text()">/WEB-INF/applicationContext*.xml</replace>
473+
<replace path="/*[local-name()='web-app']/*[local-name()='context-param'][*[local-name()='param-name']/text()='contextConfigLocation']/*[local-name()='param-value']/text()">/WEB-INF/applicationContext*.xml</replace>
469474
</xmltask>
475+
476+
<!-- Remove unwanted namespace attributes -->
477+
<replace file="${deploydir}${appname}/WEB-INF/web.xml" value="">
478+
<replacetoken> xmlns=""</replacetoken>
479+
</replace>
470480
<echo message="cronContext.xml removed" />
471481
</then>
472482
</if>
@@ -477,8 +487,7 @@
477487
<target name="applicationContext" depends="deploy">
478488
<echo message="rewriting applicationContext for asp" />
479489
<delete file="${deploydir}${appname}/WEB-INF/applicationContext.xml" />
480-
<xmltask source="${emmSourcePath}/view/WEB-INF/applicationContext.xml" dest="${deploydir}${appname}/WEB-INF/applicationContext.xml">
481-
</xmltask>
490+
<copy file="${emmSourcePath}/view/WEB-INF/applicationContext.xml" tofile="${deploydir}${appname}/WEB-INF/applicationContext.xml" />
482491
<echo message="...applicationContext.xml done" />
483492
</target>
484493

@@ -576,4 +585,4 @@
576585
</manifest>
577586
</war>
578587
</target>
579-
</project>
588+
</project>

‎frontend/build/templates/startup-jobs.whitelist‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@
88
#
99

1010
# Add new jobs here. Leave a comment on each job (JIRA issue, short description, ...)
11+
12+
#Create column 'id' in non-voucher reference tables where not exists
13+
com.agnitas.startuplistener.api.ReferenceTableIdColumnStartupJob

‎frontend/build/templates/web-basic.xml‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<context-param>
1212
<description>spring context</description>
1313
<param-name>contextConfigLocation</param-name>
14-
<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>
14+
<param-value>/WEB-INF/applicationContext.xml /WEB-INF/applicationContext-permissions.xml /WEB-INF/dataAccessContext.xml /WEB-INF/cronContext.xml</param-value>
1515
</context-param>
1616

1717
<!-- Default encoding filter: Sets encoding if request encoding is not set by headers -->
@@ -138,27 +138,6 @@
138138
<url-pattern>/*</url-pattern>
139139
</filter-mapping>
140140

141-
<!-- interceptor for AjaxAnywhere library -->
142-
<filter>
143-
<filter-name>AjaxAnywhere</filter-name>
144-
<filter-class>org.ajaxanywhere.AAFilter</filter-class>
145-
</filter>
146-
147-
<filter-mapping>
148-
<filter-name>AjaxAnywhere</filter-name>
149-
<url-pattern>*.jsp</url-pattern>
150-
</filter-mapping>
151-
<filter-mapping>
152-
<filter-name>AjaxAnywhere</filter-name>
153-
<url-pattern>*.do</url-pattern>
154-
<!-- default Struts mapping -->
155-
</filter-mapping>
156-
<filter-mapping>
157-
<filter-name>AjaxAnywhere</filter-name>
158-
<url-pattern>*.htm</url-pattern>
159-
<!-- other frameworks mapping -->
160-
</filter-mapping>
161-
162141
<!-- Stores an original request URI to make it available within JSPs -->
163142
<filter>
164143
<filter-name>OriginUriFilter</filter-name>
@@ -375,7 +354,7 @@
375354
</init-param>
376355
<init-param>
377356
<param-name>destinationUrl</param-name>
378-
<param-value>/logon.action</param-value>
357+
<param-value>/logonRedesigned.action</param-value>
379358
</init-param>
380359
</servlet>
381360
<servlet-mapping>
@@ -420,17 +399,6 @@
420399
<url-pattern>/v.html</url-pattern>
421400
</servlet-mapping>
422401

423-
<!-- File download
424-
<servlet>
425-
<servlet-name>FileDownloadServlet</servlet-name>
426-
<servlet-class>org.agnitas.emm.core.download.web.FileDownloadServlet</servlet-class>
427-
</servlet>
428-
<servlet-mapping>
429-
<servlet-name>FileDownloadServlet</servlet-name>
430-
<url-pattern>/download</url-pattern>
431-
</servlet-mapping>
432-
-->
433-
434402
<!-- Welcome File -->
435403
<welcome-file-list>
436404
<welcome-file>/WEB-INF/jsp/login.jsp</welcome-file>

0 commit comments

Comments
 (0)