change the class name as it is very redback centric

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

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index f900af95acb39fa29dff3a473621e3e19a6f093a..f6f497d1738b88237db2cb3bd020019ba5138b4d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -169,15 +169,13 @@
           </description>
         </field>
         <field>
-          <name>runtimeConfiguration</name>
+          <name>redbackRuntimeConfiguration</name>
           <version>1.4.0+</version>
           <association>
-            <type>RuntimeConfiguration</type>
+            <type>RedbackRuntimeConfiguration</type>
             <multiplicity>1</multiplicity>
           </association>
-          <description>
-            The RuntimeConfiguration.
-          </description>
+          <description>The RedbackRuntimeConfiguration.</description>
         </field>
         <field>
           <name>proxyConnectorRuleConfigurations</name>
@@ -1448,7 +1446,7 @@
     </class>
 
     <class>
-      <name>RuntimeConfiguration</name>
+      <name>RedbackRuntimeConfiguration</name>
       <version>1.4.0+</version>
       <description>
         The runtime configuration.

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java
index 426b9b60374cade41201d71276e1430a9bc51bb5..61286183fb5446c2e92cc2beb244e7056850566d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
  * @author Olivier Lamy
  * @since 1.4-M4
  */
-@XmlRootElement(name = "archivaRuntimeConfiguration")
+@XmlRootElement(name = "redbackRuntimeConfiguration")
 public class ArchivaRuntimeConfiguration
     implements Serializable
 {

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
index aada4b2f295b19b3fbec25e06e363675ae08f463..272316bb58757a60b20425f1c3916003157fd7aa 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
@@ -26,7 +26,7 @@ import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
 import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
 import org.apache.archiva.configuration.Configuration;
 import org.apache.archiva.configuration.IndeterminateConfigurationException;
-import org.apache.archiva.configuration.RuntimeConfiguration;
+import org.apache.archiva.configuration.RedbackRuntimeConfiguration;
 import org.apache.archiva.redback.components.registry.RegistryException;
 import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.commons.lang.StringUtils;
@@ -96,15 +96,15 @@ public class DefaultArchivaRuntimeConfigurationAdmin
     public ArchivaRuntimeConfiguration getArchivaRuntimeConfiguration()
         throws RepositoryAdminException
     {
-        return build( getArchivaConfiguration().getConfiguration().getRuntimeConfiguration() );
+        return build( getArchivaConfiguration().getConfiguration().getRedbackRuntimeConfiguration() );
     }
 
     public void updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration )
         throws RepositoryAdminException
     {
-        RuntimeConfiguration runtimeConfiguration = build( archivaRuntimeConfiguration );
+        RedbackRuntimeConfiguration runtimeConfiguration = build( archivaRuntimeConfiguration );
         Configuration configuration = getArchivaConfiguration().getConfiguration();
-        configuration.setRuntimeConfiguration( runtimeConfiguration );
+        configuration.setRedbackRuntimeConfiguration( runtimeConfiguration );
         try
         {
             getArchivaConfiguration().save( configuration );
@@ -119,13 +119,13 @@ public class DefaultArchivaRuntimeConfigurationAdmin
         }
     }
 
-    private ArchivaRuntimeConfiguration build( RuntimeConfiguration runtimeConfiguration )
+    private ArchivaRuntimeConfiguration build( RedbackRuntimeConfiguration runtimeConfiguration )
     {
         return new BeanReplicator().replicateBean( runtimeConfiguration, ArchivaRuntimeConfiguration.class );
     }
 
-    private RuntimeConfiguration build( ArchivaRuntimeConfiguration archivaRuntimeConfiguration )
+    private RedbackRuntimeConfiguration build( ArchivaRuntimeConfiguration archivaRuntimeConfiguration )
     {
-        return new BeanReplicator().replicateBean( archivaRuntimeConfiguration, RuntimeConfiguration.class );
+        return new BeanReplicator().replicateBean( archivaRuntimeConfiguration, RedbackRuntimeConfiguration.class );
     }
 }