From eb518f3320ed5836f67359c735ed9f8d4dae1a03 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 8 Apr 2012 20:39:11 +0000 Subject: [PATCH] move to package o.a.a.r redback module redback-rest-services git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311089 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/rest/services/AbstractRestService.java | 4 ++-- .../apache/archiva/rest/services/AbstractArchivaRestTest.java | 2 +- .../webapp/ui/services/api/RuntimeInfoServiceTest.java | 2 +- .../org/apache/archiva/web/action/AbstractActionSupport.java | 2 +- .../org/apache/archiva/web/action/DeleteArtifactAction.java | 2 +- .../test/java/org/apache/archiva/AbstractDownloadTest.java | 2 +- .../test/java/org/apache/archiva/DownloadMergedIndexTest.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index 63bdda28f..089d15060 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -29,8 +29,8 @@ import org.apache.archiva.security.UserRepositories; import org.apache.commons.lang.StringUtils; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; -import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal; -import org.codehaus.redback.rest.services.RedbackRequestInformation; +import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal; +import org.apache.archiva.redback.rest.services.RedbackRequestInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java index 689316efc..ebf401d4d 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java @@ -38,7 +38,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.redback.rest.services.AbstractRestServicesTest; +import org.apache.archiva.redback.rest.services.AbstractRestServicesTest; import org.junit.Before; import javax.ws.rs.core.MediaType; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java b/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java index cce205c40..aed5b3f93 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java @@ -23,7 +23,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.redback.rest.services.AbstractRestServicesTest; +import org.apache.archiva.redback.rest.services.AbstractRestServicesTest; import org.junit.Before; import org.junit.Test; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java index c3eb99b00..e092fe319 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java @@ -32,7 +32,7 @@ import org.apache.archiva.web.runtime.ArchivaRuntimeInfo; import org.apache.commons.lang.StringUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.SessionAware; -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.context.ApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/DeleteArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/DeleteArtifactAction.java index 1117df07f..cf75f986d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/DeleteArtifactAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/DeleteArtifactAction.java @@ -33,7 +33,7 @@ import org.apache.archiva.security.ArchivaSecurityException; import org.apache.archiva.security.PrincipalNotFoundException; import org.apache.archiva.security.UserRepositories; import org.apache.commons.lang.StringUtils; -import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal; +import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java index 4d3a2c26c..cb7e0e5b2 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java @@ -36,7 +36,7 @@ import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants import org.apache.archiva.redback.rest.api.model.User; import org.apache.archiva.redback.rest.api.services.RoleManagementService; import org.apache.archiva.redback.rest.api.services.UserService; -import org.codehaus.redback.rest.services.FakeCreateAdminService; +import org.apache.archiva.redback.rest.services.FakeCreateAdminService; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.session.SessionHandler; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java index b2547844f..2870185aa 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java @@ -31,7 +31,7 @@ import org.apache.archiva.rest.api.services.RepositoryGroupService; import org.apache.archiva.rest.api.services.SearchService; import org.apache.commons.io.FileUtils; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; -import org.codehaus.redback.rest.services.FakeCreateAdminService; +import org.apache.archiva.redback.rest.services.FakeCreateAdminService; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass;