diff options
| author | Emmanuel Venisse <evenisse@apache.org> | 2007-03-08 14:33:17 +0000 |
|---|---|---|
| committer | Emmanuel Venisse <evenisse@apache.org> | 2007-03-08 14:33:17 +0000 |
| commit | 7b2df8ed9d10ebc634f6f9f5ab6c7fe0599ba8c8 (patch) | |
| tree | f917ca56cf5dc6f7b433b994c44c5a2f8940afdd /archiva-webapp | |
| parent | c0bc920970648d9a6970c6e3d0fd189e7ad93601 (diff) | |
| download | archiva-7b2df8ed9d10ebc634f6f9f5ab6c7fe0599ba8c8.tar.gz archiva-7b2df8ed9d10ebc634f6f9f5ab6c7fe0599ba8c8.zip | |
Update shared.xml configuration like it's done in continuum
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@516054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-webapp')
| -rw-r--r-- | archiva-webapp/src/appserver-base/conf/shared.xml | 1 | ||||
| -rw-r--r-- | archiva-webapp/src/main/resources/META-INF/plexus/application.xml | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/archiva-webapp/src/appserver-base/conf/shared.xml b/archiva-webapp/src/appserver-base/conf/shared.xml new file mode 100644 index 000000000..9afb83352 --- /dev/null +++ b/archiva-webapp/src/appserver-base/conf/shared.xml @@ -0,0 +1 @@ +<configuration /> 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 e6725c0a6..04420a6e7 100644 --- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -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"/> |