You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jm...@apache.org on 2007/05/24 17:17:03 UTC
svn commit: r541319 - in
/maven/archiva/trunk/archiva-base/archiva-configuration/src: main/mdo/
main/resources/org/apache/maven/archiva/configuration/ test/conf/
test/java/org/apache/maven/archiva/configuration/
Author: jmcconnell
Date: Thu May 24 08:17:03 2007
New Revision: 541319
URL: http://svn.apache.org/viewvc?view=rev&rev=541319
Log:
added webapp configuration section, default setting for default-archiva.xml object, and associated test
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?view=diff&rev=541319&r1=541318&r2=541319
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Thu May 24 08:17:03 2007
@@ -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>
@@ -663,6 +674,50 @@
</field>
</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>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml?view=diff&rev=541319&r1=541318&r2=541319
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml Thu May 24 08:17:03 2007
@@ -167,4 +167,10 @@
</cleanupConsumers>
</databaseScanning>
+ <webapp>
+ <ui>
+ <showFindArtifacts>false</showFindArtifacts>
+ </ui>
+ </webapp>
+
</configuration>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml?view=diff&rev=541319&r1=541318&r2=541319
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml Thu May 24 08:17:03 2007
@@ -179,4 +179,10 @@
</cleanupConsumers>
</databaseScanning>
+ <webapp>
+ <ui>
+ <showFindArtifacts>false</showFindArtifacts>
+ </ui>
+ </webapp>
+
</configuration>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?view=diff&rev=541319&r1=541318&r2=541319
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Thu May 24 08:17:03 2007
@@ -81,6 +81,13 @@
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