RS3.7.0-6044

infofabrik · Jun 9, 2021 · 12835d4 · 12835d4
1 parent afba19f
commit 12835d4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/META-INF/persistence.xml b/src/META-INF/persistence.xml
@@ -6,13 +6,13 @@
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.ParameterDadget</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.StaticHtmlDadget</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.PreFilter</class>
-          <class>net.datenwerke.rs.grideditor.service.grideditor.entities.GridEditorReportVariant</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.AbstractDatasourceManagerNode</class>
+          <class>net.datenwerke.rs.grideditor.service.grideditor.entities.GridEditorReportVariant</class>
           <class>net.datenwerke.rs.base.service.parameters.blatext.BlatextParameterDefinition</class>
           <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.scheduler.service.scheduler.triggers.complex.config.MonthlyNthDayConfig</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>
@@ -33,8 +33,8 @@
           <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.scheduler.service.scheduler.entities.history.ActionEntry</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.ftp.service.ftp.action.ScheduleAsSftpFileAction</class>
           <class>net.datenwerke.rs.incubator.service.versioning.entities.Revision</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.Dashboard</class>
@@ -43,12 +43,12 @@
           <class>net.datenwerke.rs.scheduler.service.scheduler.mail.MailReportAction</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardNode</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.DailyConfig</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.YearlyAtDateTrigger</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.AdditionalColumnSpec</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.YearlyAtDateTrigger</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.config.DateTriggerConfig</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.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>
@@ -64,6 +64,7 @@
           <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>
@@ -94,9 +95,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.rs.birt.service.reportengine.entities.BirtReportVariant</class>
+          <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractAction</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>
@@ -126,29 +129,29 @@
           <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.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.security.service.security.entities.HierarchicalAce</class>
           <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportByteTemplate</class>
           <class>net.datenwerke.rs.scriptreport.service.scriptreport.parameter.ScriptParameterDefinition</class>
           <class>net.datenwerke.security.service.security.entities.HierarchicalAcl</class>
           <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkContainer</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.variabletypes.string.StringUserVariableInstance</class>
           <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.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.security.service.usermanager.entities.UserProperty</class>
           <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnector</class>
+          <class>net.datenwerke.rs.samba.service.samba.action.ScheduleAsSambaFileAction</class>
           <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableDefinition</class>
           <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkFolder</class>
           <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpFileAction</class>
           <class>net.datenwerke.rs.saiku.service.datasource.MondrianDatasourceConfig</class>
           <class>net.datenwerke.rs.base.service.parameters.string.TextParameterDefinition</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.YearlyNthDayOfWeekConfig</class>
           <class>net.datenwerke.rs.utils.eventlogger.entities.LogProperty</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.YearlyNthDayOfWeekConfig</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.ExecutionLogEntry</class>
           <class>net.datenwerke.rs.saiku.service.datasource.MondrianDatasource</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportServerSideStringProperty</class>
@@ -162,14 +165,14 @@
           <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.dashboard.service.dashboard.entities.AbstractDashboardManagerNode</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.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>
-          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportStringTemplate</class>
           <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.UploadedParameterFile</class>
+          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportStringTemplate</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractJob</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardContainer</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyWorkdayTrigger</class>
@@ -179,8 +182,8 @@
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.FavoriteList</class>
           <class>net.datenwerke.rs.birt.service.datasources.birtreport.entities.BirtReportDatasourceConfig</class>
           <class>net.datenwerke.security.service.usermanager.entities.User</class>
-          <class>net.datenwerke.rs.uservariables.service.variabletypes.list.ListUserVariableDefinition</class>
           <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReportVariant</class>
+          <class>net.datenwerke.rs.uservariables.service.variabletypes.list.ListUserVariableDefinition</class>
           <class>net.datenwerke.rs.base.service.datasources.connectors.UrlDatasourceConnector</class>
           <class>net.datenwerke.rs.samba.service.samba.definitions.SambaDatasink</class>
           <class>net.datenwerke.rs.birt.service.datasources.birtreport.entities.BirtReportDatasourceDefinition</class>
@@ -190,8 +193,8 @@
           <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.emaildatasink.service.emaildatasink.definitions.EmailDatasink</class>
           <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpsFileAction</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportMetadata</class>
           <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnectorConfig</class>
@@ -200,8 +203,8 @@
           <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractTrigger</class>
           <class>net.datenwerke.rs.fileserver.service.fileserver.entities.AbstractFileServerNode</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.JobEntry</class>
-          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportStringProperty</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.FilterSpec</class>
+          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportStringProperty</class>
           <properties>
 
 			<!-- Connection properties -->

diff --git 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-06-08-15-41-23";
+	public static final String CODE_VERSION = "2021-06-09-10-02-15";
 
 	public static final String ENTERPRISE_MODULE_LOCATION = "net.datenwerke.rsenterprise.main.service.RsEnterpriseModule";
 	private static final String ENTERPRISE_MODULE_LOAD_MODULE_METHOD = "getEnterpriseModules";