svn commit: r1424188 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ archiva-rest/arch...

Wed, 19 Dec 2012 14:39:26 -0800 

Author: olamy
Date: Wed Dec 19 22:39:03 2012
New Revision: 1424188

URL: http://svn.apache.org/viewvc?rev=1424188&view=rev
Log:
fix ugly method name

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java?rev=1424188&r1=1424187&r2=1424188&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java
 Wed Dec 19 22:39:03 2012
@@ -44,7 +44,7 @@ public interface ArchivaRuntimeConfigura
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @RedbackAuthorization(permissions = 
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION)
-    RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin()
+    RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
         throws ArchivaRestServiceException;
 
     @Path("redbackRuntimeConfiguration")

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java?rev=1424188&r1=1424187&r2=1424188&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
 Wed Dec 19 22:39:03 2012
@@ -71,7 +71,7 @@ public class DefaultArchivaRuntimeConfig
     @Named(value = "ldapConnectionFactory#configurable")
     private LdapConnectionFactory ldapConnectionFactory;
 
-    public RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin()
+    public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
         throws ArchivaRestServiceException
     {
         try

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java?rev=1424188&r1=1424187&r2=1424188&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
 Wed Dec 19 22:39:03 2012
@@ -38,7 +38,7 @@ public class ArchivaRuntimeConfiguration
         throws Exception
     {
         RedbackRuntimeConfiguration redbackRuntimeConfiguration =
-            
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
+            
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration();
         assertEquals( "jdo", 
redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
     }
 
@@ -47,14 +47,14 @@ public class ArchivaRuntimeConfiguration
         throws Exception
     {
         RedbackRuntimeConfiguration redbackRuntimeConfiguration =
-            
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
+            
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration();
         assertEquals( "jdo", 
redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
 
         redbackRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" 
) );
 
         
getArchivaRuntimeConfigurationService().updateRedbackRuntimeConfiguration( 
redbackRuntimeConfiguration );
 
-        redbackRuntimeConfiguration = 
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
+        redbackRuntimeConfiguration = 
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration();
         assertEquals( "foo", 
redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
 
     }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java?rev=1424188&r1=1424187&r2=1424188&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
 Wed Dec 19 22:39:03 2012
@@ -72,7 +72,7 @@ public class DefaultRuntimeInfoService
         applicationRuntimeInfo.setTimestampStr( sfd.format( new Date( 
archivaRuntimeInfo.getTimestamp() ) ) );
 
         applicationRuntimeInfo.setRedbackRuntimeConfiguration(
-            
archivaRuntimeConfigurationService.getRedbackRuntimeConfigurationAdmin() );
+            
archivaRuntimeConfigurationService.getRedbackRuntimeConfiguration() );
 
         return applicationRuntimeInfo;
     }

Reply via email to