fix package change in configuration files, normally all is fine now :-)

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311431 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-09 20:39:51 +00:00
parent 834dd7a660
commit 07e40c0b28
6 changed files with 20 additions and 21 deletions

View File

@ -68,9 +68,9 @@
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.redback"/>
config-at="org.apache.archiva.redback"/>
<properties fileName="${user.home}/.m2/archiva.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
config-at="org.apache.archiva.redback"/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-optional="true"
config-name="org.apache.archiva.base"
config-at="org.apache.archiva"/>
@ -78,15 +78,15 @@
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.redback"/>
config-at="org.apache.archiva.redback"/>
<xml fileName="${appserver.home}/conf/archiva.xml" config-optional="true"
config-at="org.apache.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.redback"/>
<properties fileName="org/apache/archiva/redback-security.properties" config-at="org.codehaus.plexus.redback"/>
config-at="org.apache.archiva.redback"/>
<properties fileName="org/apache/archiva/redback-security.properties" config-at="org.apache.archiva.redback"/>
</configuration>
]]>
</value>

View File

@ -1052,18 +1052,18 @@
org.apache.taglibs.standard.tag.common.core,
org.apache.taglibs.standard.tag.el.core,
org.codehaus.plexus.cache,
org.codehaus.plexus.redback.authentication,
org.codehaus.plexus.redback.authorization,
org.codehaus.plexus.redback.policy,
org.codehaus.plexus.redback.system,
org.apache.archiva.redback.authentication,
org.apache.archiva.redback.authorization,
org.apache.archiva.redback.policy,
org.apache.archiva.redback.system,
org.apache.archiva.redback.users,
org.codehaus.plexus.registry,
org.codehaus.plexus.taskqueue,
org.codehaus.plexus.util,
org.codehaus.redback.components.scheduler,
org.codehaus.redback.integration.filter.authentication,
org.apache.archiva.redback.integration.filter.authentication,
org.codehaus.redback.integration.interceptor,
org.codehaus.redback.rest.services,
org.apache.archiva.redback.rest.services,
org.slf4j;resolution:=optional,
org.springframework*;version="[3,4)",
org.springframework.web*;version="[3,4)"

View File

@ -88,9 +88,9 @@
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.redback"/>
config-at="org.apache.archiva.redback"/>
<properties fileName="${user.home}/.m2/archiva.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
config-at="org.apache.archiva.redback"/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-optional="true"
config-name="org.apache.archiva.base"
config-at="org.apache.archiva"/>
@ -98,15 +98,15 @@
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.redback"/>
config-at="org.apache.archiva.redback"/>
<xml fileName="${appserver.home}/conf/archiva.xml" config-optional="true"
config-at="org.apache.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.redback"/>
<properties fileName="org/apache/archiva/security.properties" config-at="org.codehaus.plexus.redback"/>
config-at="org.apache.archiva.redback"/>
<properties fileName="org/apache/archiva/security.properties" config-at="org.apache.archiva.redback"/>
</configuration>
]]>
</value>

View File

@ -43,8 +43,8 @@
config-at="org.apache.archiva"/>
<properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
<properties fileName="org/apache/archiva/security.properties" config-at="org.codehaus.plexus.redback"/>
config-at="org.apache.archiva.redback"/>
<properties fileName="org/apache/archiva/security.properties" config-at="org.apache.archiva.redback"/>
</configuration>
]]>
</value>

View File

@ -43,8 +43,8 @@
config-at="org.apache.archiva"/>
<properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
<properties fileName="org/apache/archiva/security.properties" config-at="org.codehaus.plexus.redback"/>
config-at="org.apache.archiva.redback"/>
<properties fileName="org/apache/archiva/security.properties" config-at="org.apache.archiva.redback"/>
</configuration>
]]>
</value>

View File

@ -232,7 +232,6 @@
org.apache.maven.model*,
org.codehaus.plexus.digest,
org.apache.archiva.redback.*,
org.codehaus.plexus.redback.*,
org.codehaus.plexus.taskqueue,
org.codehaus.plexus.util*,
org.codehaus.redback.integration.filter.authentication,