add a field for extra properties

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

2 files changed, 29 insertions, 0 deletions

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 f6f497d17..7d1d5713a 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
@@ -1474,6 +1474,16 @@
             <type>LdapConfiguration</type>
           </association>
         </field>
+        <field>
+          <name>configurationProperties</name>
+          <description>extra properties for redback configuration. String/String</description>
+          <version>1.4.0+</version>
+          <type>Map</type>
+          <association xml.mapStyle="inline">
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
       </fields>
     </class>
 
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 61286183f..7829056ed 100644
--- 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
@@ -20,6 +20,8 @@ package org.apache.archiva.admin.model.beans;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Olivier Lamy
@@ -38,6 +40,8 @@ public class ArchivaRuntimeConfiguration
      */
     private boolean migratedFromRedbackConfiguration = false;
 
+    private Map<String, String> configurationProperties;
+
     public ArchivaRuntimeConfiguration()
     {
         // no op
@@ -73,6 +77,20 @@ public class ArchivaRuntimeConfiguration
         this.migratedFromRedbackConfiguration = migratedFromRedbackConfiguration;
     }
 
+    public Map<String, String> getConfigurationProperties()
+    {
+        if ( this.configurationProperties == null )
+        {
+            this.configurationProperties = new HashMap<String, String>();
+        }
+        return configurationProperties;
+    }
+
+    public void setConfigurationProperties( Map<String, String> configurationProperties )
+    {
+        this.configurationProperties = configurationProperties;
+    }
+
     @Override
     public String toString()
     {
@@ -80,6 +98,7 @@ public class ArchivaRuntimeConfiguration
             "userManagerImpl='" + userManagerImpl + '\'' +
             ", archivaLdapConfiguration=" + archivaLdapConfiguration +
             ", migratedFromRedbackConfiguration=" + migratedFromRedbackConfiguration +
+            ", configurationProperties=" + configurationProperties +
             '}';
     }
 }