From dd330f3d5e88cd5b949022d8666933a49b8478f8 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jmcconnell@apache.org>
Date: Thu, 24 May 2007 15:17:03 +0000
Subject: [PATCH] added webapp configuration section, default setting for
 default-archiva.xml object, and associated test

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@541319 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/mdo/configuration.mdo            | 55 +++++++++++++++++++
 .../archiva/configuration/default-archiva.xml |  6 ++
 .../src/test/conf/repository-manager.xml      |  6 ++
 .../ArchivaConfigurationTest.java             |  7 +++
 4 files changed, 74 insertions(+)

diff --git a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index b0c91c5e9..5e168af44 100644
--- a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -102,6 +102,17 @@
           <description>
             The database scanning configuration.
           </description>
+        </field>
+        <field>
+          <name>webapp</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>WebappConfiguration</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The webapp configuration.
+          </description>
         </field>
       </fields>
       <codeSegments>
@@ -664,6 +675,50 @@
       </fields>
     </class>
     
+    <!--    
+    __        _______ ____    _    ____  ____  
+    \ \      / / ____| __ )  / \  |  _ \|  _ \ 
+     \ \ /\ / /|  _| |  _ \ / _ \ | |_) | |_) |
+      \ V  V / | |___| |_) / ___ \|  __/|  __/ 
+       \_/\_/  |_____|____/_/   \_\_|   |_|    
+                                               
+    -->
+    
+    <class>
+      <name>WebappConfiguration</name>
+      <version>1.0.0+</version>
+      <description>
+        The webapp configuration settings.
+      </description>
+      <fields>
+        <field>
+          <name>ui</name>
+          <description>options for altering the ui presentation</description>
+          <version>1.0.0+</version>
+          <association>
+            <type>UserInterfaceOptions</type>
+          </association>          
+        </field>
+      </fields>
+    </class>
+    
+    <class>
+      <name>UserInterfaceOptions</name>
+      <version>1.0.0+</version>
+      <description>
+        The user interface configuration settings.
+      </description>
+      <fields>
+        <field>
+          <name>showFindArtifacts</name>
+          <description>true if find artifacts should be enabled</description>
+          <version>1.0.0+</version>       
+          <type>boolean</type>  
+          <defaultValue>false</defaultValue>
+        </field>
+      </fields>
+    </class>
+    
   </classes>
 </model>
 
diff --git a/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
index d55396167..b2ddcddea 100644
--- a/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
+++ b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
@@ -167,4 +167,10 @@
     </cleanupConsumers>
   </databaseScanning>
 
+  <webapp>
+    <ui>
+      <showFindArtifacts>false</showFindArtifacts>
+    </ui>
+  </webapp>
+
 </configuration>
diff --git a/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
index f2ff08a05..a0ffdf7c6 100644
--- a/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
+++ b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
@@ -179,4 +179,10 @@
     </cleanupConsumers>
   </databaseScanning>
 
+  <webapp>
+    <ui>
+      <showFindArtifacts>false</showFindArtifacts>
+    </ui>
+  </webapp>
+
 </configuration>
diff --git a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
index 81bbba1a4..87852e9d8 100644
--- a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
@@ -81,6 +81,13 @@ public class ArchivaConfigurationTest extends PlexusTestCase
         assertEquals( "check managed repositories", "internal", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
         assertTrue( "check managed repositories", repository.isIndexed() );
+        
+        WebappConfiguration webapp = (WebappConfiguration) configuration.getWebapp();
+        assertNotNull( "check webapp", webapp );
+        
+        UserInterfaceOptions ui = (UserInterfaceOptions) webapp.getUi();
+        assertNotNull( "check webapp ui", ui  );
+        assertFalse( "check showFindArtifacts", ui.isShowFindArtifacts() );
     }
 
     public void testGetConfigurationSystemOverride() throws Exception
-- 
2.39.5