diff --git a/.classpath b/.classpath
index 9e6e7c5..ce69077 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -33,5 +33,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 211df04..750c512 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
+
+ Updated to Liferay 6.2
+
Fixed ASLSession
diff --git a/pom.xml b/pom.xml
index 9bd37af..b2b758e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-gwt-service
- 2.11.0-SNAPSHOT
+ 2.12.0-SNAPSHOT
tabular-data-gwt-service
tabular-data-gwt-service allows communication between the GUI and services
@@ -95,12 +95,54 @@
gwt-user
${gwtVersion}
+
+
+
+
+
+ org.gcube.core
+ common-scope-maps
+ compile
+
-
+
+ org.gcube.portal
+ custom-portal-handler
+
+
+
+ org.gcube.applicationsupportlayer
+ aslcore
+
+
+
+ org.gcube.dvos
+ usermanagement-core
+ provided
+
+
+
+
+
+ org.gcube.common
+ common-authorization
+ provided
+
+
+
+ org.gcube.common
+ authorization-client
+ provided
+
+
+
+
+ org.gcube.portlets.user
+ gcube-widgets
+ compile
+
+
+
org.json
@@ -112,33 +154,10 @@
org.gcube.data.publishing
sdmx-registry-client-gcube
[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)
-
-
-
- org.gcube.applicationsupportlayer
- aslcore
- provided
-
-
-
-
- org.gcube.portal
- custom-portal-handler
- provided
-
+
+
+
-
@@ -154,12 +173,6 @@
-
-
- org.gcube.common
- home-library
- provided
-
@@ -184,6 +197,53 @@
[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+
+
+
+
+ org.gcube.portal
+ social-networking-library
+ provided
+
+
+
+ org.gcube.applicationsupportlayer
+ aslsocial
+ provided
+
+
+
+
+ org.gcube.contentmanagement
+ storage-manager-core
+ provided
+
+
+
+ org.gcube.contentmanagement
+ storage-manager-wrapper
+ provided
+
+
+
+
+ org.gcube.common
+ home-library
+ provided
+
+
+
+ org.gcube.common
+ home-library-jcr
+ provided
+
+
+
+ org.gcube.common
+ home-library-model
+ provided
+
+
org.gcube.data.analysis.tabulardata
@@ -191,17 +251,7 @@
[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
provided
-
-
-
-
- org.gcube.contentmanagement
- storage-manager-core
-
-
- org.gcube.contentmanagement
- storage-manager-wrapper
-
+
@@ -224,10 +274,7 @@
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
provided
-
-
-
+
@@ -300,7 +347,6 @@
org.apache.maven.plugins
maven-assembly-plugin
- 2.2
${distroDirectory}/descriptor.xml
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 1f0c38f..60afa74 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
@@ -347,12 +347,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
-
UserInfo userInfo = new UserInfo(aslSession.getUsername(),
aslSession.getGroupId(), aslSession.getGroupName(),
aslSession.getScope(), aslSession.getScopeName(),
aslSession.getUserEmailAddress(),
aslSession.getUserFullName());
+ logger.debug("UserInfo: " + userInfo);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
return userInfo;
} catch (TDGWTServiceException e) {
e.printStackTrace();
@@ -379,7 +381,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
if (infoLocale == null || infoLocale.getLanguage() == null
|| infoLocale.getLanguage().isEmpty()) {
@@ -432,7 +436,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
ArrayList periodDataTypes = new ArrayList();
@@ -480,7 +486,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
ArrayList hierarchicalPeriodDataTypes = new ArrayList();
@@ -534,7 +542,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
HashMap> columnDataTypeFormats = new HashMap>();
@@ -587,7 +597,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
ArrayList valueDataFormats = new ArrayList();
@@ -633,6 +645,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("pendingTasksRetrieve()");
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -703,6 +717,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
if (startTRId == null || startTRId.getId() == null
|| startTRId.getId().isEmpty()) {
@@ -771,13 +787,15 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
*
* {@inheritDoc}
*/
-
+ @Override
public void setTabResource(TabResource tabResource)
throws TDGWTServiceException {
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
setCurrentTabResource(tabResource, session);
return;
@@ -818,7 +836,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
TRId trId = SessionUtil.getTRId(session);
logger.debug("getCurrentTRId()");
@@ -855,7 +875,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setTabResource(session, null);
SessionUtil.setTRId(session, null);
@@ -887,9 +909,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("closeTabularResourceAndOpen(): Open[" + openTRId
+ "], Close[" + closeTRId + "]");
- SessionUtil.getAslSession(session);
SessionUtil.removeFromCurrentTabularResourcesOpen(session,
closeTRId);
@@ -933,8 +957,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("closeTabularResource(): " + closeTRId);
- SessionUtil.getAslSession(session);
SessionUtil.removeFromCurrentTabularResourcesOpen(session,
closeTRId);
@@ -969,8 +995,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- logger.debug("setActiveTabularResource(): " + activeTRId);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ logger.debug("setActiveTabularResource(): " + activeTRId);
TabResource tabResource = SessionUtil
.getFromCurrentTabularResourcesOpen(session, activeTRId);
if (tabResource != null) {
@@ -1077,7 +1105,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.getAslSession(session);
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
TabResource currentTR = SessionUtil.getTabResource(session);
@@ -1108,8 +1138,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
-
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
TabResource currentTR = SessionUtil.getTabResource(session);
if (currentTR == null) {
@@ -1178,6 +1209,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
if (trId == null) {
logger.error("GetTabularREsourceInformation TRId is null");
throw new TDGWTServiceException(
@@ -1288,6 +1321,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -1329,6 +1364,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
TabResource currentTR = SessionUtil.getTabResource(session);
if (currentTR == null) {
@@ -1455,6 +1492,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -1576,6 +1615,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -1702,6 +1743,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -1865,6 +1908,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -2102,6 +2147,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -2210,6 +2257,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -2317,6 +2366,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -2439,6 +2490,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -2557,6 +2610,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getLastTable(): " + trId);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -2739,6 +2794,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getTable(): " + trId);
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -3187,6 +3244,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -3568,6 +3627,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTabularResources");
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -3628,6 +3689,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTabularResources");
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -3687,6 +3750,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
if (trId == null) {
logger.error("Error removing TabularResource: trId is null");
@@ -3742,6 +3807,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
if (tabResource == null) {
logger.error("Error creating new TabularResource: tabResource is null");
@@ -3857,9 +3924,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setSDMXImportSession(session, sdmxImportSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setSDMXImportSession(session, sdmxImportSession);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -3926,6 +3995,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -4186,14 +4257,17 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
"Error retrieving the session: null");
}
logger.debug("Session:" + session.getId());
-
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
fileUploadSession = SessionUtil.getCSVFileUploadSession(session);
if (fileUploadSession == null) {
throw new TDGWTServiceException(
"Error retrieving the fileUploadSession: null");
}
- ASLSession aslSession = SessionUtil.getAslSession(session);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -4288,6 +4362,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throws TDGWTServiceException {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
Workspace w = null;
WorkspaceItem wi = null;
@@ -4338,7 +4414,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
FilesStorage filesStorage = new FilesStorage();
- InputStream is = filesStorage.retriveInputStream(
+ InputStream is = filesStorage.retrieveInputStream(
aslSession.getUsername(), wi);
FileUtil.setImportFileCSV(fileUploadSession, is, wi.getName(),
@@ -4373,6 +4449,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTRMetadata on " + trId.toString());
@@ -4410,6 +4488,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("IsTabularResourceValid: " + trId.toString());
@@ -4452,6 +4532,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("IsTabularResourceFinalized: " + trId.toString());
@@ -4494,6 +4576,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("IsTabularResourceLocked: " + trId);
@@ -4623,6 +4707,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTRMetadata on " + trId);
@@ -4734,6 +4820,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTableValidationsMetadata on " + trId.toString());
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -4794,6 +4882,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTableMetadata on " + trId.toString());
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -5038,6 +5128,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
logger.debug("Session:" + session.getId());
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("Session User:" + aslSession.getUsername());
@@ -5119,10 +5211,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("Start CSV Export");
- ASLSession aslSession = SessionUtil.getAslSession(session);
-
TRId trId = SessionUtil.getTRId(session);
if (trId == null) {
throw new TDGWTServiceException(
@@ -5196,9 +5289,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- logger.debug("Start JSON Export");
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ logger.debug("Start JSON Export");
+
TRId trId = SessionUtil.getTRId(session);
if (trId == null) {
throw new TDGWTServiceException(
@@ -5273,6 +5368,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setChangeColumnTypeSession(session,
changeColumnTypeSession);
@@ -5334,9 +5431,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
Expression expression, HttpSession session)
throws TDGWTServiceException {
try {
- SessionUtil.setAddColumnSession(session, addColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setAddColumnSession(session, addColumnSession);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -5406,8 +5505,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setDeleteColumnSession(session, deleteColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setDeleteColumnSession(session, deleteColumnSession);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -5477,8 +5578,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throws TDGWTServiceException {
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
- SessionUtil.setFilterColumnSession(session, filterColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setFilterColumnSession(session, filterColumnSession);
+
if (filterColumnSession == null) {
logger.error("FilterColumnSession is null");
throw new TDGWTServiceException(
@@ -5552,9 +5656,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session) throws TDGWTServiceException {
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setReplaceColumnByExpressionSession(session,
replaceColumnByExpressionSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
if (replaceColumnByExpressionSession == null) {
logger.error("ReplaceColumnByExpressionSession is null");
throw new TDGWTServiceException(
@@ -5635,8 +5741,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setLabelColumnSession(session, labelColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setLabelColumnSession(session, labelColumnSession);
logger.debug(labelColumnSession.toString());
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -5716,10 +5824,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setChangeTableTypeSession(session,
changeTableTypeSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
-
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -5784,6 +5894,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -5891,9 +6003,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setDeleteRowsSession(session, deleteRowsSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setDeleteRowsSession(session, deleteRowsSession);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -5959,6 +6073,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6046,8 +6162,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setDuplicatesSession(session, duplicatesSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
+ SessionUtil.setDuplicatesSession(session, duplicatesSession);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6113,6 +6232,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6199,6 +6320,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("ShareInfo: " + shareInfo);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6224,7 +6347,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
service.share(tabularResourceId, usersArray);
TDMNotifications tdmNotifications = new TDMNotifications(
- aslSession, shareInfo);
+ this.getThreadLocalRequest(), aslSession, shareInfo);
tdmNotifications.start();
} catch (TDGWTServiceException e) {
@@ -6251,6 +6374,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("ShareTemplate: " + shareTemplate);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6276,7 +6401,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
service.share(templateId, usersArray);
TDMNotifications tdmNotifications = new TDMNotifications(
- aslSession, shareTemplate);
+ this.getThreadLocalRequest(), aslSession, shareTemplate);
tdmNotifications.start();
} catch (TDGWTServiceException e) {
@@ -6302,6 +6427,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("ShareRule: " + shareRule);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6327,7 +6454,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
service.share(ruleId, usersArray);
TDMNotifications tdmNotifications = new TDMNotifications(
- aslSession, shareRule);
+ this.getThreadLocalRequest(), aslSession, shareRule);
tdmNotifications.start();
} catch (TDGWTServiceException e) {
@@ -6349,6 +6476,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("checkTabularResourceNotFinal: " + trId);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6388,6 +6517,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("SetTabResourceInformation: " + tabResource);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6512,6 +6643,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("SetTabResourceToFinal: " + trId);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6568,6 +6701,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetOccurencesForBatchReplace: "
+ occurrencesForReplaceBatchColumnSession.toString());
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -6609,6 +6744,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTemplates");
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -6721,6 +6858,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("startTemplateApply: " + templateApplySession);
SessionUtil.setTemplateApplySession(session, templateApplySession);
@@ -6785,6 +6924,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("startTemplateDelete: " + templateDeleteSession);
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -6829,9 +6970,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setReplaceColumnSession(session, replaceColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setReplaceColumnSession(session, replaceColumnSession);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -6897,10 +7040,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
SessionUtil.setReplaceBatchColumnSession(session,
replaceBatchColumnSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
-
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -6969,8 +7115,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- @SuppressWarnings("unused")
+
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getLocales()");
List listLocales = Arrays.asList(Locales.ALLOWED_LOCALES);
@@ -7001,6 +7149,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getLastOperationInfo()");
TabResource currentTR = SessionUtil.getTabResource(session);
@@ -7068,6 +7218,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getLastOperationInfo: " + trId);
@@ -7126,6 +7278,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getHistory()");
TabResource currentTR = SessionUtil.getTabResource(session);
@@ -7193,6 +7347,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getHistory(): " + trId);
@@ -7251,6 +7407,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("StartDiscard: " + trId);
@@ -7360,6 +7518,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("rollBack(): " + rollBackSession);
SessionUtil.setRollBackSession(session, rollBackSession);
@@ -7444,6 +7604,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetTableValidationsMetadata on " + trId.toString());
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -7560,9 +7722,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setEditRowSession(session, editRowSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
+ SessionUtil.setEditRowSession(session, editRowSession);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -7630,6 +7795,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("GetConnection on " + refColumn.toString());
AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -7681,8 +7848,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setTaskResubmitSession(session, taskResubmitSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setTaskResubmitSession(session, taskResubmitSession);
logger.debug("StartTaskResubmit: " + taskResubmitSession);
if (taskResubmitSession == null) {
logger.error("TaskResubmitSession is null");
@@ -7743,8 +7912,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setTaskResumeSession(session, taskResumeSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setTaskResumeSession(session, taskResumeSession);
logger.debug("StartTaskResume: " + taskResumeSession);
if (taskResumeSession == null) {
logger.error("TaskResumeSession is null");
@@ -7895,9 +8066,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setExtractCodelistSession(session,
extractCodelistSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
logger.debug("StartExtractCodelist: " + extractCodelistSession);
if (extractCodelistSession == null) {
logger.error("ExtractCodelistSession is null");
@@ -7959,8 +8132,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session) throws TDGWTServiceException {
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
- SessionUtil.setSplitColumnSession(session, splitColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setSplitColumnSession(session, splitColumnSession);
if (splitColumnSession == null) {
logger.error("SplitColumnSession is null");
throw new TDGWTServiceException(
@@ -8027,8 +8202,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session) throws TDGWTServiceException {
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
- SessionUtil.setMergeColumnSession(session, mergeColumnSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setMergeColumnSession(session, mergeColumnSession);
+
if (mergeColumnSession == null) {
logger.error("MergeColumnSession is null");
throw new TDGWTServiceException(
@@ -8120,6 +8298,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throws TDGWTServiceException {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
Workspace w = null;
WorkspaceItem wi = null;
@@ -8171,7 +8352,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
FilesStorage filesStorage = new FilesStorage();
- InputStream is = filesStorage.retriveInputStream(
+ InputStream is = filesStorage.retrieveInputStream(
aslSession.getUsername(), wi);
FileUtil.setImportFileCodelistMapping(fileUploadSession, is,
@@ -8213,6 +8394,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
logger.debug("Session:" + session.getId());
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
String user = aslSession.getUsername();
logger.debug("Session User:" + user);
@@ -8333,9 +8516,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session) throws TDGWTServiceException {
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
- SessionUtil.setGroupBySession(session, groupBySession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
+ SessionUtil.setGroupBySession(session, groupBySession);
logger.debug("StartGroupBy: " + groupBySession);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -8392,10 +8577,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throws TDGWTServiceException {
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
SessionUtil.setTimeAggregationSession(session,
timeAggregationSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
-
logger.debug("StartGroupBy: " + timeAggregationSession);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -8453,8 +8640,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setNormalizationSession(session, normalizationSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setNormalizationSession(session, normalizationSession);
if (normalizationSession == null) {
logger.error("NormalizationSession is null");
throw new TDGWTServiceException(
@@ -8521,9 +8710,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setDenormalizationSession(session,
denormalizationSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
if (denormalizationSession == null) {
logger.error("DenormalizationSession is null");
throw new TDGWTServiceException(
@@ -8593,9 +8784,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setUnionSession(session, unionSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setUnionSession(session, unionSession);
+
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -8657,10 +8850,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
SessionUtil.setChangeColumnsPositionSession(session,
changeColumnsPositionSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
-
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -8718,11 +8913,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
throws TDGWTServiceException {
HttpSession session = null;
try {
- session = this.getThreadLocalRequest().getSession();
+ session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
SessionUtil.setReplaceByExternalSession(session,
replaceByExternalSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
-
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
TabularDataService service = TabularDataServiceFactory.getService();
@@ -8785,9 +8982,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+
SessionUtil.setStatisticalOperationSession(session,
statisticalOperationSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -8851,6 +9051,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
TaskWrapper taskWrapper = SessionUtil.getStartedTask(session,
operationMonitorSession.getTaskId());
@@ -8925,6 +9127,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
OperationMonitor operationMonitor = null;
@@ -8992,6 +9196,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("getBackgroundOperationMonitor(): "
+ backgroundOperationMonitorSession);
@@ -9082,6 +9288,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -9132,6 +9340,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -9185,6 +9395,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("Remove Resource: " + removeResourceSession);
if (removeResourceSession == null) {
@@ -9253,8 +9465,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setMapCreationSession(session, mapCreationSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setMapCreationSession(session, mapCreationSession);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -9318,6 +9532,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
logger.debug("Get uri from resolver: " + uriResolverSession);
UriResolverTDClient uriResolverTDClient = new UriResolverTDClient();
@@ -9351,9 +9567,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil
.setChartTopRatingSession(session, chartTopRatingSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername(), aslSession.getScope()));
@@ -9417,9 +9635,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
- SessionUtil.setSaveResourceSession(session, saveResourceSession);
ASLSession aslSession = SessionUtil.getAslSession(session);
-
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
+ SessionUtil.setSaveResourceSession(session, saveResourceSession);
logger.debug("SaveResource(): " + saveResourceSession);
String mimeType;
@@ -9607,9 +9826,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setGeospatialCreateCoordinatesSession(session,
geospatialCreateCoordinatesSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
if (geospatialCreateCoordinatesSession == null) {
logger.error("GeospatialCreateCoordinatesSession is null");
throw new TDGWTServiceException(
@@ -9684,9 +9905,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setGeospatialDownscaleCSquareSession(session,
geospatialDownscaleCSquareSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
if (geospatialDownscaleCSquareSession == null) {
logger.error("GeospatialDownscaleCSquareSession is null");
throw new TDGWTServiceException(
@@ -9760,9 +9983,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = null;
try {
session = this.getThreadLocalRequest().getSession();
+ ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setGeometryCreatePointSession(session,
geometryCreatePointSession);
- ASLSession aslSession = SessionUtil.getAslSession(session);
if (geometryCreatePointSession == null) {
logger.error("GeometryCreatePointSession is null");
throw new TDGWTServiceException(
@@ -9839,6 +10064,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setRulesOnColumnApplyAndDetachSession(session,
applyAndDetachColumnRulesSession);
@@ -9937,6 +10164,8 @@ public class TDGWTServiceImpl 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("StartApplyTableRule: " + applyTableRuleSession);
SessionUtil
@@ -10018,6 +10247,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setDetachColumnRulesSession(session,
detachColumnRulesSession);
@@ -10094,6 +10325,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try {
// HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session);
+ String token = SessionUtil.getToken(aslSession);
+ logger.debug("UserToken: " + token);
SessionUtil.setDetachTableRulesSession(session,
detachTableRulesSession);
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/social/TDMNotifications.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/social/TDMNotifications.java
index 8662802..4a79948 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/social/TDMNotifications.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/social/TDMNotifications.java
@@ -2,9 +2,13 @@ package org.gcube.portlets.user.td.gwtservice.server.social;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager;
import org.gcube.applicationsupportlayer.social.NotificationsManager;
+import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite;
+import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser;
import org.gcube.common.homelibrary.util.WorkspaceUtil;
import org.gcube.portal.databook.shared.NotificationType;
import org.gcube.portlets.user.td.gwtservice.shared.share.Contacts;
@@ -30,6 +34,9 @@ public class TDMNotifications extends Thread {
private ShareTabResource shareTabularResource;
private ShareRule shareRule;
private ShareTemplate shareTemplate;
+ private SocialNetworkingSite site;
+ private SocialNetworkingUser user;
+ private String scope;
/**
* Share Tabular Resource
@@ -37,11 +44,16 @@ public class TDMNotifications extends Thread {
* @param aslSession
* @param shareTabularResource
*/
- public TDMNotifications(ASLSession aslSession,
+ public TDMNotifications(HttpServletRequest request, ASLSession aslSession,
ShareTabResource shareTabularResource) {
this.aslSession = aslSession;
this.shareTabularResource = shareTabularResource;
this.notificationType = NotificationType.TDM_TAB_RESOURCE_SHARE;
+ site = new SocialNetworkingSite(request);
+ user = new SocialNetworkingUser(aslSession.getUsername(),
+ aslSession.getUserEmailAddress(), aslSession.getUserFullName(),
+ aslSession.getUserAvatarId());
+ scope = aslSession.getScope();
}
@@ -50,10 +62,16 @@ public class TDMNotifications extends Thread {
* @param aslSession
* @param shareRule
*/
- public TDMNotifications(ASLSession aslSession, ShareRule shareRule) {
+ public TDMNotifications(HttpServletRequest request, ASLSession aslSession,
+ ShareRule shareRule) {
this.aslSession = aslSession;
this.shareRule = shareRule;
this.notificationType = NotificationType.TDM_RULE_SHARE;
+ site = new SocialNetworkingSite(request);
+ user = new SocialNetworkingUser(aslSession.getUsername(),
+ aslSession.getUserEmailAddress(), aslSession.getUserFullName(),
+ aslSession.getUserAvatarId());
+ scope = aslSession.getScope();
}
@@ -62,10 +80,16 @@ public class TDMNotifications extends Thread {
* @param aslSession
* @param shareTemplate
*/
- public TDMNotifications(ASLSession aslSession, ShareTemplate shareTemplate) {
+ public TDMNotifications(HttpServletRequest request, ASLSession aslSession,
+ ShareTemplate shareTemplate) {
this.aslSession = aslSession;
this.shareTemplate = shareTemplate;
this.notificationType = NotificationType.TDM_TEMPLATE_SHARE;
+ site = new SocialNetworkingSite(request);
+ user = new SocialNetworkingUser(aslSession.getUsername(),
+ aslSession.getUserEmailAddress(), aslSession.getUserFullName(),
+ aslSession.getUserAvatarId());
+ scope = aslSession.getScope();
}
@@ -87,8 +111,8 @@ public class TDMNotifications extends Thread {
}
private void tabularResourceNotify() {
- NotificationsManager nm = new ApplicationNotificationsManager(
- aslSession, Constants.APPLICATION_ID);
+ NotificationsManager nm = new ApplicationNotificationsManager(site,
+ scope, user, Constants.APPLICATION_ID);
for (Contacts contact : shareTabularResource.getContacts()) {
if (contact.isGroup()) {
@@ -108,7 +132,8 @@ public class TDMNotifications extends Thread {
} catch (Exception e) {
logger.error("Error in the notification(Type: "
- + notificationType + " - "
+ + notificationType
+ + " - "
+ aslSession.getUsername()
+ " share tabular resource id="
+ shareTabularResource.getTabResource()
@@ -137,7 +162,8 @@ public class TDMNotifications extends Thread {
} catch (Exception e) {
logger.error("Error in the notification(Type: "
- + notificationType + " - "
+ + notificationType
+ + " - "
+ aslSession.getUsername()
+ " share tabular resource id="
+ shareTabularResource.getTabResource().getTrId()
@@ -151,8 +177,8 @@ public class TDMNotifications extends Thread {
}
private void ruleNotify() {
- NotificationsManager nm = new ApplicationNotificationsManager(
- aslSession, Constants.APPLICATION_ID);
+ NotificationsManager nm = new ApplicationNotificationsManager(site,
+ scope, user, Constants.APPLICATION_ID);
for (Contacts contact : shareRule.getContacts()) {
if (contact.isGroup()) {
@@ -168,7 +194,8 @@ public class TDMNotifications extends Thread {
} catch (Exception e) {
logger.error("Error in the notification(Type: "
- + notificationType + " - "
+ + notificationType
+ + " - "
+ aslSession.getUsername()
+ " share rule id="
+ shareRule.getRuleDescriptionData()
@@ -208,8 +235,8 @@ public class TDMNotifications extends Thread {
}
private void templateNotify() {
- NotificationsManager nm = new ApplicationNotificationsManager(
- aslSession, Constants.APPLICATION_ID);
+ NotificationsManager nm = new ApplicationNotificationsManager(site,
+ scope, user, Constants.APPLICATION_ID);
for (Contacts contact : shareTemplate.getContacts()) {
if (contact.isGroup()) {
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java
index 2aaf364..4cbd0b1 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java
@@ -15,7 +15,6 @@ import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
import org.gcube.common.homelibrary.util.WorkspaceUtil;
import org.gcube.contentmanagement.blobstorage.service.IClient;
-import org.gcube.contentmanager.storageclient.model.protocol.smp.SMPUrl;
import org.gcube.contentmanager.storageclient.wrapper.AccessType;
import org.gcube.contentmanager.storageclient.wrapper.MemoryType;
import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
@@ -35,6 +34,12 @@ public class FilesStorage {
public static final Logger logger = LoggerFactory
.getLogger(FilesStorage.class);
+ /**
+ *
+ * @param user
+ * @param file
+ * @return
+ */
public String storageCSVTempFile(String user, File file) {
try {
IClient client = new StorageClient(user, AccessType.PUBLIC,
@@ -43,7 +48,6 @@ public class FilesStorage {
logger.debug("remotePath: " + remotePath);
String id = client.put(true).LFile(file.getAbsolutePath())
.RFile(remotePath);
- // url = client.getUrl().RFile(remotePath);
return id;
} catch (Throwable e) {
@@ -55,16 +59,20 @@ public class FilesStorage {
}
+ /**
+ *
+ * @param user
+ * @param file
+ * @return
+ */
public String storageCodelistMappingTempFile(String user, File file) {
try {
- // String url = null;
IClient client = new StorageClient(user, AccessType.PUBLIC,
MemoryType.VOLATILE).getClient();
String remotePath = "/CodelistMappingImport/" + file.getName();
logger.debug("remotePath: " + remotePath);
String id = client.put(true).LFile(file.getAbsolutePath())
.RFile(remotePath);
- // url = client.getUrl().RFile(remotePath);
return id;
} catch (Throwable e) {
logger.error("Error no codelist mapping file loaded on storage"
@@ -75,6 +83,13 @@ public class FilesStorage {
}
+ /**
+ *
+ * @param user
+ * @param url
+ * @return
+ * @throws TDGWTServiceException
+ */
public String storageCodelistMappingTempFile(String user, String url)
throws TDGWTServiceException {
InputStream is = null;
@@ -117,22 +132,20 @@ public class FilesStorage {
* Destination file
* @throws TDGWTServiceException
*/
- public void retriveFile(String user, WorkspaceItem wi, File file)
+ public void retrieveFile(String user, WorkspaceItem wi, File file)
throws TDGWTServiceException {
InputStream is = null;
try {
org.gcube.common.homelibrary.home.workspace.folder.items.File gcubeItem = ((org.gcube.common.homelibrary.home.workspace.folder.items.File) wi);
- SMPUrl smsHome = new SMPUrl(gcubeItem.getPublicLink());
- /*
- * Handler.activateProtocol(); URL smsHome = null; smsHome = new
- * URL(gcubeItem.getPublicLink());
- */
- logger.debug("smsHome: [host:" + smsHome.getHost() + " path:"
- + smsHome.getPath() + " ref:" + smsHome.getRef()
- + " userinfo:" + smsHome.getUserInfo() + " ]");
+ //SMPUrl smsHome = new SMPUrl(gcubeItem.getPublicLink());
+ URL url=new URL(gcubeItem.getPublicLink());
+
+ logger.debug("smsHome: [host:" + url.getHost() + " path:"
+ + url.getPath() + " ref:" + url.getRef()
+ + " userinfo:" + url.getUserInfo() + " ]");
URLConnection uc = null;
- uc = (URLConnection) smsHome.openConnection();
+ uc = (URLConnection) url.openConnection();
is = uc.getInputStream();
} catch (Exception e) {
@@ -174,28 +187,21 @@ public class FilesStorage {
* @return InputStream back to read the file
* @throws TDGWTServiceException
*/
- public InputStream retriveInputStream(String user, WorkspaceItem wi)
+ public InputStream retrieveInputStream(String user, WorkspaceItem wi)
throws TDGWTServiceException {
InputStream is = null;
try {
org.gcube.common.homelibrary.home.workspace.folder.items.File gcubeItem = ((org.gcube.common.homelibrary.home.workspace.folder.items.File) wi);
- SMPUrl smsHome = new SMPUrl(gcubeItem.getPublicLink());
+ //SMPUrl smsHome = new SMPUrl(gcubeItem.getPublicLink());
+ URL url=new URL(gcubeItem.getPublicLink());
- /*
- * Handler.activateProtocol(); URL smsHome = null; smsHome = new
- * URL(null, gcubeItem.getPublicLink(), new URLStreamHandler() {
- *
- * @Override protected URLConnection openConnection(URL u) throws
- * IOException { return new SMPURLConnection(u); }
- *
- * });
- */
- logger.debug("smsHome: [host:" + smsHome.getHost() + " path:"
- + smsHome.getPath() + " ref:" + smsHome.getRef()
- + " userinfo:" + smsHome.getUserInfo() + " ]");
+
+ logger.debug("smsHome: [host:" + url.getHost() + " path:"
+ + url.getPath() + " ref:" + url.getRef()
+ + " userinfo:" + url.getUserInfo() + " ]");
URLConnection uc = null;
- uc = (URLConnection) smsHome.openConnection();
+ uc = (URLConnection) url.openConnection();
is = uc.getInputStream();
} catch (Exception e) {
@@ -224,22 +230,14 @@ public class FilesStorage {
InputStream is = null;
try {
- SMPUrl smsHome = new SMPUrl(uri);
- /*
- * Handler.activateProtocol(); URL smsHome = null; smsHome = new
- * URL(null, uri, new URLStreamHandler() {
- *
- * @Override protected URLConnection openConnection(URL u) throws
- * IOException { return new SMPURLConnection(u); }
- *
- * });
- */
-
- logger.debug("smsHome: [host:" + smsHome.getHost() + " path:"
- + smsHome.getPath() + " ref:" + smsHome.getRef()
- + " userinfo:" + smsHome.getUserInfo() + " ]");
+ //SMPUrl smsHome = new SMPUrl(uri);
+ URL url=new URL(uri);
+
+ logger.debug("smsHome: [host:" + url.getHost() + " path:"
+ + url.getPath() + " ref:" + url.getRef()
+ + " userinfo:" + url.getUserInfo() + " ]");
URLConnection uc = null;
- uc = (URLConnection) smsHome.openConnection();
+ uc = (URLConnection) url.openConnection();
is = uc.getInputStream();
} catch (Exception e) {
@@ -269,24 +267,15 @@ public class FilesStorage {
InputStream is = null;
try {
- SMPUrl smsHome = new SMPUrl(uri);
-
- /*
- * URL smsHome = new SMPUrl(); smsHome = new URL(null, uri, new
- * URLStreamHandler() {
- *
- * @Override protected URLConnection openConnection(URL u) throws
- * IOException { return new SMPURLConnection(u); }
- *
- * });
- */
-
- logger.debug("smsHome: [host:" + smsHome.getHost() + " path:"
- + smsHome.getPath() + " ref:" + smsHome.getRef()
- + " userinfo:" + smsHome.getUserInfo() + " ]");
+ //SMPUrl smsHome = new SMPUrl(uri);
+ URL url=new URL(uri);
+
+ logger.debug("smsHome: [host:" + url.getHost() + " path:"
+ + url.getPath() + " ref:" + url.getRef()
+ + " userinfo:" + url.getUserInfo() + " ]");
URLConnection uc = null;
- uc = (URLConnection) smsHome.openConnection();
+ uc = (URLConnection) url.openConnection();
is = uc.getInputStream();
Workspace ws = HomeLibrary.getUserWorkspace(user);
@@ -338,8 +327,7 @@ public class FilesStorage {
+ ", uniqueName: " + uniqueName + ", description: "
+ item_description + ", mimetype: " + item_mimetype
+ ", StorageId: " + storageId + "]");
- WorkspaceUtil.createExternalFile(folder, uniqueName,
- item_description, item_mimetype, storageId);
+ WorkspaceUtil.createExternalFile(folder, uniqueName,item_description, item_mimetype, storageId);
} catch (Exception e) {
logger.error("Error creating item on workspace", e);