fix incorrect location of config files (Thanks, Wendy!)

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

diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index 7ac1205f13d01ce6e5b27e7935adf1432099ef0e..62b65f63eae1f87a789fa2c16260f3db716a638f 100644 (file)
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -41,12 +41,12 @@
           <xml fileName="${appserver.base}/conf/archiva.xml" config-optional="true"
                config-at="org.apache.maven.archiva"/>
           <xml fileName="${appserver.base}/conf/common.xml" config-optional="true"/>
-          <properties fileName="${appserver.base}/security.properties" config-optional="true"
+          <properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>
           <xml fileName="${appserver.home}/conf/archiva.xml" config-optional="true"
                config-at="org.apache.maven.archiva"/>
           <xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
-          <properties fileName="${appserver.home}/security.properties" config-optional="true"
+          <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"/>
         </properties>