Author: olamy
Date: Tue Dec 18 21:19:43 2012
New Revision: 1423666
URL: http://svn.apache.org/viewvc?rev=1423666&view=rev
Log:
fix naming use redback as part of the name as it concerns redback only
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/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
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=1423666&r1=1423665&r2=1423666&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
Tue Dec 18 21:19:43 2012
@@ -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 ArchivaRuntimeConfigura
@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")
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=1423666&r1=1423665&r2=1423666&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
Tue Dec 18 21:19:43 2012
@@ -71,7 +71,7 @@ public class DefaultArchivaRuntimeConfig
@Named(value = "ldapConnectionFactory#configurable")
private LdapConnectionFactory ldapConnectionFactory;
- public RedbackRuntimeConfiguration getArchivaRuntimeConfigurationAdmin()
+ public RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin()
throws ArchivaRestServiceException
{
try
@@ -84,7 +84,7 @@ public class DefaultArchivaRuntimeConfig
}
}
- public Boolean updateArchivaRuntimeConfiguration(
RedbackRuntimeConfiguration redbackRuntimeConfiguration )
+ public Boolean updateRedbackRuntimeConfiguration(
RedbackRuntimeConfiguration redbackRuntimeConfiguration )
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=1423666&r1=1423665&r2=1423666&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
Tue Dec 18 21:19:43 2012
@@ -38,7 +38,7 @@ public class ArchivaRuntimeConfiguration
throws Exception
{
RedbackRuntimeConfiguration redbackRuntimeConfiguration =
-
getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin();
+
getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
assertEquals( "jdo",
redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
}
@@ -47,14 +47,14 @@ public class ArchivaRuntimeConfiguration
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 ) );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1423666&r1=1423665&r2=1423666&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Tue Dec 18 21:19:43 2012
@@ -549,9 +549,8 @@ docs.rest.header=REST Apis Documentation
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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1423666&r1=1423665&r2=1423666&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Tue Dec 18 21:19:43 2012
@@ -1175,7 +1175,6 @@ define("archiva.general-admin",["jquery"
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"
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"
}
$.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"
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) {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html?rev=1423666&r1=1423665&r2=1423666&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Tue Dec 18 21:19:43 2012
@@ -888,13 +888,13 @@
<script type="text/html" id="runtime-configuration-main">
<div class="page-header">
- <h2>${$.i18n.prop('runtime-configuration.title')}</h2>
+ <h2>${$.i18n.prop('redback-runtime-configuration.title')}</h2>
</div>
- <div id="runtime-configuration-content" data-bind='template:
{name:"runtime-configuration-content-tmpl"}'>
+ <div id="runtime-configuration-content" data-bind='template:
{name:"redback-runtime-configuration-content-tmpl"}'>
</div>
</script>
-<script type="text/html" id="runtime-configuration-content-tmpl">
+<script type="text/html" id="redback-runtime-configuration-content-tmpl">
<ul class="nav nav-tabs">
<li class="active" id="redback-runtime-general-li"><a
href="#redback-runtime-general-content"
data-toggle="tab">${$.i18n.prop('redback.runtime.general.title')}</a></li>
<li id="redback-runtime-ldap-li"><a href="#redback-runtime-ldap-content"
data-toggle="tab">${$.i18n.prop('redback.runtime.ldap.title')}</a></li>
@@ -1044,8 +1044,8 @@
</div>
<div>
- <button data-bind="click: saveArchivaRuntimeConfiguration,css:{
'btn-warning': redbackRuntimeConfiguration().modified() |
redbackRuntimeConfiguration().ldapConfiguration().modified() }"
-
id="archiva-runtime-configuration-save"class="btn">${$.i18n.prop('save')}</button>
+ <button data-bind="click: saveRedbackRuntimeConfiguration,css:{
'btn-warning': redbackRuntimeConfiguration().modified() |
redbackRuntimeConfiguration().ldapConfiguration().modified() }"
+
id="redback-archiva-runtime-configuration-save"class="btn">${$.i18n.prop('save')}</button>
</div>
</script>
