From 2016a776219a923be10ea4f5ac7ca9cad8265083 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 24 Oct 2013 10:51:21 +0000 Subject: [PATCH] Rename package git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@83978 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gwtservice/client/TDGWTServiceEntry.java | 13 +++++ .../client/rpc/TDGWTService.java} | 34 ++++++------- .../client/rpc/TDGWTServiceAsync.java} | 34 ++++++------- .../server/CSVImportFileServlet.java | 6 +-- .../server/LocalUploadServlet.java | 16 +++--- .../server/SDMXClient.java | 8 +-- .../server/SessionUtil.java | 26 +++++----- .../server/TDGWTServiceImpl.java} | 50 +++++++++---------- .../server/file/FileUploadListener.java | 4 +- .../server/file/FileUploadSession.java | 10 ++-- .../server/file/FileUtil.java | 6 +-- .../server/storage/FilesStorage.java | 2 +- .../server/trservice/OperationsId.java | 2 +- .../server/trservice/TRTasksManager.java | 2 +- .../shared/Agencies.java | 2 +- .../shared/Codelist.java | 2 +- .../shared/Constants.java | 2 +- .../shared/ConstantsWorkspace.java | 2 +- .../shared/Dataset.java | 2 +- .../shared/FieldVerifier.java | 2 +- .../shared/TDGXTServiceException.java | 2 +- .../shared/TDOpenSession.java | 2 +- .../shared/TRId.java | 2 +- .../shared/TabResource.java | 4 +- .../shared/csv/AvailableCharsetList.java | 2 +- .../shared/csv/CSVFileUtil.java | 4 +- .../shared/csv/CSVImportMonitor.java | 2 +- .../shared/csv/CSVImportSession.java | 6 +-- .../shared/csv/CSVImportState.java | 2 +- .../shared/csv/CSVParserConfiguration.java | 4 +- .../shared/csv/CSVRowError.java | 2 +- .../shared/document/CodelistDocument.java | 2 +- .../shared/document/DatasetDocument.java | 2 +- .../shared/document/SDMXDocument.java | 2 +- .../shared/file/FileUploadMonitor.java | 2 +- .../shared/file/FileUploadState.java | 2 +- .../shared/file/HeaderPresence.java | 2 +- .../shared/sdmx/SDMXImportMonitor.java | 4 +- .../shared/sdmx/SDMXImportSession.java | 10 ++-- .../shared/sdmx/State.java | 2 +- .../shared/source/FileSource.java | 2 +- .../shared/source/SDMXRegistrySource.java | 4 +- .../shared/source/Source.java | 2 +- .../shared/source/WorkspaceSource.java | 2 +- .../td/gxtservice/client/GXTServiceEntry.java | 13 ----- src/main/webapp/WEB-INF/web.xml | 6 +-- .../gxtservice/client/GwtTestGXTService.java | 10 ++-- 47 files changed, 162 insertions(+), 162 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/gwtservice/client/TDGWTServiceEntry.java rename src/main/java/org/gcube/portlets/user/td/{gxtservice/client/rpc/TDGXTService.java => gwtservice/client/rpc/TDGWTService.java} (65%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice/client/rpc/TDGXTServiceAsync.java => gwtservice/client/rpc/TDGWTServiceAsync.java} (65%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/CSVImportFileServlet.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/LocalUploadServlet.java (91%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/SDMXClient.java (92%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/SessionUtil.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice/server/TDGXTServiceImpl.java => gwtservice/server/TDGWTServiceImpl.java} (94%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/file/FileUploadListener.java (83%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/file/FileUploadSession.java (87%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/file/FileUtil.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/storage/FilesStorage.java (91%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/trservice/OperationsId.java (96%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/server/trservice/TRTasksManager.java (89%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/Agencies.java (96%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/Codelist.java (96%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/Constants.java (80%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/ConstantsWorkspace.java (91%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/Dataset.java (96%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/FieldVerifier.java (96%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/TDGXTServiceException.java (87%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/TDOpenSession.java (94%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/TRId.java (95%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/TabResource.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/AvailableCharsetList.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/CSVFileUtil.java (98%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/CSVImportMonitor.java (97%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/CSVImportSession.java (94%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/CSVImportState.java (86%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/CSVParserConfiguration.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/csv/CSVRowError.java (96%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/document/CodelistDocument.java (94%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/document/DatasetDocument.java (94%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/document/SDMXDocument.java (90%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/file/FileUploadMonitor.java (97%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/file/FileUploadState.java (82%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/file/HeaderPresence.java (92%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/sdmx/SDMXImportMonitor.java (92%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/sdmx/SDMXImportSession.java (81%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/sdmx/State.java (71%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/source/FileSource.java (93%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/source/SDMXRegistrySource.java (90%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/source/Source.java (87%) rename src/main/java/org/gcube/portlets/user/td/{gxtservice => gwtservice}/shared/source/WorkspaceSource.java (93%) delete mode 100644 src/main/java/org/gcube/portlets/user/td/gxtservice/client/GXTServiceEntry.java diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/TDGWTServiceEntry.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/TDGWTServiceEntry.java new file mode 100644 index 0000000..a88631f --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/TDGWTServiceEntry.java @@ -0,0 +1,13 @@ +package org.gcube.portlets.user.td.gwtservice.client; + +import com.google.gwt.core.client.EntryPoint; + +public class TDGWTServiceEntry implements EntryPoint { + + @Override + public void onModuleLoad() { + + + + } +} diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/client/rpc/TDGXTService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java similarity index 65% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/client/rpc/TDGXTService.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java index 27079f1..c278b60 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/client/rpc/TDGXTService.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.client.rpc; +package org.gcube.portlets.user.td.gwtservice.client.rpc; @@ -10,20 +10,20 @@ import java.util.List; -import org.gcube.portlets.user.td.gxtservice.shared.Agencies; -import org.gcube.portlets.user.td.gxtservice.shared.Codelist; -import org.gcube.portlets.user.td.gxtservice.shared.Dataset; -import org.gcube.portlets.user.td.gxtservice.shared.csv.AvailableCharsetList; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportSession; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVRowError; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.file.HeaderPresence; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportSession; -import org.gcube.portlets.user.td.gxtservice.shared.TDGXTServiceException; -import org.gcube.portlets.user.td.gxtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.Dataset; +import org.gcube.portlets.user.td.gwtservice.shared.TDGXTServiceException; +import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; +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.file.FileUploadMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; @@ -34,8 +34,8 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -@RemoteServiceRelativePath("TDGXTService") -public interface TDGXTService extends RemoteService { +@RemoteServiceRelativePath("TDGWTService") +public interface TDGWTService extends RemoteService { public TabResource getTabResource() throws TDGXTServiceException; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/client/rpc/TDGXTServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java similarity index 65% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/client/rpc/TDGXTServiceAsync.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java index 1ef8a7f..946fd07 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/client/rpc/TDGXTServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java @@ -1,24 +1,24 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.client.rpc; +package org.gcube.portlets.user.td.gwtservice.client.rpc; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.td.gxtservice.shared.Agencies; -import org.gcube.portlets.user.td.gxtservice.shared.Codelist; -import org.gcube.portlets.user.td.gxtservice.shared.Dataset; -import org.gcube.portlets.user.td.gxtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; -import org.gcube.portlets.user.td.gxtservice.shared.csv.AvailableCharsetList; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportSession; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVRowError; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.file.HeaderPresence; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportSession; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.Dataset; +import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; +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.file.FileUploadMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -30,10 +30,10 @@ import com.google.gwt.user.client.rpc.AsyncCallback; * */ -public interface TDGXTServiceAsync { +public interface TDGWTServiceAsync { - public TDGXTServiceAsync INSTANCE = GWT - .create(TDGXTService.class); + public TDGWTServiceAsync INSTANCE = GWT + .create(TDGWTService.class); void createTabularResource(TabResource tabResource,AsyncCallback callback); diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/CSVImportFileServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/CSVImportFileServlet.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java index 1fd73f0..b4384ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/CSVImportFileServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server; +package org.gcube.portlets.user.td.gwtservice.server; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; @@ -15,8 +15,8 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.gcube.portlets.user.td.gxtservice.server.file.FileUploadSession; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVFileUtil; +import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVFileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/LocalUploadServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/LocalUploadServlet.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java index fe8d83b..546f158 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/LocalUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server; +package org.gcube.portlets.user.td.gwtservice.server; import java.io.IOException; import java.util.Iterator; @@ -18,13 +18,13 @@ import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.gcube.portlets.user.td.gxtservice.server.file.FileUploadListener; -import org.gcube.portlets.user.td.gxtservice.server.file.FileUploadSession; -import org.gcube.portlets.user.td.gxtservice.server.file.FileUtil; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVParserConfiguration; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadState; +import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadListener; +import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; +import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVParserConfiguration; +import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/SDMXClient.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java similarity index 92% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/SDMXClient.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java index ec6b3ec..3b5e577 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/SDMXClient.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server; +package org.gcube.portlets.user.td.gwtservice.server; import java.util.ArrayList; import java.util.List; @@ -14,9 +14,9 @@ import org.gcube.datapublishing.sdmx.api.registry.SDMXRegistryClient.References; import org.gcube.datapublishing.sdmx.impl.model.GCubeSDMXRegistryDescriptor; import org.gcube.datapublishing.sdmx.impl.model.SDMXRegistryDescriptorImpl; import org.gcube.datapublishing.sdmx.impl.registry.FusionRegistryClient; -import org.gcube.portlets.user.td.gxtservice.shared.Agencies; -import org.gcube.portlets.user.td.gxtservice.shared.Codelist; -import org.gcube.portlets.user.td.gxtservice.shared.Dataset; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.Dataset; import org.sdmxsource.sdmx.api.model.beans.SdmxBeans; import org.sdmxsource.sdmx.api.model.beans.base.AgencyBean; import org.sdmxsource.sdmx.api.model.beans.codelist.CodelistBean; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/SessionUtil.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index 8510440..68bf1cc 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server; +package org.gcube.portlets.user.td.gwtservice.server; import java.util.ArrayList; import java.util.List; @@ -14,18 +14,18 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.data.analysis.tabulardata.service.operation.Task; import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; -import org.gcube.portlets.user.td.gxtservice.server.file.FileUploadSession; -import org.gcube.portlets.user.td.gxtservice.server.trservice.TRTasksManager; -import org.gcube.portlets.user.td.gxtservice.shared.Agencies; -import org.gcube.portlets.user.td.gxtservice.shared.Codelist; -import org.gcube.portlets.user.td.gxtservice.shared.Constants; -import org.gcube.portlets.user.td.gxtservice.shared.Dataset; -import org.gcube.portlets.user.td.gxtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gxtservice.shared.TRId; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportSession; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportSession; -import org.gcube.portlets.user.td.gxtservice.shared.source.SDMXRegistrySource; +import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; +import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; +import org.gcube.portlets.user.td.gwtservice.shared.Dataset; +import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; +import org.gcube.portlets.user.td.gwtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; +import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/TDGXTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/TDGXTServiceImpl.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 1bec0c7..2aef7d2 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/TDGXTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server; +package org.gcube.portlets.user.td.gwtservice.server; import java.nio.charset.Charset; import java.text.SimpleDateFormat; @@ -33,27 +33,27 @@ import org.gcube.data.analysis.tabulardata.service.tabular.metadata.CreationDate import org.gcube.data.analysis.tabulardata.service.tabular.metadata.DescriptionMetadata; import org.gcube.data.analysis.tabulardata.service.tabular.metadata.NameMetadata; import org.gcube.data.analysis.tabulardata.service.tabular.metadata.RightsMetadata; -import org.gcube.portlets.user.td.gxtservice.client.rpc.TDGXTService; -import org.gcube.portlets.user.td.gxtservice.server.file.FileUploadSession; -import org.gcube.portlets.user.td.gxtservice.server.storage.FilesStorage; -import org.gcube.portlets.user.td.gxtservice.server.trservice.OperationsId; -import org.gcube.portlets.user.td.gxtservice.shared.Agencies; -import org.gcube.portlets.user.td.gxtservice.shared.Codelist; -import org.gcube.portlets.user.td.gxtservice.shared.Dataset; -import org.gcube.portlets.user.td.gxtservice.shared.TDGXTServiceException; -import org.gcube.portlets.user.td.gxtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gxtservice.shared.TRId; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; -import org.gcube.portlets.user.td.gxtservice.shared.csv.AvailableCharsetList; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVFileUtil; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportSession; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVParserConfiguration; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVRowError; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.file.HeaderPresence; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.sdmx.SDMXImportSession; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTService; +import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; +import org.gcube.portlets.user.td.gwtservice.server.storage.FilesStorage; +import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationsId; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.Dataset; +import org.gcube.portlets.user.td.gwtservice.shared.TDGXTServiceException; +import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; +import org.gcube.portlets.user.td.gwtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVFileUtil; +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.CSVParserConfiguration; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVRowError; +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.sdmx.SDMXImportMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,12 +65,12 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -public class TDGXTServiceImpl extends RemoteServiceServlet implements - TDGXTService { +public class TDGWTServiceImpl extends RemoteServiceServlet implements + TDGWTService { private static final long serialVersionUID = -5707400086333186368L; protected static Logger logger = LoggerFactory - .getLogger(TDGXTServiceImpl.class); + .getLogger(TDGWTServiceImpl.class); protected static SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); protected TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUploadListener.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUploadListener.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java index 23c4c01..af144f8 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUploadListener.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java @@ -1,10 +1,10 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server.file; +package org.gcube.portlets.user.td.gwtservice.server.file; import org.apache.commons.fileupload.ProgressListener; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUploadSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadSession.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUploadSession.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadSession.java index ebf9a0c..34814ca 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUploadSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadSession.java @@ -1,13 +1,13 @@ -package org.gcube.portlets.user.td.gxtservice.server.file; +package org.gcube.portlets.user.td.gwtservice.server.file; import java.io.File; import java.io.Serializable; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVParserConfiguration; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadMonitor; -import org.gcube.portlets.user.td.gxtservice.shared.file.FileUploadState; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVParserConfiguration; +import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; +import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUtil.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java index eaa0f50..79d4a66 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/file/FileUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.server.file; +package org.gcube.portlets.user.td.gwtservice.server.file; import java.io.File; import java.io.FileOutputStream; @@ -15,8 +15,8 @@ import java.util.zip.ZipInputStream; import org.apache.commons.io.IOUtils; -import org.gcube.portlets.user.td.gxtservice.server.SessionUtil; -import org.gcube.portlets.user.td.gxtservice.shared.csv.CSVImportSession; +import org.gcube.portlets.user.td.gwtservice.server.SessionUtil; +import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/storage/FilesStorage.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java index 1ab7886..9ec2139 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/storage/FilesStorage.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.server.storage; +package org.gcube.portlets.user.td.gwtservice.server.storage; import java.io.File; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/trservice/OperationsId.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationsId.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/trservice/OperationsId.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationsId.java index 7584ccc..49d1dcd 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/trservice/OperationsId.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationsId.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.server.trservice; +package org.gcube.portlets.user.td.gwtservice.server.trservice; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/trservice/TRTasksManager.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java similarity index 89% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/server/trservice/TRTasksManager.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java index 6237edb..d84efbe 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/server/trservice/TRTasksManager.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.server.trservice; +package org.gcube.portlets.user.td.gwtservice.server.trservice; import java.io.Serializable; import java.util.HashMap; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Agencies.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Agencies.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Agencies.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Agencies.java index 28ff91e..745b5da 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Agencies.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Agencies.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Codelist.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Codelist.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Codelist.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Codelist.java index c2d4324..1866409 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Codelist.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Codelist.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Constants.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java index cda2cfc..32c34a2 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/ConstantsWorkspace.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/ConstantsWorkspace.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/ConstantsWorkspace.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/ConstantsWorkspace.java index d58dade..bddd2d9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/ConstantsWorkspace.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/ConstantsWorkspace.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Dataset.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Dataset.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Dataset.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Dataset.java index c6462e1..fe6c5e9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/Dataset.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Dataset.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/FieldVerifier.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/FieldVerifier.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/FieldVerifier.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/FieldVerifier.java index 1263ecd..a8b2d4b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/FieldVerifier.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/FieldVerifier.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; /** *

diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TDGXTServiceException.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDGXTServiceException.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TDGXTServiceException.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDGXTServiceException.java index 2c1ff69..8825a60 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TDGXTServiceException.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDGXTServiceException.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; /** * @author "Federico De Faveri defaveri@isti.cnr.it" diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TDOpenSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDOpenSession.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TDOpenSession.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDOpenSession.java index 970177e..2ae721e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TDOpenSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDOpenSession.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TRId.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TRId.java similarity index 95% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TRId.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TRId.java index df47da8..8a25e3e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TRId.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TRId.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TabResource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TabResource.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TabResource.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TabResource.java index 5fccc2b..9d121ea 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/TabResource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TabResource.java @@ -1,8 +1,8 @@ -package org.gcube.portlets.user.td.gxtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared; import java.io.Serializable; -import org.gcube.portlets.user.td.gxtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/AvailableCharsetList.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/AvailableCharsetList.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java index 398ffca..34fcbd4 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/AvailableCharsetList.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVFileUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVFileUtil.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java index 2dbd94a..c2283cb 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVFileUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.BufferedWriter; import java.io.File; @@ -22,7 +22,7 @@ import java.util.List; -import org.gcube.portlets.user.td.gxtservice.shared.file.HeaderPresence; +import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; import org.mozilla.universalchardet.UniversalDetector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java index d8084da..640e10c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportSession.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java index bb506c1..225453e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java @@ -1,14 +1,14 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; -import org.gcube.portlets.user.td.gxtservice.shared.source.Source; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.source.Source; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportState.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportState.java similarity index 86% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportState.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportState.java index a5015d0..18e8ac4 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVImportState.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportState.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVParserConfiguration.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVParserConfiguration.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java index fcad4a0..d97f98b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVParserConfiguration.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java @@ -1,11 +1,11 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.nio.charset.Charset; -import org.gcube.portlets.user.td.gxtservice.shared.file.HeaderPresence; +import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVRowError.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVRowError.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java index 5278e16..70bc698 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/csv/CSVRowError.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.csv; +package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/CodelistDocument.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/CodelistDocument.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/CodelistDocument.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/CodelistDocument.java index 5c45b40..5ba4a7b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/CodelistDocument.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/CodelistDocument.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared.document; +package org.gcube.portlets.user.td.gwtservice.shared.document; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/DatasetDocument.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/DatasetDocument.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/DatasetDocument.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/DatasetDocument.java index e152326..18c0593 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/DatasetDocument.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/DatasetDocument.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared.document; +package org.gcube.portlets.user.td.gwtservice.shared.document; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/SDMXDocument.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/SDMXDocument.java similarity index 90% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/SDMXDocument.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/SDMXDocument.java index 8ace083..9bc863e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/document/SDMXDocument.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/document/SDMXDocument.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.document; +package org.gcube.portlets.user.td.gwtservice.shared.document; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/FileUploadMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/FileUploadMonitor.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/FileUploadMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/FileUploadMonitor.java index a9eabec..68f3215 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/FileUploadMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/FileUploadMonitor.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.file; +package org.gcube.portlets.user.td.gwtservice.shared.file; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/FileUploadState.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/FileUploadState.java similarity index 82% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/FileUploadState.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/FileUploadState.java index 0979df8..024973b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/FileUploadState.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/FileUploadState.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.file; +package org.gcube.portlets.user.td.gwtservice.shared.file; /** * @author Federico De Faveri defaveri@isti.cnr.it diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/HeaderPresence.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/HeaderPresence.java similarity index 92% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/HeaderPresence.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/HeaderPresence.java index 60bc393..bd72dbc 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/file/HeaderPresence.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/file/HeaderPresence.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.file; +package org.gcube.portlets.user.td.gwtservice.shared.file; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/SDMXImportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java similarity index 92% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/SDMXImportMonitor.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java index b59270c..1a63489 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/SDMXImportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java @@ -1,8 +1,8 @@ -package org.gcube.portlets.user.td.gxtservice.shared.sdmx; +package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; -import org.gcube.portlets.user.td.gxtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/SDMXImportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java similarity index 81% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/SDMXImportSession.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java index ab752ae..f388d33 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/SDMXImportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java @@ -1,14 +1,14 @@ /** * */ -package org.gcube.portlets.user.td.gxtservice.shared.sdmx; +package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; -import org.gcube.portlets.user.td.gxtservice.shared.Codelist; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; -import org.gcube.portlets.user.td.gxtservice.shared.document.SDMXDocument; -import org.gcube.portlets.user.td.gxtservice.shared.source.Source; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.document.SDMXDocument; +import org.gcube.portlets.user.td.gwtservice.shared.source.Source; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/State.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/State.java similarity index 71% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/State.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/State.java index e38cd7c..e503885 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/sdmx/State.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/State.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared.sdmx; +package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/FileSource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/FileSource.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/FileSource.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/FileSource.java index 26f4c82..89822e6 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/FileSource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/FileSource.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared.source; +package org.gcube.portlets.user.td.gwtservice.shared.source; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/SDMXRegistrySource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/SDMXRegistrySource.java similarity index 90% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/SDMXRegistrySource.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/SDMXRegistrySource.java index e33d44e..5b5e959 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/SDMXRegistrySource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/SDMXRegistrySource.java @@ -1,6 +1,6 @@ -package org.gcube.portlets.user.td.gxtservice.shared.source; +package org.gcube.portlets.user.td.gwtservice.shared.source; -import org.gcube.portlets.user.td.gxtservice.shared.source.Source; +import org.gcube.portlets.user.td.gwtservice.shared.source.Source; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/Source.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/Source.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/Source.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/Source.java index b9042a6..964a109 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/Source.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/Source.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared.source; +package org.gcube.portlets.user.td.gwtservice.shared.source; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/WorkspaceSource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/WorkspaceSource.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/WorkspaceSource.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/WorkspaceSource.java index 2e6a78b..e3f7e3f 100644 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/shared/source/WorkspaceSource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/source/WorkspaceSource.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gxtservice.shared.source; +package org.gcube.portlets.user.td.gwtservice.shared.source; diff --git a/src/main/java/org/gcube/portlets/user/td/gxtservice/client/GXTServiceEntry.java b/src/main/java/org/gcube/portlets/user/td/gxtservice/client/GXTServiceEntry.java deleted file mode 100644 index bcd8991..0000000 --- a/src/main/java/org/gcube/portlets/user/td/gxtservice/client/GXTServiceEntry.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.gcube.portlets.user.td.gxtservice.client; - -import com.google.gwt.core.client.EntryPoint; - -public class GXTServiceEntry implements EntryPoint { - - @Override - public void onModuleLoad() { - - - - } -} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index ff23467..e52aae0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -7,7 +7,7 @@ - TDGXTService + TDGWTService org.gcube.portlets.user.td.gxtservice.server.TDGXTServiceImpl @@ -30,8 +30,8 @@ - TDGXTService - /tdgxtservice/TDGXTService + TDGWTService + /tdgxtservice/TDGWTService diff --git a/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGXTService.java b/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGXTService.java index acc19c6..4ab9d46 100644 --- a/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGXTService.java +++ b/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGXTService.java @@ -1,8 +1,8 @@ package org.gcube.portlets.user.td.gxtservice.client; -import org.gcube.portlets.user.td.gxtservice.client.rpc.TDGXTService; -import org.gcube.portlets.user.td.gxtservice.client.rpc.TDGXTServiceAsync; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTService; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; import com.google.gwt.core.client.GWT; import com.google.gwt.junit.client.GWTTestCase; @@ -33,7 +33,7 @@ public class GwtTestGXTService extends GWTTestCase { */ public void testCreateTabResource() { // Create the service that we will test. - TDGXTServiceAsync tdGXTService = GWT.create(TDGXTService.class); + TDGWTServiceAsync tdGXTService = GWT.create(TDGWTService.class); ServiceDefTarget target = (ServiceDefTarget) tdGXTService; System.out.println(GWT.getModuleBaseURL() + "TDGXTService"); target.setServiceEntryPoint(GWT.getModuleBaseURL() + "TDGXTService"); @@ -50,7 +50,7 @@ public class GwtTestGXTService extends GWTTestCase { tabResource.setRight(""); // Send a request to the server. - TDGXTServiceAsync.INSTANCE.createTabularResource(tabResource,new AsyncCallback() { + TDGWTServiceAsync.INSTANCE.createTabularResource(tabResource,new AsyncCallback() { @Override public void onFailure(Throwable caught) {