Updated to new PortalContext
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@141794 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
5ff5b86e3b
commit
be3c5cb6b9
2
pom.xml
2
pom.xml
|
@ -125,8 +125,6 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Authorization -->
|
<!-- Authorization -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.common</groupId>
|
<groupId>org.gcube.common</groupId>
|
||||||
|
|
|
@ -70,7 +70,9 @@ public class CSVImportFileServlet extends HttpServlet {
|
||||||
|
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -78,6 +80,7 @@ public class CSVImportFileServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -68,7 +68,9 @@ public class CodelistMappingUploadServlet extends HttpServlet {
|
||||||
|
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -76,6 +78,7 @@ public class CodelistMappingUploadServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// String currUserId = request
|
// String currUserId = request
|
||||||
|
|
|
@ -68,7 +68,9 @@ public class LocalUploadServlet extends HttpServlet {
|
||||||
|
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -76,6 +78,7 @@ public class LocalUploadServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -70,7 +70,9 @@ public class RetrieveChartFileServlet extends HttpServlet {
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -78,6 +80,7 @@ public class RetrieveChartFileServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -67,7 +67,9 @@ public class RetrieveFileAndDiscoverMimeTypeServlet extends HttpServlet {
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -75,6 +77,7 @@ public class RetrieveFileAndDiscoverMimeTypeServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -125,7 +125,7 @@ public class SessionUtil {
|
||||||
logger.info("No credential found in session, use test user!");
|
logger.info("No credential found in session, use test user!");
|
||||||
InfoLocale infoLocale = getInfoLocale(httpServletRequest, null);
|
InfoLocale infoLocale = getInfoLocale(httpServletRequest, null);
|
||||||
Locale locale = new Locale(infoLocale.getLanguage());
|
Locale locale = new Locale(infoLocale.getLanguage());
|
||||||
@SuppressWarnings("unused")
|
|
||||||
ResourceBundle messages = ResourceBundle.getBundle(
|
ResourceBundle messages = ResourceBundle.getBundle(
|
||||||
TDGWTServiceMessagesConstants.TDGWTServiceMessages, locale);
|
TDGWTServiceMessagesConstants.TDGWTServiceMessages, locale);
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,9 @@ public class TDLogsServlet extends HttpServlet {
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -75,6 +77,7 @@ public class TDLogsServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -67,7 +67,9 @@ public class TDRStudioServlet extends HttpServlet {
|
||||||
|
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -75,6 +77,7 @@ public class TDRStudioServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -66,7 +66,9 @@ public class TabularDataRowsXServlet extends HttpServlet {
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
ServiceCredentials serviceCredentials;
|
ServiceCredentials serviceCredentials;
|
||||||
|
|
||||||
String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
String scopeGroupId = request.getHeader(Constants.CURR_GROUP_ID);
|
||||||
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
|
scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID);
|
||||||
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
if (scopeGroupId == null || scopeGroupId.isEmpty()) {
|
||||||
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
logger.error("CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
|
@ -74,6 +76,7 @@ public class TabularDataRowsXServlet extends HttpServlet {
|
||||||
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
"CURR_GROUP_ID is null, it is a mandatory parameter in custom servlet: "
|
||||||
+ scopeGroupId);
|
+ scopeGroupId);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
serviceCredentials = SessionUtil.getServiceCredentials(request,
|
||||||
|
|
|
@ -10,8 +10,8 @@ package org.gcube.portlets.user.td.gwtservice.shared;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final boolean DEBUG_MODE = true;
|
public static final boolean DEBUG_MODE = false;
|
||||||
public static final boolean TEST_ENABLE = true;
|
public static final boolean TEST_ENABLE = false;
|
||||||
|
|
||||||
public static final String CURR_GROUP_ID = "CURR_GROUP_ID";
|
public static final String CURR_GROUP_ID = "CURR_GROUP_ID";
|
||||||
//public static final String CURR_USER_ID = "CURR_USER_ID";
|
//public static final String CURR_USER_ID = "CURR_USER_ID";
|
||||||
|
|
Loading…
Reference in New Issue