[MRM-1714] using LDAP can be configurable with the ui

add archiva backend to manage configuration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1412881 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 138f90a92cbe66814512e92cdb868565eab4de87..13cf68da028579a2957dec2b65fe3df5fd22ef99 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
@@ -168,6 +168,17 @@
             The NetworkConfiguration .
           </description>
         </field>
+        <field>
+          <name>runtimeConfiguration</name>
+          <version>1.4.0+</version>
+          <association>
+            <type>RuntimeConfiguration</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The RuntimeConfiguration.
+          </description>
+        </field>
         <field>
           <name>proxyConnectorRuleConfigurations</name>
           <version>1.4.0+</version>
@@ -1435,6 +1446,24 @@
         </field>
       </fields>
     </class>
+
+    <class>
+      <name>RuntimeConfiguration</name>
+      <version>1.4.0+</version>
+      <description>
+        The runtime configuration.
+      </description>
+      <fields>
+        <field>
+          <name>userManagerImpl</name>
+          <description>The user manager impl to use.</description>
+          <version>1.4.0+</version>
+          <type>String</type>
+          <defaultValue>jdo</defaultValue>
+        </field>
+      </fields>
+    </class>
+
   </classes>
 </model>
 

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index 4d0c7fcf35642e9ed9f786472597a24a3675ca5e..c6d218cefb5150eb2b4246b33ac56037f48a0214 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -72,6 +72,7 @@
       <ref bean="reportRepositoriesService#rest" />
       <ref bean="mergeRepositoriesService#rest"/>
       <ref bean="proxyConnectorRuleService#rest"/>
+      <ref bean="archivaRuntimeConfigurationService#rest"/>
     </jaxrs:serviceBeans>
 
     <jaxrs:outInterceptors>