Adding default archiva.xml to the mix.

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

diff --git a/archiva-jpox-database-refactor/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-jpox-database-refactor/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index 04420a6e7f4d53173ace441aa2e3fd450a1e4ba9..701a4f3ddede61562b4c478fe38bf5c97a388ac9 100644 (file)
--- a/archiva-jpox-database-refactor/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-jpox-database-refactor/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -50,6 +50,7 @@
           <xml fileName="${appserver.home}/conf/shared.xml" config-optional="true"
                config-at="org.apache.maven.shared.app"/>
           <xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
+          <properties fileName="org/apache/maven/archiva/configuration/default-archiva.properties" config-at="org.apache.maven.archiva.base"/>
           <properties fileName="${appserver.home}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>
           <properties fileName="org/apache/maven/archiva/security.properties" config-at="org.codehaus.plexus.security"/>