From: Olivier Lamy <olamy@apache.org>
Date: Fri, 23 Nov 2012 13:29:52 +0000 (+0000)
Subject: [MRM-1714] using LDAP can be configurable with the ui
X-Git-Tag: archiva-1.4-M4~598
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d6c925094a57c851938be1e9f7b477074633e196;p=archiva.git

[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 138f90a92..13cf68da0 100644
--- 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 4d0c7fcf3..c6d218cef 100644
--- 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>