From 1fa6e44f05bd3e2ce82140c9aacbaef92f80e1bd Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 18 May 2018 10:09:25 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@167587 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/SessionUtil.java | 10 +++++----- .../shared/Constants.java | 2 +- src/test/resources/log4j.properties | 20 ------------------- 3 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 src/test/resources/log4j.properties diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/SessionUtil.java index 7fe5a59..2e6bbe8 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/SessionUtil.java @@ -83,9 +83,9 @@ public class SessionUtil { scope = Constants.DEFAULT_SCOPE; token = Constants.DEFAULT_TOKEN; - logger.info("Set SecurityToken: " + token); + logger.debug("Set SecurityToken: " + token); SecurityTokenProvider.instance.set(token); - logger.info("Set ScopeProvider: " + scope); + logger.debug("Set ScopeProvider: " + scope); ScopeProvider.instance.set(scope); sCredentials = new ServiceCredentials(userName, scope, token); @@ -147,9 +147,9 @@ public class SessionUtil { String email = gCubeUser.getEmail(); if (hasScopeGroupId) { - logger.info("Set SecurityToken: " + token); + logger.debug("Set SecurityToken: " + token); SecurityTokenProvider.instance.set(token); - logger.info("Set ScopeProvider: " + scope); + logger.debug("Set ScopeProvider: " + scope); ScopeProvider.instance.set(scope); groupId = scopeGroupId; @@ -187,7 +187,7 @@ public class SessionUtil { userAvatarURL, token); } - logger.info("ServiceCredentials: " + sCredentials); + logger.debug("ServiceCredentials: " + sCredentials); return sCredentials; } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/shared/Constants.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/shared/Constants.java index bed412f..d519d46 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/shared/Constants.java @@ -18,7 +18,7 @@ public class Constants { public static final String DEFAULT_USER = "giancarlo.panichi"; public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext"; - public final static String DEFAULT_TOKEN = "ae1208f0-210d-47c9-9b24-d3f2dfcce05f-98187548"; + public final static String DEFAULT_TOKEN = ""; public static final String DEFAULT_ROLE = "OrganizationMember"; public static final String FILE_UPLOADED_FIELD = "FileUploadedField"; diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties deleted file mode 100644 index 87b68a3..0000000 --- a/src/test/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -# A default log4j configuration for log4j users. -# -# To use this configuration, deploy it into your application's WEB-INF/classes -# directory. You are also encouraged to edit it as you like. - -log4j.rootLogger=DEBUG, stdout, rollingFile - -# Redirect log messages to console -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - - -log4j.appender.rollingFile=org.apache.log4j.RollingFileAppender -log4j.appender.rollingFile.File=test.log -log4j.appender.rollingFile.MaxFileSize=20MB -log4j.appender.rollingFile.MaxBackupIndex=2 -log4j.appender.rollingFile.layout = org.apache.log4j.PatternLayout -log4j.appender.rollingFile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n