Merge remote-tracking branch 'origin/gs-2.12.1'

georchestra · Feb 7, 2018 · 485c19f · 485c19f
2 parents 4a10f3b + 725ac62
commit 485c19f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/security/role/my_ldap/config.xml b/security/role/my_ldap/config.xml
@@ -1,4 +1,4 @@
-<org.geoserver.security.ldap.config.LDAPRoleServiceConfig>
+<org.geoserver.security.ldap.LDAPRoleServiceConfig>
   <id>-189534bb:153ae737769:-7ff2</id>
   <name>my_ldap</name>
   <className>org.geoserver.security.ldap.LDAPRoleService</className>
@@ -10,4 +10,4 @@
   <bindBeforeGroupSearch>true</bindBeforeGroupSearch>
   <user>cn=admin,dc=georchestra,dc=org</user>
   <password>secret</password>
-</org.geoserver.security.ldap.config.LDAPRoleServiceConfig>
+</org.geoserver.security.ldap.LDAPRoleServiceConfig>
diff --git a/security/usergroup/my_ldap/config.xml b/security/usergroup/my_ldap/config.xml
@@ -1,4 +1,4 @@
-<org.geoserver.security.ldap.config.LDAPUserGroupServiceConfig>
+<org.geoserver.security.ldap.LDAPUserGroupServiceConfig>
   <id>52684add:153ae61eaf4:-7ff0</id>
   <name>my_ldap</name>
   <className>org.geoserver.security.ldap.LDAPUserGroupService</className>
@@ -15,4 +15,4 @@
   <password>secret</password>
   <passwordEncoderName>emptyPasswordEncoder</passwordEncoderName>
   <passwordPolicyName>default</passwordPolicyName>
-</org.geoserver.security.ldap.config.LDAPUserGroupServiceConfig>
+</org.geoserver.security.ldap.LDAPUserGroupServiceConfig>