package move to o.a.a.r module redback-rest-services

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

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultPasswordService.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -31,7 +31,7 @@ import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenti
 import org.apache.archiva.redback.rest.api.model.ErrorMessage;
 import org.apache.archiva.redback.rest.api.services.PasswordService;
 import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
-import org.codehaus.redback.rest.services.utils.PasswordValidator;
+import org.apache.archiva.redback.rest.services.utils.PasswordValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -53,7 +53,7 @@ import org.apache.archiva.redback.rest.api.model.Resource;
 import org.apache.archiva.redback.rest.api.model.User;
 import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
 import org.apache.archiva.redback.rest.api.services.UserService;
-import org.codehaus.redback.rest.services.utils.PasswordValidator;
+import org.apache.archiva.redback.rest.services.utils.PasswordValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUtilServices.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/RedbackAuthenticationThreadLocal.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/RedbackRequestInformation.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,8 +34,8 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
 import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
-import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
+import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal;
-import org.codehaus.redback.rest.services.RedbackRequestInformation;
+import org.apache.archiva.redback.rest.services.RedbackRequestInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PasswordRuleViolationExceptionMapper.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/RedbackServiceExceptionMapper.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.interceptors;
+package org.apache.archiva.redback.rest.services.interceptors;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,7 +26,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptor;
-import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
+import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/utils/EnvironmentChecker.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.utils;
+package org.apache.archiva.redback.rest.services.utils;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/utils/PasswordValidator.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.utils;
+package org.apache.archiva.redback.rest.services.utils;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml

@@ -37,7 +37,7 @@
 
   <context:annotation-config />
   <context:component-scan
-    base-package="org.codehaus.redback.rest.services"/>
+    base-package="org.apache.archiva.redback.rest.services"/>
 
   <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider">
     <property name="mapper" ref="redbackJacksonMapper"/>

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminService.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/LoginServiceTest.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services;
+package org.apache.archiva.redback.rest.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import org.apache.archiva.redback.rest.api.model.Operation;
 import org.apache.archiva.redback.rest.api.model.Permission;
 import org.apache.archiva.redback.rest.api.model.User;
 import org.apache.archiva.redback.rest.api.services.UserService;
-import org.codehaus.redback.rest.services.mock.EmailMessage;
+import org.apache.archiva.redback.rest.services.mock.EmailMessage;
-import org.codehaus.redback.rest.services.mock.ServicesAssert;
+import org.apache.archiva.redback.rest.services.mock.ServicesAssert;
 import org.junit.Test;
 
 import javax.ws.rs.core.MediaType;

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/DefaultServicesAssert.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.mock;
+package org.apache.archiva.redback.rest.services.mock;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -20,7 +20,6 @@ package org.codehaus.redback.rest.services.mock;
 
 import javax.inject.Inject;
 import javax.mail.internet.MimeMessage;
-import javax.ws.rs.Path;
 import java.util.ArrayList;
 import java.util.List;
 

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/EmailMessage.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.mock;
+package org.apache.archiva.redback.rest.services.mock;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockJavaMailSender.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.mock;
+package org.apache.archiva.redback.rest.services.mock;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/ServicesAssert.java

@@ -1,4 +1,4 @@
-package org.codehaus.redback.rest.services.mock;
+package org.apache.archiva.redback.rest.services.mock;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml

@@ -24,8 +24,6 @@
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
        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://cxf.apache.org/jaxrs
            http://cxf.apache.org/schemas/jaxrs.xsd">
 
@@ -53,12 +51,12 @@
 
    </jaxrs:server>
 
-  <bean name="fakeCreateAdminService" class="org.codehaus.redback.rest.services.FakeCreateAdminServiceImpl"/>
+  <bean name="fakeCreateAdminService" class="org.apache.archiva.redback.rest.services.FakeCreateAdminServiceImpl"/>
 
-  <bean name="mockJavaMailSender" class="org.codehaus.redback.rest.services.mock.MockJavaMailSender"/>
+  <bean name="mockJavaMailSender" class="org.apache.archiva.redback.rest.services.mock.MockJavaMailSender"/>
 
   <alias name="mockJavaMailSender" alias="mailSender"/>
 
-  <bean name="servicesAssert" class="org.codehaus.redback.rest.services.mock.DefaultServicesAssert"/>
+  <bean name="servicesAssert" class="org.apache.archiva.redback.rest.services.mock.DefaultServicesAssert"/>
 
 </beans>