From afba19fcc04b78ff194389658c1cd85ecbdf2dfe Mon Sep 17 00:00:00 2001
From: edu-de <66421684+edu-de@users.noreply.github.com>
Date: Tue, 8 Jun 2021 17:19:58 +0200
Subject: [PATCH] RS3.7.0-6043

---
 src/META-INF/persistence.xml                  | 41 ++++++++-----------
 .../rs/ReportServerServiceConfig.java         |  2 +-
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/META-INF/persistence.xml b/src/META-INF/persistence.xml
index 8a4cd58c7..f58b6157f 100644
--- a/src/META-INF/persistence.xml
+++ b/src/META-INF/persistence.xml
@@ -12,6 +12,7 @@
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.YearlyAtDateConfig</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatNumber</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.MonthlyNthDayConfig</class>
+          <class>net.datenwerke.rs.dropbox.service.dropbox.action.ScheduleAsDropboxFileAction</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.ColumnReference</class>
           <class>net.datenwerke.rs.base.service.datasources.definitions.DatabaseDatasourceConfig</class>
           <class>net.datenwerke.rs.base.service.datasources.definitions.CsvDatasourceConfig</class>
@@ -21,27 +22,20 @@
           <class>net.datenwerke.rs.incubator.service.scriptdatasource.entities.ScriptDatasourceConfig</class>
           <class>net.datenwerke.rs.grideditor.service.grideditor.entities.GridEditorReport</class>
           <class>net.datenwerke.gf.service.properties.entities.Property</class>
+          <class>net.datenwerke.rs.onedrive.service.onedrive.action.ScheduleAsOneDriveFileAction</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.WeeklyConfig</class>
           <class>net.datenwerke.rs.base.service.reportengines.jasper.entities.JasperReportVariant</class>
-          <class>net.datenwerke.rs.teamspace.service.teamspace.entities.AppProperty</class>
           <class>net.datenwerke.rs.base.service.parameters.datetime.DateTimeParameterDefinition</class>
+          <class>net.datenwerke.rs.teamspace.service.teamspace.entities.AppProperty</class>
           <class>net.datenwerke.rs.saiku.service.saiku.entities.SaikuReportVariant</class>
           <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.FileSelectionParameterInstance</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.ReportDadget</class>
           <class>net.datenwerke.rs.dsbundle.service.dsbundle.entities.DatabaseBundleEntry</class>
           <class>net.datenwerke.rs.teamspace.service.teamspace.entities.TeamSpace</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.YearlyNamedDayTrigger</class>
-          <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReport</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.ActionEntry</class>
+          <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReport</class>
           <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsSftpFileAction</class>
-          <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpsFileAction</class>
-          <class>net.datenwerke.rs.samba.service.samba.action.ScheduleAsSambaFileAction</class>
-          <class>net.datenwerke.rs.dropbox.service.dropbox.action.ScheduleAsDropboxFileAction</class>
-          <class>net.datenwerke.rs.onedrive.service.onedrive.action.ScheduleAsOneDriveFileAction</class>
-          <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterDefinition</class>
-          <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableInstance</class>
-          <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterDefinition</class>
-          <class>net.datenwerke.rs.uservariables.service.parameters.UserVariableParameterDefinition</class>
           <class>net.datenwerke.rs.incubator.service.versioning.entities.Revision</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.Dashboard</class>
           <class>net.datenwerke.rs.uservariables.service.parameters.UserVariableParameterInstance</class>
@@ -53,24 +47,23 @@
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.AdditionalColumnSpec</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatText</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceDefinitionConfig</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyNthdayTrigger</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.DateTriggerConfig</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyNthdayTrigger</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatTemplate</class>
           <class>net.datenwerke.rs.compiledreportstore.entities.PersistentCompiledReport</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.HistoryEntryProperty</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.TableReportVariant</class>
-          <class>net.datenwerke.security.service.security.entities.GenericSecurityTargetEntity</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardReference</class>
+          <class>net.datenwerke.security.service.security.entities.GenericSecurityTargetEntity</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.MonthlyNthDayMthMonthTrigger</class>
-          <class>net.datenwerke.rs.scripting.service.jobs.ScriptExecuteJob</class>
           <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReportFile</class>
+          <class>net.datenwerke.rs.scripting.service.jobs.ScriptExecuteJob</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.FavoriteListEntry</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.BinaryColumnFilter</class>
           <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportTemplate</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DadgetNode</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceFolder</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DadgetNode</class>
           <class>net.datenwerke.rs.base.service.parameters.headline.HeadlineParameterDefinition</class>
-          <class>net.datenwerke.rs.scheduler.service.scheduler.jobs.report.ReportExecuteJob</class>
           <class>net.datenwerke.rs.scp.service.scp.action.ScheduleAsScpFileAction</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.AbstractReportManagerNode</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.Dadget</class>
@@ -101,12 +94,11 @@
           <class>net.datenwerke.rs.base.service.datasources.connectors.ArgumentDatasourceConnector</class>
           <class>net.datenwerke.rs.base.service.parameters.blatext.BlatextParameterInstance</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.MonthlyNthDayOfWeekConfig</class>
-          <class>net.datenwerke.rs.scheduler.service.scheduler.sendto.SendToReportAction</class>
           <class>net.datenwerke.rs.base.service.parameters.string.TextParameterInstance</class>
           <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReportFile</class>
