fix name as it is related to Redback and not to Archiva

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

5 files changed, 13 insertions, 13 deletions

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java
index 5a97f04a8..667a48351 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java
@@ -38,7 +38,7 @@ import java.util.List;
  * @since 1.4-M4
  */
 @Path("/archivaRuntimeConfigurationService/")
-public interface ArchivaRuntimeConfigurationService
+public interface RedbackRuntimeConfigurationService
 {
     @Path("redbackRuntimeConfiguration")
     @GET
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 46dbae3fd..362f093d8 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -33,7 +33,7 @@ import org.apache.archiva.redback.policy.PasswordRule;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.rest.api.model.UserManagerImplementationInformation;
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
-import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService;
+import org.apache.archiva.rest.api.services.RedbackRuntimeConfigurationService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -53,9 +53,9 @@ import java.util.Properties;
  * @since 1.4-M4
  */
 @Service("archivaRuntimeConfigurationService#rest")
-public class DefaultArchivaRuntimeConfigurationService
+public class DefaultRedbackRuntimeConfigurationService
     extends AbstractRestService
-    implements ArchivaRuntimeConfigurationService
+    implements RedbackRuntimeConfigurationService
 {
     @Inject
     private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
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 523279de7..25b098057 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
@@ -23,7 +23,7 @@ import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.common.utils.FileUtil;
 import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
 import org.apache.archiva.rest.api.services.ArchivaAdministrationService;
-import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService;
+import org.apache.archiva.rest.api.services.RedbackRuntimeConfigurationService;
 import org.apache.archiva.rest.api.services.BrowseService;
 import org.apache.archiva.rest.api.services.CommonServices;
 import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
@@ -223,11 +223,11 @@ public abstract class AbstractArchivaRestTest
         return service;
     }
 
-    protected ArchivaRuntimeConfigurationService getArchivaRuntimeConfigurationService()
+    protected RedbackRuntimeConfigurationService getArchivaRuntimeConfigurationService()
     {
-        ArchivaRuntimeConfigurationService service = JAXRSClientFactory.create(
+        RedbackRuntimeConfigurationService service = JAXRSClientFactory.create(
             getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/",
-            ArchivaRuntimeConfigurationService.class, Collections.singletonList( new JacksonJaxbJsonProvider() ) );
+            RedbackRuntimeConfigurationService.class, Collections.singletonList( new JacksonJaxbJsonProvider() ) );
 
         WebClient.client( service ).accept( MediaType.APPLICATION_JSON_TYPE );
         WebClient.client( service ).type( MediaType.APPLICATION_JSON_TYPE );
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
index 12034c7cc..5f221cf9e 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.rest.services;
 
 import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
 import org.apache.archiva.rest.api.model.UserManagerImplementationInformation;
-import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService;
+import org.apache.archiva.rest.api.services.RedbackRuntimeConfigurationService;
 import org.fest.assertions.api.Assertions;
 import org.junit.Test;
 
@@ -64,7 +64,7 @@ public class ArchivaRuntimeConfigurationServiceTest
     public void usermanagersinformations()
         throws Exception
     {
-        ArchivaRuntimeConfigurationService service = getArchivaRuntimeConfigurationService();
+        RedbackRuntimeConfigurationService service = getArchivaRuntimeConfigurationService();
         List<UserManagerImplementationInformation> infos = service.getUserManagerImplementationInformations();
         Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains(
             new UserManagerImplementationInformation( "jdo", null, false ) );
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
index 5ea7b915f..a40e698d2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
@@ -19,7 +19,7 @@ package org.apache.archiva.web.api;
  */
 
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
-import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService;
+import org.apache.archiva.rest.api.services.RedbackRuntimeConfigurationService;
 import org.apache.archiva.web.runtime.ArchivaRuntimeInfo;
 import org.apache.archiva.web.model.ApplicationRuntimeInfo;
 import org.apache.commons.lang.StringUtils;
@@ -47,7 +47,7 @@ public class DefaultRuntimeInfoService
     private ArchivaRuntimeInfo archivaRuntimeInfo;
 
     @Inject
-    private ArchivaRuntimeConfigurationService archivaRuntimeConfigurationService;
+    private RedbackRuntimeConfigurationService redbackRuntimeConfigurationService;
 
     @Context
     protected HttpServletRequest httpServletRequest;
@@ -72,7 +72,7 @@ public class DefaultRuntimeInfoService
         applicationRuntimeInfo.setTimestampStr( sfd.format( new Date( archivaRuntimeInfo.getTimestamp() ) ) );
 
         applicationRuntimeInfo.setRedbackRuntimeConfiguration(
-            archivaRuntimeConfigurationService.getRedbackRuntimeConfiguration() );
+            redbackRuntimeConfigurationService.getRedbackRuntimeConfiguration() );
 
         return applicationRuntimeInfo;
     }