diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java index c175f2c..4b4e2f8 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java @@ -5,7 +5,6 @@ package org.gcube.portlets.user.td.gwtservice.client.rpc; import java.util.ArrayList; -import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportMonitor; @@ -14,25 +13,41 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVRowError; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; -import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistMonitor; import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; import org.gcube.portlets.user.td.gwtservice.shared.history.OpHistory; import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSession; -import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.AddColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ChangeTableTypeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.CodelistMappingMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteRowsMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DenormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DuplicatesMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.EditRowMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ExtractCodelistMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.GroupByMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.LabelColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.MergeColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.NormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceBatchColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.SplitColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResubmitMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResumeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TemplateApplyMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.share.ShareInfo; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitSession; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeSession; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsTasksMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplyMonitor; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession; @@ -42,44 +57,29 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnMonitor; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupByMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadConfig; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadResult; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabValidationsMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java index c08e4e6..0eee400 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java @@ -5,7 +5,6 @@ package org.gcube.portlets.user.td.gwtservice.client.rpc; import java.util.ArrayList; -import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportMonitor; @@ -13,25 +12,41 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVRowError; -import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistMonitor; import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; import org.gcube.portlets.user.td.gwtservice.shared.history.OpHistory; import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSession; -import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.AddColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ChangeTableTypeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.CodelistMappingMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteRowsMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DenormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DuplicatesMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.EditRowMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ExtractCodelistMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.GroupByMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.LabelColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.MergeColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.NormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceBatchColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.SplitColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResubmitMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResumeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TemplateApplyMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.share.ShareInfo; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitSession; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeSession; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsTasksMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplyMonitor; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession; @@ -41,44 +56,29 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnMonitor; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupByMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadConfig; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadResult; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabValidationsMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java index c0cc422..23636ca 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java @@ -21,10 +21,10 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadListener; import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil; -import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.CodelistMappingMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index a1fe564..3b52029 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -18,62 +18,62 @@ import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; import org.gcube.portlets.user.td.gwtservice.shared.Constants; -import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; -import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistMonitor; import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSession; -import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.AddColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ChangeTableTypeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.CodelistMappingMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteRowsMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DenormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DuplicatesMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.EditRowMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ExtractCodelistMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.GroupByMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.LabelColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.MergeColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.NormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceBatchColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.SplitColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResubmitMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResumeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TemplateApplyMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitSession; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeSession; -import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplyMonitor; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; -import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupByMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupBySession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 74f2720..cb14381 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -124,7 +124,6 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.TDTypeValueMap; import org.gcube.portlets.user.td.gwtservice.server.trservice.TaskStateMap; import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.OperationsId; -import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportMonitor; @@ -136,14 +135,33 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVParserConfiguration; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVRowError; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; -import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistMonitor; import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; import org.gcube.portlets.user.td.gwtservice.shared.history.OpHistory; import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSession; -import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.AddColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ChangeTableTypeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.CodelistMappingMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteRowsMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DenormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.DuplicatesMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.EditRowMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ExtractCodelistMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.GroupByMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.LabelColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.MergeColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.NormalizationMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceBatchColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.ReplaceColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.RollBackSessionMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.SplitColumnMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResubmitMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TaskResumeMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.TemplateApplyMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; @@ -155,13 +173,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.source.SourceType; import org.gcube.portlets.user.td.gwtservice.shared.task.InvocationS; import org.gcube.portlets.user.td.gwtservice.shared.task.JobS; import org.gcube.portlets.user.td.gwtservice.shared.task.State; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitSession; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeSession; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskS; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsTasksMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplyMonitor; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData; import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession; @@ -174,25 +189,17 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMappingData; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupByMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupBySession; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRAgencyMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRDescriptionMetadata; @@ -200,22 +207,16 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRLocalizedText; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRNameMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRRightsMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadConfig; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadResult; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.Direction; import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.OrderInfo; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession; -import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.Validations; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabDescriptionsMetadata; @@ -229,7 +230,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabVersion import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.RelationshipData; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java index 378b363..b586132 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.server.file; import java.io.File; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; +import org.gcube.portlets.user.td.gwtservice.shared.monitor.CodelistMappingMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/AddColumnMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/AddColumnMonitor.java index 85f1acf..9b760c9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/AddColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.column; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/table/ChangeTableTypeMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ChangeTableTypeMonitor.java similarity index 59% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/table/ChangeTableTypeMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ChangeTableTypeMonitor.java index c537917..6918a4e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/table/ChangeTableTypeMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ChangeTableTypeMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.table; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; public class ChangeTableTypeMonitor extends OperationMonitor implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CodelistMappingMonitor.java similarity index 63% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CodelistMappingMonitor.java index 51cae2a..ee0ce88 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CodelistMappingMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.codelisthelper; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DeleteColumnMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DeleteColumnMonitor.java index 154ea68..ab17c72 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DeleteColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.column; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DeleteRowsMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DeleteRowsMonitor.java similarity index 60% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DeleteRowsMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DeleteRowsMonitor.java index 508bd8a..f926fca 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DeleteRowsMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DeleteRowsMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.rows; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; public class DeleteRowsMonitor extends OperationMonitor implements Serializable { /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DenormalizationMonitor.java similarity index 69% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DenormalizationMonitor.java index bc413e5..fb6bc11 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DenormalizationMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.normalization; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DuplicatesMonitor.java similarity index 59% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DuplicatesMonitor.java index fdf4c2e..44f0cd3 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/DuplicatesMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.rows; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; public class DuplicatesMonitor extends OperationMonitor implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/EditRowMonitor.java similarity index 60% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/EditRowMonitor.java index 333714b..2c7a0d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/EditRowMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.rows; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; public class EditRowMonitor extends OperationMonitor implements Serializable { /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ExtractCodelistMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ExtractCodelistMonitor.java index d9d21c4..5fe78b0 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ExtractCodelistMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.extract; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/GroupByMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/GroupByMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/GroupByMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/GroupByMonitor.java index 5fbeebb..dc52463 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/GroupByMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/GroupByMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.groupby; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/LabelColumnMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/LabelColumnMonitor.java index 523c06a..3957b46 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/LabelColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.column; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/MergeColumnMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/MergeColumnMonitor.java index f20cc96..4a93585 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/MergeColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.column; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/NormalizationMonitor.java similarity index 68% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/NormalizationMonitor.java index f861af4..eee2f43 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/NormalizationMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.normalization; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/OperationMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitor.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/OperationMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitor.java index 054dd24..119f0c9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/OperationMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitor.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ReplaceBatchColumnMonitor.java similarity index 71% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ReplaceBatchColumnMonitor.java index 4d4a9a0..a97aa79 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ReplaceBatchColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.batch; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ReplaceColumnMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ReplaceColumnMonitor.java index a01f8ca..d8cf3bd 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/ReplaceColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.column; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/history/RollBackSessionMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/RollBackSessionMonitor.java similarity index 71% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/history/RollBackSessionMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/RollBackSessionMonitor.java index bdd3592..1227005 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/history/RollBackSessionMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/RollBackSessionMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.history; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SplitColumnMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SplitColumnMonitor.java index 62552df..6f8475a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SplitColumnMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.column; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResubmitMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TaskResubmitMonitor.java similarity index 66% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResubmitMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TaskResubmitMonitor.java index 51b40e7..1dcaec7 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResubmitMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TaskResubmitMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.task; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TaskResumeMonitor.java similarity index 65% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TaskResumeMonitor.java index 883f515..850586e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TaskResumeMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.task; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/template/TemplateApplyMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TemplateApplyMonitor.java similarity index 71% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/template/TemplateApplyMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TemplateApplyMonitor.java index 2d41799..0ec2601 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/template/TemplateApplyMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/TemplateApplyMonitor.java @@ -1,8 +1,7 @@ -package org.gcube.portlets.user.td.gwtservice.shared.template; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** * Apply Template Monitor diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/UnionMonitor.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/UnionMonitor.java index 5365b5a..afeab09 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/UnionMonitor.java @@ -1,11 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared.tr.union; +package org.gcube.portlets.user.td.gwtservice.shared.monitor; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.OperationMonitor; /** *