diff --git a/distro/changelog.xml b/distro/changelog.xml index 48a2030..e74056d 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,5 +1,10 @@ - + + Fix for #577 + + First Release diff --git a/pom.xml b/pom.xml index 058631f..8f560f5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,10 @@ org.gcube.portal social-mail-servlet war - 1.0.0-SNAPSHOT - social-mail-servlet Maven Webapp - This component read periodically email replies from user wanting to reply to a post via email + 1.1.0-SNAPSHOT + + social-mail-servlet Webapp + This component read periodically email replies from user wanting to reply to a post via email and exports users in LDAP 1.7 6.0.6 diff --git a/src/main/java/org/gcube/portal/PortalSchedulerService.java b/src/main/java/org/gcube/portal/PortalSchedulerService.java index 1901e6f..18a4677 100644 --- a/src/main/java/org/gcube/portal/PortalSchedulerService.java +++ b/src/main/java/org/gcube/portal/PortalSchedulerService.java @@ -34,7 +34,7 @@ public class PortalSchedulerService extends HttpServlet { private static final Logger _log = LoggerFactory.getLogger(PortalSchedulerService.class); private static final int POP3_MINUTES_DELAY = 1; - private static final int LDAP_MINUTES_DELAY = 10; + private static final int LDAP_MINUTES_DELAY = 15; private static DatabookStore store; diff --git a/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java b/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java index dc3f1b1..731b43b 100644 --- a/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java +++ b/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java @@ -21,21 +21,25 @@ import org.gcube.portal.custom.communitymanager.OrganizationsUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.liferay.portal.kernel.cache.CacheRegistryUtil; +import com.liferay.portal.kernel.dao.orm.EntityCacheUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.model.Organization; import com.liferay.portal.model.User; import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.service.UserServiceUtil; public class LDAPSync implements Runnable { private static final Logger _log = LoggerFactory.getLogger(LDAPSync.class); - //TODO_ Move it to Runtime Resource + //TODO Move it to Runtime Resource private static final String ldapUrl = "ldap://ldap-liferay.d4science.org"; private static final String filter = "(objectClass=inetOrgPerson)"; - - private static final String ldapPrincipal = ""; - private static final String ldapPwd = ""; + private static final String ldapPrincipal = "cn=admin,dc=d4science,dc=org"; + private static final String ldapPwd = "poiwefhaewfkhj"; +// private static final String ldapPrincipal = ""; +// private static final String ldapPwd = ""; public LDAPSync() { @@ -49,7 +53,7 @@ public class LDAPSync implements Runnable { List users = null; try { users = getAllLiferayUsers(); - _log.debug("Read " + users.size() + " from LR DB"); + _log.debug("\n\n\n ******** Read " + users.size() + " from LR DB\n\n"); } catch (Exception e1) { e1.printStackTrace(); } @@ -147,11 +151,12 @@ public class LDAPSync implements Runnable { private List getAllLiferayUsers() { String infraName = PortalContext.getConfiguration().getInfrastructureName(); - _log.info("Reading users belonging to: /" + infraName); + _log.info("TRY Reading non chached users belonging to: /" + infraName); List toReturn = new ArrayList(); Organization rootInfra; try { + CacheRegistryUtil.clear(); rootInfra = OrganizationLocalServiceUtil.getOrganization(OrganizationsUtil.getCompany().getCompanyId(), infraName); toReturn = UserLocalServiceUtil.getOrganizationUsers(rootInfra.getOrganizationId()); } catch (PortalException | SystemException e) {