package move to o.a.a.r module redback-users-ldap

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310834 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 20 insertions, 18 deletions

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/LdapUserManager.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
index 7a2152e0f..4d84a386d 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/LdapUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap;
+package org.apache.archiva.redback.users.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,9 +30,9 @@ import org.codehaus.plexus.redback.common.ldap.connection.LdapConnection;
 import org.codehaus.plexus.redback.common.ldap.connection.LdapConnectionFactory;
 import org.codehaus.plexus.redback.common.ldap.connection.LdapException;
 import org.apache.archiva.redback.users.UserQuery;
-import org.codehaus.plexus.redback.users.ldap.ctl.LdapController;
-import org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerException;
-import org.codehaus.plexus.redback.users.ldap.service.LdapCacheService;
+import org.apache.archiva.redback.users.ldap.ctl.LdapController;
+import org.apache.archiva.redback.users.ldap.ctl.LdapControllerException;
+import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/LdapUserQuery.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserQuery.java
index 67c34d143..93b0748b5 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/LdapUserQuery.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserQuery.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap;
+package org.apache.archiva.redback.users.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/DefaultLdapController.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
index bd2af80f0..cca85ad06 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/DefaultLdapController.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap.ctl;
+package org.apache.archiva.redback.users.ldap.ctl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -39,7 +39,7 @@ import org.codehaus.plexus.redback.common.ldap.LdapUser;
 import org.codehaus.plexus.redback.common.ldap.LdapUserMapper;
 import org.codehaus.plexus.redback.common.ldap.MappingException;
 import org.codehaus.plexus.redback.common.ldap.UserMapper;
-import org.codehaus.plexus.redback.users.ldap.LdapUserQuery;
+import org.apache.archiva.redback.users.ldap.LdapUserQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -191,7 +191,7 @@ public class DefaultLdapController
     }
     
    /**
-    * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUsersByQuery(org.codehaus.plexus.redback.users.ldap.LdapUserQuery, javax.naming.directory.DirContext)
+    * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUsersByQuery(org.apache.archiva.redback.users.ldap.LdapUserQuery, javax.naming.directory.DirContext)
     */
    public List<User> getUsersByQuery( LdapUserQuery query, DirContext context )
        throws LdapControllerException, MappingException
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/LdapController.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
index 197417077..702028c03 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/LdapController.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap.ctl;
+package org.apache.archiva.redback.users.ldap.ctl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.codehaus.plexus.redback.users.ldap.ctl;
 import org.apache.archiva.redback.users.User;
 import org.codehaus.plexus.redback.common.ldap.LdapUser;
 import org.codehaus.plexus.redback.common.ldap.MappingException;
-import org.codehaus.plexus.redback.users.ldap.LdapUserQuery;
+import org.apache.archiva.redback.users.ldap.LdapUserQuery;
 
 import javax.naming.directory.DirContext;
 import java.util.Collection;
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/LdapControllerException.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapControllerException.java
index 5fd9529ef..3afcab8d1 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/LdapControllerException.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapControllerException.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap.ctl;
+package org.apache.archiva.redback.users.ldap.ctl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/service/DefaultLdapCacheService.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
index af59a3fee..d43d84755 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/service/DefaultLdapCacheService.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap.service;
+package org.apache.archiva.redback.users.ldap.service;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.users.ldap.service;
  * under the License.
  */
 
+import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
 import org.codehaus.plexus.cache.builder.CacheBuilder;
 import org.codehaus.plexus.redback.common.ldap.LdapUser;
 import org.springframework.stereotype.Service;
@@ -97,7 +98,7 @@ public class DefaultLdapCacheService
     }
 
     /**
-     * @see org.codehaus.plexus.redback.users.ldap.service.LdapCacheService#removeAllLdapUserDn()
+     * @see org.apache.archiva.redback.users.ldap.service.LdapCacheService#removeAllLdapUserDn()
      */
     public void removeAllLdapUserDn()
     {
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/service/LdapCacheService.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/LdapCacheService.java
index 44af35e18..642ac41da 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/service/LdapCacheService.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/LdapCacheService.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap.service;
+package org.apache.archiva.redback.users.ldap.service;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
index 4daa87b8d..0cccd673f 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
@@ -29,7 +29,7 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.users.ldap"/>
+    base-package="org.apache.archiva.redback.users.ldap"/>
 
   <!-- REDBACK-289/MRM-1488 -->
   <!-- Cache for LDAP users. Data is refreshed every 3 mins. -->
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/codehaus/plexus/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 2e2b50ab8..d9bb76606 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/codehaus/plexus/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
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap;
+package org.apache.archiva.redback.users.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +27,7 @@ import org.codehaus.plexus.redback.policy.PasswordEncoder;
 import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.users.ldap.service.LdapCacheService;
+import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
 import org.codehaus.redback.components.apacheds.ApacheDs;
 import org.junit.After;
 import org.junit.Before;
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/codehaus/plexus/redback/users/ldap/service/LdapCacheServiceTest.java b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
index 67bf5767f..b27d72cc6 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/codehaus/plexus/redback/users/ldap/service/LdapCacheServiceTest.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.ldap.service;
+package org.apache.archiva.redback.users.ldap.service;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.codehaus.plexus.redback.users.ldap.service;
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
 import org.codehaus.plexus.redback.common.ldap.LdapUser;
 import org.junit.After;
 import org.junit.Test;