svn commit: r1749423 - in /openmeetings/application/trunk/openmeetings-core: pom.xml src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Author: solomax
Date: Tue Jun 21 05:33:36 2016
New Revision: 1749423
URL: http://svn.apache.org/viewvc?rev=1749423=rev
Log:
[OPENMEETINGS-980] LDAP directory api version is updated
Modified:
openmeetings/application/trunk/openmeetings-core/pom.xml
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Modified: openmeetings/application/trunk/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/pom.xml?rev=1749423=1749422=1749423=diff
==
--- openmeetings/application/trunk/openmeetings-core/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-core/pom.xml Tue Jun 21
05:33:36 2016
@@ -86,7 +86,7 @@
org.apache.directory.api
api-all
- 1.0.0-M33
+ 1.0.0-RC1
com.sun.mail
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1749423=1749422=1749423=diff
==
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Tue Jun 21 05:33:36 2016
@@ -181,29 +181,30 @@ public class LdapLoginManagement {
Dn baseDn = new
Dn(w.options.searchBase);
String searchQ =
String.format(w.options.searchQuery, login);
- EntryCursor cursor = new
EntryCursorImpl(w.conn.search(
+ try (EntryCursor cursor = new
EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
.setBase(baseDn)
.setFilter(searchQ)
.setScope(w.options.scope)
.addAttributes("*")
-
.setDerefAliases(w.options.derefMode)));
- while (cursor.next()) {
- try {
- Entry e = cursor.get();
- if (userDn != null) {
- log.error("more
than 1 user found in LDAP");
- throw new
OmException(-1L);
- }
- userDn = e.getDn();
- if
(w.options.useAdminForAttrs) {
- entry = e;
+
.setDerefAliases(w.options.derefMode
+ {
+ while (cursor.next()) {
+ try {
+ Entry e =
cursor.get();
+ if (userDn !=
null) {
+
log.error("more than 1 user found in LDAP");
+ throw
new OmException(-1L);
+ }
+ userDn =
e.getDn();
+ if
(w.options.useAdminForAttrs) {
+ entry =
e;
+ }
+ } catch
(CursorLdapReferralException cle) {
+
log.warn("Referral LDAP entry found, ignore it");
}
- } catch
(CursorLdapReferralException cle) {
-
[jira] [Commented] (OPENMEETINGS-1373) Library versions should be updated (3.2.0)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1373?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15341134#comment-15341134 ] ASF subversion and git services commented on OPENMEETINGS-1373: --- Commit 1749422 from [~solomax] in branch 'application/branches/3.2.x' [ https://svn.apache.org/r1749422 ] [OPENMEETINGS-1373] LDAP directory api version is updated > Library versions should be updated (3.2.0) > -- > > Key: OPENMEETINGS-1373 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1373 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.2.0 > > > Library versions should be keep up to date (continuous task) -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15341135#comment-15341135 ] ASF subversion and git services commented on OPENMEETINGS-980: -- Commit 1749423 from [~solomax] in branch 'application/trunk' [ https://svn.apache.org/r1749423 ] [OPENMEETINGS-980] LDAP directory api version is updated > Library versions should be updated > -- > > Key: OPENMEETINGS-980 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-980 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Library versions should be keep up to date (continuous task) -- This message was sent by Atlassian JIRA (v6.3.4#6332)
svn commit: r1749422 - in /openmeetings/application/branches/3.2.x/openmeetings-core: pom.xml src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Author: solomax
Date: Tue Jun 21 05:33:17 2016
New Revision: 1749422
URL: http://svn.apache.org/viewvc?rev=1749422=rev
Log:
[OPENMEETINGS-1373] LDAP directory api version is updated
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/pom.xml?rev=1749422=1749421=1749422=diff
==
--- openmeetings/application/branches/3.2.x/openmeetings-core/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/pom.xml Tue Jun
21 05:33:17 2016
@@ -86,7 +86,7 @@
org.apache.directory.api
api-all
- 1.0.0-M33
+ 1.0.0-RC1
com.sun.mail
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1749422=1749421=1749422=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Tue Jun 21 05:33:17 2016
@@ -181,29 +181,30 @@ public class LdapLoginManagement {
Dn baseDn = new
Dn(w.options.searchBase);
String searchQ =
String.format(w.options.searchQuery, login);
- EntryCursor cursor = new
EntryCursorImpl(w.conn.search(
+ try (EntryCursor cursor = new
EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
.setBase(baseDn)
.setFilter(searchQ)
.setScope(w.options.scope)
.addAttributes("*")
-
.setDerefAliases(w.options.derefMode)));
- while (cursor.next()) {
- try {
- Entry e = cursor.get();
- if (userDn != null) {
- log.error("more
than 1 user found in LDAP");
- throw new
OmException(-1L);
- }
- userDn = e.getDn();
- if
(w.options.useAdminForAttrs) {
- entry = e;
+
.setDerefAliases(w.options.derefMode
+ {
+ while (cursor.next()) {
+ try {
+ Entry e =
cursor.get();
+ if (userDn !=
null) {
+
log.error("more than 1 user found in LDAP");
+ throw
new OmException(-1L);
+ }
+ userDn =
e.getDn();
+ if
(w.options.useAdminForAttrs) {
+ entry =
e;
+ }
+ } catch
(CursorLdapReferralException cle) {
+
log.warn("Referral LDAP entry found, ignore it");
}
-
[jira] [Commented] (OPENMEETINGS-1360) Library versions should be updated (3.1.2)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1360?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15341133#comment-15341133 ] ASF subversion and git services commented on OPENMEETINGS-1360: --- Commit 1749421 from [~solomax] in branch 'application/branches/3.1.x' [ https://svn.apache.org/r1749421 ] [OPENMEETINGS-1360] LDAP directory api version is updated > Library versions should be updated (3.1.2) > -- > > Key: OPENMEETINGS-1360 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1360 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases >Affects Versions: 3.1.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.1.2 > > > Library versions should be keep up to date (continuous task) -- This message was sent by Atlassian JIRA (v6.3.4#6332)
svn commit: r1749421 - in /openmeetings/application/branches/3.1.x/openmeetings-core: pom.xml src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Author: solomax
Date: Tue Jun 21 05:32:47 2016
New Revision: 1749421
URL: http://svn.apache.org/viewvc?rev=1749421=rev
Log:
[OPENMEETINGS-1360] LDAP directory api version is updated
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml?rev=1749421=1749420=1749421=diff
==
--- openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml Tue Jun
21 05:32:47 2016
@@ -86,7 +86,7 @@
org.apache.directory.api
api-all
- 1.0.0-M33
+ 1.0.0-RC1
com.sun.mail
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1749421=1749420=1749421=diff
==
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Tue Jun 21 05:32:47 2016
@@ -181,29 +181,30 @@ public class LdapLoginManagement {
Dn baseDn = new
Dn(w.options.searchBase);
String searchQ =
String.format(w.options.searchQuery, login);
- EntryCursor cursor = new
EntryCursorImpl(w.conn.search(
+ try (EntryCursor cursor = new
EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
.setBase(baseDn)
.setFilter(searchQ)
.setScope(w.options.scope)
.addAttributes("*")
-
.setDerefAliases(w.options.derefMode)));
- while (cursor.next()) {
- try {
- Entry e = cursor.get();
- if (userDn != null) {
- log.error("more
than 1 user found in LDAP");
- throw new
OmException(-1L);
- }
- userDn = e.getDn();
- if
(w.options.useAdminForAttrs) {
- entry = e;
+
.setDerefAliases(w.options.derefMode
+ {
+ while (cursor.next()) {
+ try {
+ Entry e =
cursor.get();
+ if (userDn !=
null) {
+
log.error("more than 1 user found in LDAP");
+ throw
new OmException(-1L);
+ }
+ userDn =
e.getDn();
+ if
(w.options.useAdminForAttrs) {
+ entry =
e;
+ }
+ } catch
(CursorLdapReferralException cle) {
+
log.warn("Referral LDAP entry found, ignore it");
}
-
