Merge branch 'appng-manager-1.18.x'

appNG · Oct 13, 2021 · 7136748 · 7136748
2 parents 1eb3b5f + be89916
commit 7136748
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>appng-manager</artifactId>
 	<packaging>jar</packaging>
 	<name>appNG Manager</name>
-	<version>1.18.0</version>
+	<version>1.18.1</version>
 	<description><![CDATA[Global appNG administration]]></description>
 	<url>https://appng.org</url>
 
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.appng</groupId>
 		<artifactId>appng-application-parent</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.23.0</version>
 	</parent>
 
 	<scm>

diff --git a/src/main/java/org/appng/application/manager/business/LdapUsers.java b/src/main/java/org/appng/application/manager/business/LdapUsers.java
@@ -67,6 +67,7 @@ public DataContainer getData(Site site, Application application, Environment env
 			ldapProps.add(ldapHost);
 			ldapProps.add(getProperty(siteProps, LdapService.LDAP_DOMAIN));
 			ldapProps.add(getProperty(siteProps, LdapService.LDAP_GROUP_BASE_DN));
+			ldapProps.add(getProperty(siteProps, LdapService.LDAP_USER_BASE_DN));
 			SimpleProperty ldapUser = getProperty(siteProps, LdapService.LDAP_USER);
 			ldapProps.add(ldapUser);
 			ldapProps.add(getProperty(siteProps, LdapService.LDAP_ID_ATTRIBUTE));

diff --git a/src/test/java/org/appng/application/manager/business/PlatformPropertiesTest.java b/src/test/java/org/appng/application/manager/business/PlatformPropertiesTest.java
@@ -23,8 +23,8 @@
 import org.appng.api.ProcessingException;
 import org.appng.api.SiteProperties;
 import org.appng.api.model.Property;
-import org.appng.api.model.SimpleProperty;
 import org.appng.api.model.Property.Type;
+import org.appng.api.model.SimpleProperty;
 import org.appng.api.support.CallableAction;
 import org.appng.api.support.CallableDataSource;
 import org.appng.application.manager.form.PropertyForm;

diff --git a/src/test/java/org/appng/application/manager/business/webservice/LogViewerTest.java b/src/test/java/org/appng/application/manager/business/webservice/LogViewerTest.java
@@ -23,7 +23,6 @@
 import org.appng.api.PermissionProcessor;
 import org.appng.api.Request;
 import org.appng.api.model.Subject;
-import org.appng.application.manager.business.webservice.LogViewer;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

diff --git a/src/test/resources/xml/LdapUsersTest-testSettings.xml b/src/test/resources/xml/LdapUsersTest-testSettings.xml
@@ -12,7 +12,7 @@
 		</meta-data>
 	</config>
 	<data paginate="false">
-		<resultset chunk="0" chunkname="ldapSettings" chunksize="8" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="8">
+		<resultset chunk="0" chunkname="ldapSettings" chunksize="9" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="9">
 			<result>
 				<field name="name" type="text">
 					<value>ldapDisabled</value>
@@ -45,6 +45,14 @@
 					<value></value>
 				</field>
 			</result>
+			<result>
+				<field name="name" type="text">
+					<value>ldapUserBaseDn</value>
+				</field>
+				<field name="value" type="text">
+					<value></value>
+				</field>
+			</result>
 			<result>
 				<field name="name" type="text">
 					<value>ldapUser</value>