Browse Source

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
tags/archiva-1.0-alpha-1
Jesse McConnell 17 years ago
parent
commit
dd330f3d5e

+ 55
- 0
archiva-base/archiva-configuration/src/main/mdo/configuration.mdo View File

@@ -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>

+ 6
- 0
archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml View File

@@ -167,4 +167,10 @@
</cleanupConsumers>
</databaseScanning>

<webapp>
<ui>
<showFindArtifacts>false</showFindArtifacts>
</ui>
</webapp>

</configuration>

+ 6
- 0
archiva-base/archiva-configuration/src/test/conf/repository-manager.xml View File

@@ -179,4 +179,10 @@
</cleanupConsumers>
</databaseScanning>

<webapp>
<ui>
<showFindArtifacts>false</showFindArtifacts>
</ui>
</webapp>

</configuration>

+ 7
- 0
archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java View File

@@ -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

Loading…
Cancel
Save