From 77bb40e0032dd3569eb83742d06e9e576d79277c Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Mon, 26 Dec 2016 22:15:29 +0000 Subject: [PATCH] moved to Liferay logging system git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@141407 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/CKANPublisherServicesImpl.java | 7 ++++--- .../threads/AssociationToGroupAndNotifyThread.java | 8 +++++--- .../server/threads/WritePostCatalogueManagerThread.java | 9 +++++---- .../server/utils/ServiceEndPointReaderSocial.java | 8 +++++--- .../ckandatapublisherwidget/server/utils/Utils.java | 6 ++++-- .../server/utils/WorkspaceUtils.java | 7 +++++-- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java index 0d3f581..91b42da 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java @@ -31,9 +31,10 @@ import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault; import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException; import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager; import org.gcube.vomanagement.usermanagement.model.GCubeUser; -import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.service.UserLocalServiceUtil; import eu.trentorise.opendata.jackan.model.CkanGroup; @@ -48,8 +49,8 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C private static final long serialVersionUID = 7252248774050361697L; // Logger - private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CKANPublisherServicesImpl.class); - + //private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CKANPublisherServicesImpl.class); + private static final Log logger = LogFactoryUtil.getLog(CKANPublisherServicesImpl.class); private static final String PRODUCT_URL_FIELD = "Product URL"; // map diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java index 52546d2..b422b26 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java @@ -14,8 +14,9 @@ import org.gcube.datacatalogue.ckanutillibrary.utils.UtilMethods; import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.GroupBean; import org.gcube.vomanagement.usermanagement.UserManager; import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import eu.trentorise.opendata.jackan.model.CkanGroup; @@ -25,7 +26,8 @@ import eu.trentorise.opendata.jackan.model.CkanGroup; */ public class AssociationToGroupAndNotifyThread extends Thread { - private static final Logger logger = LoggerFactory.getLogger(AssociationToGroupAndNotifyThread.class); + //private static final Logger logger = LoggerFactory.getLogger(AssociationToGroupAndNotifyThread.class); + private static final Log logger = LogFactoryUtil.getLog(AssociationToGroupAndNotifyThread.class); private static final String PRODUCT_ASSOCIATED_TO_GROUP_SUBJECT = "Product $TITLE added to group $GROUP"; private static final String PRODUCT_ASSOCIATED_TO_GROUP_BODY = "Dear user,
a new product named '$TITLE' has been " + "just published by $USER_FULLNAME in $GROUP .
" diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java index ab708a0..d2a2319 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java @@ -5,8 +5,9 @@ import java.util.List; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.widgets.ckandatapublisherwidget.server.utils.Utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; /** @@ -16,8 +17,8 @@ import org.slf4j.LoggerFactory; */ public class WritePostCatalogueManagerThread extends Thread { - private static final Logger logger = LoggerFactory.getLogger(WritePostCatalogueManagerThread.class); - + //private static final Logger logger = LoggerFactory.getLogger(WritePostCatalogueManagerThread.class); + private static final Log logger = LogFactoryUtil.getLog(WritePostCatalogueManagerThread.class); private String username; private String scope; private String productTitle; diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/ServiceEndPointReaderSocial.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/ServiceEndPointReaderSocial.java index 3907153..98e13ec 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/ServiceEndPointReaderSocial.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/ServiceEndPointReaderSocial.java @@ -11,8 +11,9 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; /** * Retrieves the base url of the social-networking service in the scope provided @@ -23,7 +24,8 @@ public class ServiceEndPointReaderSocial { private String basePath = null; - private static Logger logger = LoggerFactory.getLogger(ServiceEndPointReaderSocial.class); + //private static Logger logger = LoggerFactory.getLogger(ServiceEndPointReaderSocial.class); + private static final Log logger = LogFactoryUtil.getLog(ServiceEndPointReaderSocial.class); private final static String RUNTIME_RESOURCE_NAME = "SocialNetworking"; private final static String CATEGORY = "Portal"; diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java index fcb5155..acd7521 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java @@ -47,9 +47,10 @@ import org.gcube.vomanagement.usermanagement.model.GCubeGroup; import org.gcube.vomanagement.usermanagement.model.GCubeRole; import org.gcube.vomanagement.usermanagement.model.GCubeUser; import org.gcube.vomanagement.usermanagement.model.GatewayRolesNames; -import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import eu.trentorise.opendata.jackan.internal.org.apache.http.HttpEntity; import eu.trentorise.opendata.jackan.internal.org.apache.http.HttpResponse; @@ -67,7 +68,8 @@ import eu.trentorise.opendata.jackan.model.CkanOrganization; public class Utils { // Logger - private static final org.slf4j.Logger logger = LoggerFactory.getLogger(Utils.class); + //private static final org.slf4j.Logger logger = LoggerFactory.getLogger(Utils.class); + private static final Log logger = LogFactoryUtil.getLog(Utils.class); private static final String APPLICATION_ID_CATALOGUE_MANAGER = "org.gcube.datacatalogue.ProductCatalogue"; private static final String NOTIFICATION_MESSAGE = "Dear members,
The product 'PRODUCT_TITLE' has been just published by USER_FULLNAME.
You can find it here: PRODUCT_URL
"; private static final String SOCIAL_SERVICE_APPLICATION_TOKEN = "2/tokens/generate-application-token/"; diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java index 20e2c1b..d6de0eb 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java @@ -18,12 +18,15 @@ import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; import org.gcube.datacatalogue.ckanutillibrary.models.ResourceBean; import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.DatasetMetadataBean; import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean; -import org.slf4j.LoggerFactory; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; public class WorkspaceUtils { - private static final org.slf4j.Logger logger = LoggerFactory.getLogger(WorkspaceUtils.class); + //private static final org.slf4j.Logger logger = LoggerFactory.getLogger(WorkspaceUtils.class); + private static final Log logger = LogFactoryUtil.getLog(WorkspaceUtils.class); private static final String RESOURCES_NAME_SEPARATOR = "_"; /**