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

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

15 files changed, 17 insertions, 18 deletions

diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/LdapUser.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java
index 0d7d2d865..5622236bb 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/LdapUser.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
index 7326ff461..1faf5eb62 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/LdapUtils.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
index eecf1cba7..9c12c270e 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/LdapUtils.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/MappingException.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/MappingException.java
index 777850814..1345a5e7f 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/MappingException.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/MappingException.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/UserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java
index 124b2f2e4..25146343d 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/UserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/UserUpdate.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java
index 83c0c1352..2249cdaf6 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/UserUpdate.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
index 2537509b0..6e784c9f5 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap.connection;
+package org.apache.archiva.redback.common.ldap.connection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapConnection.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
index 61964d762..1d64074b4 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapConnection.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap.connection;
+package org.apache.archiva.redback.common.ldap.connection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapConnectionConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
index 1fb0f59c8..64c298b44 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapConnectionConfiguration.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap.connection;
+package org.apache.archiva.redback.common.ldap.connection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
index f25e9232b..3821adfc4 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap.connection;
+package org.apache.archiva.redback.common.ldap.connection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapException.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapException.java
index 2241a7716..654f95aa0 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/codehaus/plexus/redback/common/ldap/connection/LdapException.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapException.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap.connection;
+package org.apache.archiva.redback.common.ldap.connection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml b/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml
index 93f3a6276..c74909858 100644
--- a/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml
+++ b/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml
@@ -28,6 +28,6 @@
        default-lazy-init="true">
 
   <context:annotation-config />
-  <context:component-scan base-package="org.codehaus.plexus.redback.common.ldap"/>
+  <context:component-scan base-package="org.apache.archiva.redback.common.ldap"/>
  
 </beans>
\ No newline at end of file
diff --git a/redback-common/redback-common-ldap/src/test/java/org/codehaus/plexus/redback/common/ldap/LdapUserMapperTest.java b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
index cc44d3909..56d475fc2 100644
--- a/redback-common/redback-common-ldap/src/test/java/org/codehaus/plexus/redback/common/ldap/LdapUserMapperTest.java
+++ b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap;
+package org.apache.archiva.redback.common.ldap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.codehaus.plexus.redback.common.ldap;
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.common.ldap.LdapUserMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/redback-common/redback-common-ldap/src/test/java/org/codehaus/plexus/redback/common/ldap/connection/ConfigurableLdapConnectionFactoryTest.java b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactoryTest.java
index ba849e307..f76b1cf91 100644
--- a/redback-common/redback-common-ldap/src/test/java/org/codehaus/plexus/redback/common/ldap/connection/ConfigurableLdapConnectionFactoryTest.java
+++ b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactoryTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.common.ldap.connection;
+package org.apache.archiva.redback.common.ldap.connection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.codehaus.plexus.redback.common.ldap.connection;
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
index 817b798bb..a4ed12b68 100644
--- a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
+++ b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
@@ -20,11 +20,8 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
   <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
     <property name="configs">