From f11c956b8b4a1996d70e9ec948f255e0fab188ac Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 18 Dec 2012 21:19:43 +0000 Subject: [PATCH] fix naming use redback as part of the name as it concerns redback only git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1423666 13f79535-47bb-0310-9956-ffa450edef68 --- .../ArchivaRuntimeConfigurationService.java | 6 +++--- .../DefaultArchivaRuntimeConfigurationService.java | 4 ++-- .../ArchivaRuntimeConfigurationServiceTest.java | 8 ++++---- .../org/apache/archiva/i18n/default.properties | 5 ++--- .../src/main/webapp/js/archiva/general-admin.js | 13 ++++++------- .../webapp/js/templates/archiva/general-admin.html | 10 +++++----- 6 files changed, 22 insertions(+), 24 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/ArchivaRuntimeConfigurationService.java index 60e1b550b..68779f5ed 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/ArchivaRuntimeConfigurationService.java @@ -40,11 +40,11 @@ import java.util.List; @Path("/archivaRuntimeConfigurationService/") public interface ArchivaRuntimeConfigurationService { - @Path("archivaRuntimeConfiguration") + @Path("redbackRuntimeConfiguration") @GET @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION) - RedbackRuntimeConfiguration getArchivaRuntimeConfigurationAdmin() + RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin() throws ArchivaRestServiceException; @Path("redbackRuntimeConfiguration") @@ -52,7 +52,7 @@ public interface ArchivaRuntimeConfigurationService @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION) - Boolean updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) + Boolean updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws ArchivaRestServiceException; @Path("userManagerImplementationInformation") 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/DefaultArchivaRuntimeConfigurationService.java index bd4a4dd23..e949e0281 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/DefaultArchivaRuntimeConfigurationService.java @@ -71,7 +71,7 @@ public class DefaultArchivaRuntimeConfigurationService @Named(value = "ldapConnectionFactory#configurable") private LdapConnectionFactory ldapConnectionFactory; - public RedbackRuntimeConfiguration getArchivaRuntimeConfigurationAdmin() + public RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin() throws ArchivaRestServiceException { try @@ -84,7 +84,7 @@ public class DefaultArchivaRuntimeConfigurationService } } - public Boolean updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) + public Boolean updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws ArchivaRestServiceException { try 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 ce88fd31d..a170ed57e 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 @@ -38,7 +38,7 @@ public class ArchivaRuntimeConfigurationServiceTest throws Exception { RedbackRuntimeConfiguration redbackRuntimeConfiguration = - getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); + getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin(); assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } @@ -47,14 +47,14 @@ public class ArchivaRuntimeConfigurationServiceTest throws Exception { RedbackRuntimeConfiguration redbackRuntimeConfiguration = - getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); + getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin(); assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); redbackRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" ) ); - getArchivaRuntimeConfigurationService().updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration ); + getArchivaRuntimeConfigurationService().updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration ); - redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); + redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin(); assertEquals( "foo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 5b9f3428b..a71b44660 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -549,9 +549,8 @@ docs.rest.header=REST Apis Documentations menu.docs=Documentation #runtime configuration -runtime-configuration.title=Redback Runtime Configuration -runtime-configuration.usermanager.label=User Manager Implementation -archiva-runtime-configuration.updated=Redback Runtime Configuration updated. +redback-runtime-configuration.title=Redback Runtime Configuration +redback-runtime-configuration.updated=Redback Runtime Configuration updated. archiva.redback.usermanager.ldap=LDAP User Manager archiva.redback.usermanager.jdo=Database User Manager redback.runtime.properties.help.title=Property Description diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 7152a58af..5675b3d77 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -1175,7 +1175,6 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" var redbackRuntimeConfiguration = new RedbackRuntimeConfiguration(data.userManagerImpls,mapLdapConfiguration(data.ldapConfiguration),data.migratedFromRedbackConfiguration); - var configurationPropertiesEntries = data.configurationPropertiesEntries == null ? []: $.each(data.configurationPropertiesEntries,function(item){ return new Entry(item.key, item.value,function(newValue){ redbackRuntimeConfiguration.modified(true); @@ -1351,9 +1350,9 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" self.redbackRuntimeConfiguration().modified(true); } - saveArchivaRuntimeConfiguration=function(){ - $.log("saveArchivaRuntimeConfiguration"); - var saveButton = $("#archiva-runtime-configuration-save" ); + saveRedbackRuntimeConfiguration=function(){ + $.log("saveRedbackRuntimeConfiguration"); + var saveButton = $("#redback-runtime-configuration-save" ); saveButton.button('loading'); clearUserMessages(); var userMessages=$("#user-messages"); @@ -1367,14 +1366,14 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" } $.log("length:"+self.redbackRuntimeConfiguration().userManagerImpls().length); $.log("json:"+ko.toJSON(self.redbackRuntimeConfiguration)); - $.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/archivaRuntimeConfiguration", + $.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/redbackRuntimeConfiguration", { type: "PUT", contentType: 'application/json', data:ko.toJSON(self.redbackRuntimeConfiguration), dataType: 'json', success: function(data) { - var message=$.i18n.prop('archiva-runtime-configuration.updated'); + var message=$.i18n.prop('redback-runtime-configuration.updated'); displaySuccessMessage(message); }, error: function(data) { @@ -1423,7 +1422,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" dataType: 'json', success: function(data) { var userManagerImplementationInformations=mapUserManagerImplementationInformations(data); - $.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/archivaRuntimeConfiguration", { + $.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/redbackRuntimeConfiguration", { type: "GET", dataType: 'json', success: function(data) { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html index 22d82518d..9bf322fc7 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html @@ -888,13 +888,13 @@ - -- 2.39.5