svn commit: r1724378 [2/2] - in /openmeetings/application: branches/3.1.x/ branches/3.1.x/openmeetings-core/ branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/ branches/3.1.x/openmeetings-core/src/test/java/org/apache/ope...

[so...@apache.org]

Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/conf/om_ldap.cfg?rev=1724378&r1=1724377&r2=1724378&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/conf/om_ldap.cfg (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/conf/om_ldap.cfg Wed Jan 13 09:43:40 2016
@@ -81,6 +81,7 @@ ldap_group_query=(&(memberUid=%s)(object
 
 # Ldap user attributes mapping
 # Set the following internal OM user attributes to their corresponding Ldap-attribute
+ldap_user_attr_login=uid
 ldap_user_attr_lastname=sn
 ldap_user_attr_firstname=givenName
 ldap_user_attr_mail=mail
@@ -103,3 +104,6 @@ ldap_group_attr=memberOf
 
 # Ldap ignore upper/lower case, convert all input to lower case
 ldap_use_lower_case=false
+
+# Ldap import query, this query should retrieve all LDAP users
+ldap_import_query=(objectClass=inetOrgPerson)

Modified: openmeetings/application/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1724378&r1=1724377&r2=1724378&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Wed Jan 13 09:43:40 2016
@@ -57,6 +57,7 @@
 		<skip.site.copy>true</skip.site.copy>
 		<src.pack.skip>false</src.pack.skip>
 		<tomcat.version>8.0.28</tomcat.version>
+		<derby.version>10.12.1.1</derby.version>
 	</properties>
 	<modules>
 		<module>openmeetings-util</module>