Author: olamy
Date: Fri Nov 23 13:29:52 2012
New Revision: 1412881
URL: http://svn.apache.org/viewvc?rev=1412881&view=rev
Log:
[MRM-1714] using LDAP can be configurable with the ui
add archiva backend to manage configuration
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1412881&r1=1412880&r2=1412881&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Fri Nov 23 13:29:52 2012
@@ -169,6 +169,17 @@
</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>
<association>
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1412881&r1=1412880&r2=1412881&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
Fri Nov 23 13:29:52 2012
@@ -72,6 +72,7 @@
<ref bean="reportRepositoriesService#rest" />
<ref bean="mergeRepositoriesService#rest"/>
<ref bean="proxyConnectorRuleService#rest"/>
+ <ref bean="archivaRuntimeConfigurationService#rest"/>
</jaxrs:serviceBeans>
<jaxrs:outInterceptors>