-          <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractAction</class>
           <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReportVariant</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DateTrigger</class>
+          <class>net.datenwerke.rs.onedrive.service.onedrive.definitions.OneDriveDatasink</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.Report</class>
           <class>net.datenwerke.rs.teamspace.service.teamspace.entities.TeamSpaceApp</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceContainer</class>
@@ -115,18 +107,15 @@
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardFolder</class>
           <class>net.datenwerke.rs.scriptreport.service.scriptreport.parameter.ScriptParameterInstance</class>
           <class>net.datenwerke.rs.ftp.service.ftp.definitions.SftpDatasink</class>
-          <class>net.datenwerke.rs.dropbox.service.dropbox.definitions.DropboxDatasink</class>
-          <class>net.datenwerke.rs.onedrive.service.onedrive.definitions.OneDriveDatasink</class>
-          <class>net.datenwerke.rs.emaildatasink.service.emaildatasink.definitions.EmailDatasink</class>
-          <class>net.datenwerke.rs.emaildatasink.service.emaildatasink.action.ScheduleAsEmailFileAction</class>
           <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.SelectedParameterFile</class>
           <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFile</class>
           <class>net.datenwerke.rs.condition.service.condition.entity.ReportCondition</class>
+          <class>net.datenwerke.rs.emaildatasink.service.emaildatasink.action.ScheduleAsEmailFileAction</class>
           <class>net.datenwerke.rs.dsbundle.service.dsbundle.entities.DatabaseBundle</class>
           <class>net.datenwerke.security.service.security.entities.Acl</class>
           <class>net.datenwerke.rs.incubator.service.jaspertotable.entities.JasperToTableConfig</class>
-          <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFolder</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.ColumnFilter</class>
+          <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFolder</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.UrlDadget</class>
           <class>net.datenwerke.rs.base.service.parameters.separator.SeparatorParameterInstance</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceDefinition</class>
@@ -137,8 +126,8 @@
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.FilterRange</class>
           <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportTemplateList</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.LibraryDadget</class>
-          <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReport</class>
           <class>net.datenwerke.security.service.security.entities.HierarchicalAce</class>
+          <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReport</class>
           <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskGeneralReference</class>
           <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportByteTemplate</class>
           <class>net.datenwerke.rs.scriptreport.service.scriptreport.parameter.ScriptParameterDefinition</class>
@@ -149,8 +138,8 @@
           <class>net.datenwerke.rs.uservariables.service.parameters.UserVariableParameterDefinition</class>
           <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.AbstractTsDiskNode</class>
           <class>net.datenwerke.rs.jxlsreport.service.jxlsreport.entities.JxlsReport</class>
-          <class>net.datenwerke.rs.base.service.datasources.definitions.CsvDatasource</class>
           <class>net.datenwerke.security.service.usermanager.entities.UserProperty</class>
+          <class>net.datenwerke.rs.base.service.datasources.definitions.CsvDatasource</class>
           <class>net.datenwerke.rs.samba.service.samba.action.ScheduleAsSambaFileAction</class>
           <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnector</class>
           <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableDefinition</class>
@@ -173,8 +162,9 @@
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormat</class>
           <class>net.datenwerke.security.service.usermanager.entities.OrganisationalUnit</class>
           <class>net.datenwerke.rs.scriptreport.service.scriptreport.entities.ScriptReport</class>
-          <class>net.datenwerke.rs.computedcolumns.service.computedcolumns.entities.ComputedColumn</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.AbstractDashboardManagerNode</class>
+          <class>net.datenwerke.rs.computedcolumns.service.computedcolumns.entities.ComputedColumn</class>
+          <class>net.datenwerke.rs.dropbox.service.dropbox.definitions.DropboxDatasink</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.Filter</class>
           <class>net.datenwerke.rs.globalconstants.service.globalconstants.entities.GlobalConstant</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.ReportFolder</class>
@@ -200,6 +190,7 @@
           <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskFolder</class>
           <class>net.datenwerke.rs.scriptreport.service.scriptreport.entities.ScriptReportVariant</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.JobHistory</class>
+          <class>net.datenwerke.rs.emaildatasink.service.emaildatasink.definitions.EmailDatasink</class>
           <class>net.datenwerke.rs.base.service.parameters.headline.HeadlineParameterInstance</class>
           <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpsFileAction</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportMetadata</class>
diff --git a/src/net/datenwerke/rs/ReportServerServiceConfig.java b/src/net/datenwerke/rs/ReportServerServiceConfig.java
index e13d25dd4..a0a803c06 100755
--- a/src/net/datenwerke/rs/ReportServerServiceConfig.java
+++ b/src/net/datenwerke/rs/ReportServerServiceConfig.java
@@ -229,7 +229,7 @@ public class ReportServerServiceConfig extends DwGwtFrameworkBase{
 
 	private final Logger logger = LoggerFactory.getLogger(getClass().getName());
 
-	public static final String CODE_VERSION = "2021-05-11-12-35-17";
+	public static final String CODE_VERSION = "2021-06-08-15-41-23";
 	
 	public static final String ENTERPRISE_MODULE_LOCATION = "net.datenwerke.rsenterprise.main.service.RsEnterpriseModule";
 	private static final String ENTERPRISE_MODULE_LOAD_MODULE_METHOD = "getEnterpriseModules";