other repackaging to o.a.a.r

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

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 790bfe4951b82efb7482a3d2ad78e191e3503cdd..edb19e7144b288cdee0ca01dfd4698692d18679c 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -377,7 +377,7 @@ public class DefaultUserService
         String[] caches = cacheManager.getCacheNames();
         for ( String cacheName : caches )
         {
-            if ( StringUtils.startsWith( cacheName, "org.codehaus.plexus.redback.rbac.jdo" ) )
+            if ( StringUtils.startsWith( cacheName, "org.apache.archiva.redback.rbac.jdo" ) )
             {
                 cacheManager.getCache( cacheName ).removeAll();
             }

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/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 5ada8b58d6f1e4d75838c71559367f3c242f8919..2defa036fff696d69dc833a54b4327da3546aa7e 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/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
@@ -60,7 +60,7 @@ public class DefaultLdapController
     private UserMapper mapper;
 
     /**
-        * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#removeUser(java.lang.Object, javax.naming.directory.DirContext)
+        * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#removeUser(java.lang.Object, javax.naming.directory.DirContext)
         */
     public void removeUser( Object principal, DirContext context )
         throws LdapControllerException
@@ -69,7 +69,7 @@ public class DefaultLdapController
     }
 
     /**
-        * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#updateUser(org.apache.archiva.redback.users.User, javax.naming.directory.DirContext)
+        * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#updateUser(org.apache.archiva.redback.users.User, javax.naming.directory.DirContext)
         */
     public void updateUser( User user, DirContext context )
         throws LdapControllerException, MappingException
@@ -78,7 +78,7 @@ public class DefaultLdapController
     }
 
     /**
-        * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#userExists(java.lang.Object, javax.naming.directory.DirContext)
+        * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#userExists(java.lang.Object, javax.naming.directory.DirContext)
         */
     public boolean userExists( Object key, DirContext context )
         throws LdapControllerException
@@ -150,7 +150,7 @@ public class DefaultLdapController
     }
 
     /**
-        * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUsers(javax.naming.directory.DirContext)
+        * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#getUsers(javax.naming.directory.DirContext)
         */
     public Collection<User> getUsers( DirContext context )
         throws LdapControllerException, MappingException
@@ -191,7 +191,7 @@ public class DefaultLdapController
     }
     
    /**
-    * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUsersByQuery(org.apache.archiva.redback.users.ldap.LdapUserQuery, javax.naming.directory.DirContext)
+    * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#getUsersByQuery(org.apache.archiva.redback.users.ldap.LdapUserQuery, javax.naming.directory.DirContext)
     */
    public List<User> getUsersByQuery( LdapUserQuery query, DirContext context )
        throws LdapControllerException, MappingException
@@ -232,7 +232,7 @@ public class DefaultLdapController
    }
 
     /**
-        * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#createUser(org.apache.archiva.redback.users.User, javax.naming.directory.DirContext, boolean)
+        * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#createUser(org.apache.archiva.redback.users.User, javax.naming.directory.DirContext, boolean)
         */
     public void createUser( User user, DirContext context, boolean encodePasswordIfChanged )
         throws LdapControllerException, MappingException
@@ -250,7 +250,7 @@ public class DefaultLdapController
     }
 
     /**
-        * @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUser(java.lang.Object, javax.naming.directory.DirContext)
+        * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#getUser(java.lang.Object, javax.naming.directory.DirContext)
         */
     public LdapUser getUser( Object key, DirContext context )
         throws LdapControllerException, MappingException