This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
The following commit(s) were added to refs/heads/master by this push:
new 77cfa74 Changing references after spring-apacheds package renaming
77cfa74 is described below
commit 77cfa744d35980736db580e89d355cccd3e2507b
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Nov 17 12:34:45 2019 +0100
Changing references after spring-apacheds package renaming
---
.../archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java | 2 +-
.../src/test/resources/META-INF/spring-context.xml | 2 +-
.../apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java | 2 +-
.../src/test/resources/spring-context-role-mapper.xml | 2 +-
.../archiva/redback/rest/services/LdapGroupMappingServiceTest.java | 2 +-
.../redback-rest-services/src/test/resources/ldap-spring-test.xml | 2 +-
.../java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java | 2 +-
.../redback-rbac-ldap/src/test/resources/spring-context.xml | 2 +-
.../org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java | 3 +--
.../redback-users-ldap/src/test/resources/spring-context.xml | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
index 4da47c0..84ee8be 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
@@ -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;
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
index c32048f..5f1216d 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
@@ -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}"/>
diff --git
a/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
index a0e55ad..1f1c191 100644
---
a/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
+++
b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
@@ -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;
diff --git
a/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
b/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
index 72cacfe..a246630 100755
---
a/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
+++
b/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
@@ -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}"/>
diff --git
a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/LdapGroupMappingServiceTest.java
b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/LdapGroupMappingServiceTest.java
index d06b6df..a801e94 100644
---
a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/LdapGroupMappingServiceTest.java
+++
b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/LdapGroupMappingServiceTest.java
@@ -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;
diff --git
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
index d612b87..3130f1f 100644
---
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
+++
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
@@ -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}"/>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java
index 68d1397..4d14226 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java
@@ -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;
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
index 376a520..efa7bae 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
@@ -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}"/>
diff --git
a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
index 89f6b16..88ea922 100644
---
a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
+++
b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
@@ -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;
diff --git
a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
index aa90e62..097b627 100644
---
a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
@@ -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}"/>
