Author: evenisse
Date: Thu Mar 8 06:33:17 2007
New Revision: 516054
URL: http://svn.apache.org/viewvc?view=rev&rev=516054
Log:
Update shared.xml configuration like it's done in continuum
Added:
maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
(with props)
maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml
(with props)
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Added:
maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml?view=auto&rev=516054
==============================================================================
---
maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
(added)
+++
maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
Thu Mar 8 06:33:17 2007
@@ -0,0 +1 @@
+<configuration />
Propchange:
maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/archiva/trunk/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml?view=auto&rev=516054
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml
(added)
+++ maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml Thu
Mar 8 06:33:17 2007
@@ -0,0 +1 @@
+<configuration />
Propchange:
maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/archiva/trunk/archiva-webapp/src/appserver-base/conf/shared.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=516054&r1=516053&r2=516054
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Thu Mar 8 06:33:17 2007
@@ -32,7 +32,7 @@
<xml fileName="${user.home}/.m2/archiva.xml" config-optional="true"
config-name="org.apache.maven.archiva.user"
config-at="org.apache.maven.archiva" />
<xml fileName="${user.home}/.m2/shared.xml" config-optional="true"
- config-name="org.apache.maven.shared.app"
config-at="org.apache.maven.shared.app"
+ config-name="org.apache.maven.shared.app.user"
config-at="org.apache.maven.shared.app"
config-forceCreate="true"/>
<properties fileName="${user.home}/.m2/security.properties"
config-optional="true"
config-at="org.codehaus.plexus.security"/>
@@ -40,11 +40,15 @@
config-at="org.codehaus.plexus.security"/>
<xml fileName="${appserver.base}/conf/archiva.xml"
config-optional="true" config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
+ <xml fileName="${appserver.base}/conf/shared.xml"
config-optional="true"
+ config-name="org.apache.maven.shared.app.base"
config-at="org.apache.maven.shared.app"/>
<xml fileName="${appserver.base}/conf/common.xml"
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/shared.xml"
config-optional="true"
+ config-at="org.apache.maven.shared.app"/>
<xml fileName="${appserver.home}/conf/common.xml"
config-optional="true"/>
<properties fileName="${appserver.home}/conf/security.properties"
config-optional="true"
config-at="org.codehaus.plexus.security"/>
