gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96225 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-28 17:16:35 +00:00
parent 2373bfb31b
commit 60b4f62ab6
6 changed files with 74 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
View File

@ -12,6 +12,8 @@ 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;
@ -228,9 +230,9 @@ public interface TDGWTService extends RemoteService {
*/
public TaskResubmitMonitor getTaskResubmitMonitor()
throws TDGWTServiceException;
/**
* Resubmit task
* Resubmit task
*
* @param taskResubmitSession
* @throws TDGWTServiceException
@ -238,7 +240,6 @@ public interface TDGWTService extends RemoteService {
public void startTaskResubmit(TaskResubmitSession taskResubmitSession)
throws TDGWTServiceException;
/**
* Get Operation Monitor during the resume task
*
@ -247,9 +248,9 @@ public interface TDGWTService extends RemoteService {
*/
public TaskResumeMonitor getTaskResumeMonitor()
throws TDGWTServiceException;
/**
* Resume task
* Resume task
*
* @param taskResumeSession
* @throws TDGWTServiceException
@ -257,8 +258,6 @@ public interface TDGWTService extends RemoteService {
public void startTaskResume(TaskResumeSession taskResumeSession)
throws TDGWTServiceException;
// Validations
/**
* Returns validations contained in the tasks
@ -884,4 +883,22 @@ public interface TDGWTService extends RemoteService {
*/
OpHistory getLastOperationInfo(TRId trId) throws TDGWTServiceException;
// Extract Codelist
/**
* Get Operation Monitor during the Extract Codelist operation
*
* @return
* @throws TDGWTServiceException
*/
public ExtractCodelistMonitor getExtractCodelistMonitor() throws TDGWTServiceException;
/**
* Start Extract Codelist and invokes the client library
*
* @param extractCodelistSession
* @throws TDGWTServiceException
*/
public void startExtractCodelist(ExtractCodelistSession extractCodelistSession)
throws TDGWTServiceException;
}

8
src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
View File

@ -11,6 +11,8 @@ 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;
@ -207,7 +209,7 @@ public interface TDGWTServiceAsync {
void startDeleteColumn(DeleteColumnSession deleteColumnSession,AsyncCallback<Void> callback);
void getLabelColumnMonitor(AsyncCallback<LabelColumnMonitor> callback);
void startLabelColumn(LabelColumnSession labelColumnSession,AsyncCallback<Void> callback);
//BatchReplace Operation
void getOccurrencesForBatchReplace(OccurrencesForReplaceBatchColumnSession occurrencesForReplaceBatchColumnSession, AsyncCallback<ArrayList<Occurrences>> callback);
void getReplaceBatchColumnMonitor(AsyncCallback<ReplaceBatchColumnMonitor> callback);
@ -232,4 +234,8 @@ public interface TDGWTServiceAsync {
void getLastOperationInfo(AsyncCallback<OpHistory> callback);
void getLastOperationInfo(TRId trId, AsyncCallback<OpHistory> callback);
//Extract Codelist
void getExtractCodelistMonitor(AsyncCallback<ExtractCodelistMonitor> callback);
void startExtractCodelist(ExtractCodelistSession extractCodelistSession, AsyncCallback<Void> callback);
}

9
src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
View File

@ -66,9 +66,6 @@ import org.slf4j.LoggerFactory;
*
*/
public class SessionUtil {
protected static Logger logger = LoggerFactory.getLogger(SessionUtil.class);
@ -78,15 +75,15 @@ public class SessionUtil {
ASLSession session;
if (username == null) {
logger.warn("no user found in session, using test one");
throw new TDGWTSessionExpiredException("Session Expired!");
/*
/*throw new TDGWTSessionExpiredException("Session Expired!");*/
username = Constants.DEFAULT_USER;
String scope = Constants.DEFAULT_SCOPE;
httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username);
session = SessionManager.getInstance().getASLSession(
httpSession.getId(), username);
session.setScope(scope);*/
session.setScope(scope);
} else {
session = SessionManager.getInstance().getASLSession(

17
src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
View File

@ -119,6 +119,8 @@ 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;
@ -7095,4 +7097,19 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
}
}
@Override
public ExtractCodelistMonitor getExtractCodelistMonitor()
throws TDGWTServiceException {
// TODO Auto-generated method stub
return null;
}
@Override
public void startExtractCodelist(
ExtractCodelistSession extractCodelistSession)
throws TDGWTServiceException {
// TODO Auto-generated method stub
}
}

27
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistSession.java
View File

@ -7,6 +7,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
/**
*
@ -17,15 +18,17 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
public class ExtractCodelistSession implements Serializable {
private static final long serialVersionUID = -2537172740573310646L;
protected TabResource tabResource;
protected ArrayList<ColumnData> sourceColumns;
protected ArrayList<ExtractCodelistTargetColumn> targetColumns;
public ExtractCodelistSession() {
}
public ExtractCodelistSession(ArrayList<ColumnData> sourceColumns,
public ExtractCodelistSession(TabResource tabResource,ArrayList<ColumnData> sourceColumns,
ArrayList<ExtractCodelistTargetColumn> targetColumns) {
this.tabResource= tabResource;
this.sourceColumns = sourceColumns;
this.targetColumns = targetColumns;
}
@ -47,10 +50,22 @@ public class ExtractCodelistSession implements Serializable {
this.targetColumns = targetColumns;
}
@Override
public String toString() {
return "ExtractCodelistSession [sourceColumns=" + sourceColumns
+ ", targetColumns=" + targetColumns + "]";
public TabResource getTabResource() {
return tabResource;
}
public void setTabResource(TabResource tabResource) {
this.tabResource = tabResource;
}
@Override
public String toString() {
return "ExtractCodelistSession [tabResource=" + tabResource
+ ", sourceColumns=" + sourceColumns + ", targetColumns="
+ targetColumns + "]";
}
}

4
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java
View File

@ -33,10 +33,10 @@ public class ExtractCodelistTargetColumn implements Serializable {
this.codelist = codelist;
}
public ExtractCodelistTargetColumn(ColumnData sourceColumn, DefNewColumn defColumn) {
public ExtractCodelistTargetColumn(ColumnData sourceColumn, DefNewColumn defNewColumn) {
this.newColumn = true;
this.sourceColumn = sourceColumn;
this.defColumn=defColumn;
this.defColumn=defNewColumn;
}
public boolean isNewColumn() {