diff --git a/pom.xml b/pom.xml
index bca6cc7..fe736e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,11 @@
runtime
+
+ xerces
+ xerces
+ 2.4.0
+
@@ -135,9 +140,6 @@
${gwtVersion}
-
-
@@ -145,21 +147,20 @@
gxt
${gxtVersion}
-
-
-
+
+
+
javax.portlet
portlet-api
+
+
+
- org.gcube.applicationsupportlayer
- accesslogger
+ org.gcube.core
+ common-scope-maps
+ compile
@@ -167,12 +168,6 @@
custom-portal-handler
-
- org.gcube.core
- common-scope-maps
- compile
-
-
org.gcube.applicationsupportlayer
aslcore
@@ -185,6 +180,11 @@
+
+ org.gcube.dvos
+ usermanagement-core
+ provided
+
@@ -200,7 +200,7 @@
provided
-
+
org.gcube.portlets.user
gcube-widgets
@@ -215,19 +215,6 @@
-
- org.gcube.applicationsupportlayer
- aslsocial
-
-
-
-
-
-
-
-
-
org.gcube.contentmanagement
@@ -259,7 +246,7 @@
home-library-model
provided
-
+
@@ -365,7 +352,7 @@
org.gcube.distribution
maven-portal-bom
- 2.6.0-SNAPSHOT
+ LATEST
pom
import
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
index f32ec7e..aa242a5 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
@@ -36,8 +36,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
/**
*
- * @author Giancarlo Panichi
- * email: g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
*
*/
@SuppressWarnings("serial")
@@ -68,12 +68,14 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
+ String token = SessionUtil.getToken(aslSession);
UserInfo userInfo = new UserInfo(aslSession.getUsername(),
aslSession.getGroupId(), aslSession.getGroupName(),
aslSession.getScope(), aslSession.getScopeName(),
aslSession.getUserEmailAddress(),
aslSession.getUserFullName());
logger.debug("UserInfo: " + userInfo);
+ logger.debug("UserToken: " + token);
return userInfo;
} catch (ServiceException e) {
e.printStackTrace();
@@ -94,8 +96,8 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
SClient smClient = SessionUtil.getSClient(aslSession);
- List list= smClient.getOperatorsClassifications();
- //SessionUtil.putSClient(session, smClient);
+ List list = smClient
+ .getOperatorsClassifications();
return list;
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
@@ -105,7 +107,6 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
"An error occurred getting the OperatorsClassifications list: "
+ e.getLocalizedMessage(), e);
e.printStackTrace();
- // return null;
throw new ServiceException(e.getLocalizedMessage(), e);
}
}
@@ -118,8 +119,7 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
ASLSession aslSession = SessionUtil.getASLSession(session);
SClient smClient = SessionUtil.getSClient(aslSession);
- List list=smClient.getInputParameters(operator);
- //SessionUtil.putSClient(session, smClient);
+ List list = smClient.getInputParameters(operator);
return list;
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
@@ -140,8 +140,7 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
ASLSession aslSession = SessionUtil.getASLSession(session);
logger.debug("StartComputation(): [ operator=" + operator + "]");
SClient smClient = SessionUtil.getSClient(aslSession);
- ComputationId computationId= smClient.startComputation(operator);
- //SessionUtil.putSClient(session, smClient);
+ ComputationId computationId = smClient.startComputation(operator);
return computationId;
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
@@ -160,13 +159,12 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
- logger.debug("Resubmit(): " + itemDescription);
Map properties = StorageUtil.getProperties(
aslSession.getUsername(), itemDescription.getId());
logger.debug("Properties: " + properties);
SClient smClient = SessionUtil.getSClient(aslSession);
- ComputationId computationId= smClient.resubmitComputation(properties);
- //SessionUtil.putSClient(session, smClient);
+ ComputationId computationId = smClient
+ .resubmitComputation(properties);
return computationId;
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
@@ -185,10 +183,9 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
-
SClient smClient = SessionUtil.getSClient(aslSession);
- ComputationStatus computationStatus= smClient.getComputationStatus(computationId);
- //SessionUtil.putSClient(session, smClient);
+ ComputationStatus computationStatus = smClient
+ .getComputationStatus(computationId);
return computationStatus;
} catch (ServiceException e) {
@@ -202,19 +199,19 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
}
}
-
-
@Override
public void deleteItem(ItemDescription itemDescription)
throws ServiceException {
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("DeleteItem(): " + itemDescription);
StorageUtil.deleteItem(aslSession.getUsername(),
itemDescription.getId());
return;
-
+
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
throw e;
@@ -231,6 +228,8 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("retrieveTableInformation(): " + item);
TableReader tableReader = new TableReader(aslSession, item);
TableItemSimple tableItemSimple = tableReader.getTableItemSimple();
@@ -250,6 +249,8 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getDataMinerWorkArea()");
DataMinerWorkAreaManager dataMinerWorkAreaManager = new DataMinerWorkAreaManager(
aslSession);
@@ -271,6 +272,8 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetPublicLink(): " + itemDescription);
String link = StorageUtil.getPublicLink(aslSession.getUsername(),
itemDescription.getId());
@@ -295,7 +298,7 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
logger.debug("CancelComputation(): " + computationId);
SClient smClient = SessionUtil.getSClient(aslSession);
String result = smClient.cancelComputation(computationId);
- //SessionUtil.putSClient(session, smClient);
+ // SessionUtil.putSClient(session, smClient);
return result;
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
@@ -314,11 +317,9 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
Log.debug("getOutputDataByComputationId: " + computationId);
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
-
SClient smClient = SessionUtil.getSClient(aslSession);
OutputData outputData = smClient
.getOutputDataByComputationId(computationId);
- //SessionUtil.putSClient(session, smClient);
Log.debug("OutputData: " + outputData);
return outputData;
} catch (ServiceException e) {
@@ -332,8 +333,7 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
}
}
-
-
+
@Override
public ComputationData getComputationData(ItemDescription itemDescription)
throws ServiceException {
@@ -345,11 +345,10 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
aslSession.getUsername(), itemDescription.getId());
logger.debug("Properties: " + properties);
SClient smClient = SessionUtil.getSClient(aslSession);
- ComputationData computationData= smClient.getComputationDataByComputationProperties(properties);
- //SessionUtil.putSClient(session, smClient);
+ ComputationData computationData = smClient
+ .getComputationDataByComputationProperties(properties);
return computationData;
-
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
throw e;
@@ -366,20 +365,21 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
throws ServiceException {
try {
HttpSession session = this.getThreadLocalRequest().getSession();
- ASLSession aslSession = SessionUtil.getASLSession(session);
+ ASLSession aslSession = SessionUtil.getASLSession(session);
logger.debug("CancelComputation(): " + itemDescription);
String compId = itemDescription.getName();
- if(compId==null){
+ if (compId == null) {
throw new ServiceException("Computation Id not found!");
} else {
- int lastIndexUnd=compId.lastIndexOf("_");
- if(lastIndexUnd==-1){
- throw new ServiceException("Invalid Computation Id: "+compId);
+ int lastIndexUnd = compId.lastIndexOf("_");
+ if (lastIndexUnd == -1) {
+ throw new ServiceException("Invalid Computation Id: "
+ + compId);
} else {
- compId=compId.substring(lastIndexUnd+1);
+ compId = compId.substring(lastIndexUnd + 1);
}
}
- ComputationId computationId=new ComputationId();
+ ComputationId computationId = new ComputationId();
computationId.setId(compId);
SClient smClient = SessionUtil.getSClient(aslSession);
String result = smClient.cancelComputation(computationId);
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/Constants.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/Constants.java
index 2f24fc6..4bdcf3b 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/Constants.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/Constants.java
@@ -16,10 +16,8 @@ public class Constants {
public static final String DATA_MINER_LANG = "DataMinerLang";
public static final String DEFAULT_USER = "giancarlo.panichi";
- //public static final String DEFAULT_USER = "statistical.manager@gmail.com";
public static final String DEFAULT_ROLE = "OrganizationMember";
public static final String DEFAULT_SCOPE = "/gcube/devsec/devVRE";
- // public final static String DEFAULT_USER = "test.user";
// public final static String DEFAULT_SCOPE = "/gcube/devNext";
// public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext";
@@ -46,15 +44,9 @@ public class Constants {
public static final String WPSCancelComputationServlet = "CancelComputationServlet";
public static final String WPSToken = "f0666597-4302-49ce-bea2-555b94e569cb";
public static final String WPSUser = "giancarlo.panichi";
-
-
-
-
/*public static final String WPSToken = "4ccc2c35-60c9-4c9b-9800-616538d5d48b";
public static final String WPSUser = "gianpaolo.coro";*/
- //public static final String WPSToken = "45943442-74ef-408b-be64-d26b42cf4c08 ";
- //public static final String WPSUser = "statistical.manager@gmail.com";
//DownloadFolderServlet
public static final String DOWNLOAD_FOLDER_SERVLET= "DownloadFolderServlet";
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index 0e1615b..65ce824 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -1,8 +1,9 @@
-
-
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 9180fce..231dd32 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -1,6 +1,7 @@
-
-
+
+
DataMinerManager
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8d3e60c..40b5ef6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,9 @@
-
+
DataMinerManagerServlet
org.gcube.portlets.user.dataminermanager.server.DataMinerManagerServiceImpl