Author: olamy
Date: Mon Apr 9 20:39:51 2012
New Revision: 1311431
URL: http://svn.apache.org/viewvc?rev=1311431&view=rev
Log:
fix package change in configuration files, normally all is fine now :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-merge-index-download.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml?rev=1311431&r1=1311430&r2=1311431&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Mon Apr 9 20:39:51 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1311431&r1=1311430&r2=1311431&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Apr 9
20:39:51 2012
@@ -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)"
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1311431&r1=1311430&r2=1311431&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Mon Apr 9 20:39:51 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml?rev=1311431&r1=1311430&r2=1311431&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
Mon Apr 9 20:39:51 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-merge-index-download.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-merge-index-download.xml?rev=1311431&r1=1311430&r2=1311431&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-merge-index-download.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-merge-index-download.xml
Mon Apr 9 20:39:51 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1311431&r1=1311430&r2=1311431&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Mon Apr 9
20:39:51 2012
@@ -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,
