Added service library

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@84453 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-10-28 09:43:29 +00:00
parent b26c7fabf3
commit 19d3e8ff72
2 changed files with 16 additions and 23 deletions

22
pom.xml
View File

@ -18,7 +18,7 @@
<name>tabular-data-gwt-service</name>
<description>tabular-data-gwt-service allows communication between the GUI and services</description>
<scm>
<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service</url>
</scm>
@ -155,21 +155,15 @@
<!-- Service Client -->
<dependency>
<groupId>org.gcube.data.analysis.tabulardata</groupId>
<artifactId>service-client-mock</artifactId>
<artifactId>service-client-impl</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- Home Library
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
</dependency>
-->
<!-- Home Library <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library-jcr</artifactId>
</dependency> <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library</artifactId>
</dependency> -->
<!-- Storage for CSV temp -->
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
@ -181,7 +175,7 @@
<artifactId>storage-manager-wrapper</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
<!-- LOGGING -->
<dependency>
<groupId>com.allen-sauer.gwt.log</groupId>

View File

@ -23,7 +23,7 @@ import org.gcube.data.analysis.tabulardata.operation.worker.EligibleOperation;
import org.gcube.data.analysis.tabulardata.operation.worker.JobResult;
import org.gcube.data.analysis.tabulardata.operation.worker.OperationInvocation;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.data.analysis.tabulardata.service.TabularDataServiceMock;
import org.gcube.data.analysis.tabulardata.service.impl.TabularDataServiceFactory;
import org.gcube.data.analysis.tabulardata.service.operation.OperationInterface;
import org.gcube.data.analysis.tabulardata.service.operation.Task;
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource;
@ -268,8 +268,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
aslSession = SessionUtil.getAslSession(session);
service = new TabularDataServiceMock();
service = TabularDataServiceFactory.getService(aslSession.getUsername());
List<TabularResource> trs = service.getTabularResources();
SessionUtil.setTabularResources(session, trs);
@ -311,7 +311,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throw new TDGWTServiceException(
"Error removing TabularResource no parameters set");
}
TabularDataService service = new TabularDataServiceMock();
service = TabularDataServiceFactory.getService(aslSession.getUsername());
TabularResourceId id = new TabularResourceId(
Long.valueOf(tabResource.getTrId().getId()));
service.removeTabularResource(id);
@ -342,7 +342,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throw new TDGWTServiceException(
"Error creating new TabularResource no parameters set");
}
service = new TabularDataServiceMock();
service = TabularDataServiceFactory.getService(aslSession.getUsername());
TabularResource serviceTR = service.createTabularResource();
Table table = service.getLastTable(serviceTR.getId());
@ -437,8 +437,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
session = this.getThreadLocalRequest().getSession();
SessionUtil.setSDMXImportSession(session, sdmxImportSession);
aslSession = SessionUtil.getAslSession(session);
service = new TabularDataServiceMock();
service = TabularDataServiceFactory.getService(aslSession.getUsername());
OperationInterface oService = service;
TabularResourceInterface trService = service;
@ -794,8 +794,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
Map<String, Object> parameterInstance = csvImportFileParameter(
fileUrlOnStorage, fileUploadSession, csvImportSession);
service = new TabularDataServiceMock();
service = TabularDataServiceFactory.getService(aslSession.getUsername());
List<EligibleOperation> capabilities = service.getCapabilities();
// Import CSV file