Changing references after spring-apacheds package renaming

This commit is contained in:
Martin Stockhammer 2019-11-17 12:34:45 +01:00
parent 73d9a56363
commit 77cfa744d3
10 changed files with 10 additions and 11 deletions

View File

@ -25,7 +25,7 @@ import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationData
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.apache.archiva.redback.components.apacheds.ApacheDs;
import org.apache.archiva.components.apacheds.ApacheDs;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

View File

@ -28,7 +28,7 @@
<context:property-placeholder system-properties-mode="OVERRIDE"/>
<bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
<bean name="apacheDS#test" class="org.apache.archiva.components.apacheds.DefaultApacheDs"
scope="prototype">
<property name="basedir" value="${basedir}/target/apacheds"/>
<property name="port" value="${ldapPort}"/>

View File

@ -22,7 +22,7 @@ package org.apache.archiva.redback.common.ldap.role;
import junit.framework.TestCase;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.components.apacheds.ApacheDs;
import org.apache.archiva.components.apacheds.ApacheDs;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import static org.assertj.core.api.Assertions.assertThat;

View File

@ -46,7 +46,7 @@
</property>
</bean>
<bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
<bean name="apacheDS#test" class="org.apache.archiva.components.apacheds.DefaultApacheDs"
scope="prototype">
<property name="basedir" value="${basedir}/target/apacheds"/>
<property name="port" value="${ldapPort}"/>

View File

@ -18,7 +18,7 @@ package org.apache.archiva.redback.rest.services;
* under the License.
*/
import org.apache.archiva.redback.components.apacheds.ApacheDs;
import org.apache.archiva.components.apacheds.ApacheDs;
import org.apache.archiva.redback.rest.api.model.LdapGroupMapping;
import org.apache.archiva.redback.rest.api.services.LdapGroupMappingService;
import org.apache.commons.lang.StringUtils;

View File

@ -46,7 +46,7 @@
</property>
</bean>
<bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
<bean name="apacheDS#test" class="org.apache.archiva.components.apacheds.DefaultApacheDs"
scope="prototype">
<property name="basedir" value="${basedir}/target/apacheds"/>
<property name="port" value="${ldapPort}"/>

View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.rbac.ldap;
* under the License.
*/
import org.apache.archiva.redback.components.apacheds.ApacheDs;
import org.apache.archiva.components.apacheds.ApacheDs;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.rbac.Role;

View File

@ -32,7 +32,7 @@
<alias name="rbacManager#memory" alias="rbacManager#default"/>
<alias name="userManager#ldap" alias="userManager#default"/>
<bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
<bean name="apacheDS#test" class="org.apache.archiva.components.apacheds.DefaultApacheDs"
scope="prototype">
<property name="basedir" value="${basedir}/target/apacheds"/>
<property name="port" value="${ldapPort}"/>

View File

@ -23,13 +23,12 @@ import junit.framework.TestCase;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.apache.archiva.redback.components.apacheds.ApacheDs;
import org.apache.archiva.components.apacheds.ApacheDs;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

View File

@ -28,7 +28,7 @@
<context:property-placeholder system-properties-mode="OVERRIDE"/>
<bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
<bean name="apacheDS#test" class="org.apache.archiva.components.apacheds.DefaultApacheDs"
scope="prototype">
<property name="basedir" value="${basedir}/target/apacheds"/>
<property name="port" value="${ldapPort}"/>