You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by br...@apache.org on 2007/08/23 16:18:42 UTC

svn commit: r569008 - /maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml

Author: brett
Date: Thu Aug 23 07:18:41 2007
New Revision: 569008

URL: http://svn.apache.org/viewvc?rev=569008&view=rev
Log:
[MRM-462] avoid duplicate definitions getting loaded in the webapp

Modified:
    maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?rev=569008&r1=569007&r2=569008&view=diff
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Thu Aug 23 07:18:41 2007
@@ -82,8 +82,6 @@
           <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"/>
-          <xml fileName="org/apache/maven/archiva/configuration/default-archiva.xml"
-               config-at="org.apache.maven.archiva"/>
           <properties fileName="${appserver.home}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.redback"/>
           <properties fileName="org/apache/maven/archiva/security.properties" config-at="org.codehaus.plexus.redback"/>