Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-12-20 20:34:09 +00:00
parent c3e33b9670
commit 81630ab9f8
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java → archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java
View File

@ -38,7 +38,7 @@ import java.util.List;
* @since 1.4-M4 * @since 1.4-M4
*/ */
@Path("/archivaRuntimeConfigurationService/") @Path("/archivaRuntimeConfigurationService/")
public interface ArchivaRuntimeConfigurationService public interface RedbackRuntimeConfigurationService
{ {
@Path("redbackRuntimeConfiguration") @Path("redbackRuntimeConfiguration")
@GET @GET

6
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java → archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
View File

@ -33,7 +33,7 @@ import org.apache.archiva.redback.policy.PasswordRule;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.rest.api.model.UserManagerImplementationInformation; import org.apache.archiva.rest.api.model.UserManagerImplementationInformation;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException; 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.apache.commons.lang.StringUtils;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -53,9 +53,9 @@ import java.util.Properties;
* @since 1.4-M4 * @since 1.4-M4
*/ */
@Service("archivaRuntimeConfigurationService#rest") @Service("archivaRuntimeConfigurationService#rest")
public class DefaultArchivaRuntimeConfigurationService public class DefaultRedbackRuntimeConfigurationService
extends AbstractRestService extends AbstractRestService
implements ArchivaRuntimeConfigurationService implements RedbackRuntimeConfigurationService
{ {
@Inject @Inject
private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin; private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;

8
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
View File

@ -23,7 +23,7 @@ import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.utils.FileUtil; import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.redback.rest.services.AbstractRestServicesTest; import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
import org.apache.archiva.rest.api.services.ArchivaAdministrationService; 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.BrowseService;
import org.apache.archiva.rest.api.services.CommonServices; import org.apache.archiva.rest.api.services.CommonServices;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService; import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
@ -223,11 +223,11 @@ public abstract class AbstractArchivaRestTest
return service; return service;
} }
protected ArchivaRuntimeConfigurationService getArchivaRuntimeConfigurationService() protected RedbackRuntimeConfigurationService getArchivaRuntimeConfigurationService()
{ {
ArchivaRuntimeConfigurationService service = JAXRSClientFactory.create( RedbackRuntimeConfigurationService service = JAXRSClientFactory.create(
getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/", 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 ).accept( MediaType.APPLICATION_JSON_TYPE );
WebClient.client( service ).type( MediaType.APPLICATION_JSON_TYPE ); WebClient.client( service ).type( MediaType.APPLICATION_JSON_TYPE );

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.rest.services;
import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
import org.apache.archiva.rest.api.model.UserManagerImplementationInformation; 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.fest.assertions.api.Assertions;
import org.junit.Test; import org.junit.Test;
@ -64,7 +64,7 @@ public class ArchivaRuntimeConfigurationServiceTest
public void usermanagersinformations() public void usermanagersinformations()
throws Exception throws Exception
{ {
ArchivaRuntimeConfigurationService service = getArchivaRuntimeConfigurationService(); RedbackRuntimeConfigurationService service = getArchivaRuntimeConfigurationService();
List<UserManagerImplementationInformation> infos = service.getUserManagerImplementationInformations(); List<UserManagerImplementationInformation> infos = service.getUserManagerImplementationInformations();
Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains( Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains(
new UserManagerImplementationInformation( "jdo", null, false ) ); new UserManagerImplementationInformation( "jdo", null, false ) );

6
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
View File

@ -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.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.runtime.ArchivaRuntimeInfo;
import org.apache.archiva.web.model.ApplicationRuntimeInfo; import org.apache.archiva.web.model.ApplicationRuntimeInfo;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -47,7 +47,7 @@ public class DefaultRuntimeInfoService
private ArchivaRuntimeInfo archivaRuntimeInfo; private ArchivaRuntimeInfo archivaRuntimeInfo;
@Inject @Inject
private ArchivaRuntimeConfigurationService archivaRuntimeConfigurationService; private RedbackRuntimeConfigurationService redbackRuntimeConfigurationService;
@Context @Context
protected HttpServletRequest httpServletRequest; protected HttpServletRequest httpServletRequest;
@ -72,7 +72,7 @@ public class DefaultRuntimeInfoService
applicationRuntimeInfo.setTimestampStr( sfd.format( new Date( archivaRuntimeInfo.getTimestamp() ) ) ); applicationRuntimeInfo.setTimestampStr( sfd.format( new Date( archivaRuntimeInfo.getTimestamp() ) ) );
applicationRuntimeInfo.setRedbackRuntimeConfiguration( applicationRuntimeInfo.setRedbackRuntimeConfiguration(
archivaRuntimeConfigurationService.getRedbackRuntimeConfiguration() ); redbackRuntimeConfigurationService.getRedbackRuntimeConfiguration() );
return applicationRuntimeInfo; return applicationRuntimeInfo;
} }