diff options
| author | Brett Porter <brett@apache.org> | 2011-10-01 06:56:48 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2011-10-01 06:56:48 +0000 |
| commit | 0fa1fa6ac24c0bf897beed3bfe714f9b9ee45d76 (patch) | |
| tree | 4b11be7b33792fc762d3949a2770452a2083c510 /archiva-modules/archiva-web/archiva-security/src | |
| parent | cf8d566442a2aec3a659ad6e50f205e1acdf29e9 (diff) | |
| download | archiva-0fa1fa6ac24c0bf897beed3bfe714f9b9ee45d76.tar.gz archiva-0fa1fa6ac24c0bf897beed3bfe714f9b9ee45d76.zip | |
change configuration base to org.apache.archiva instead of org.apache.maven.archiva, update "upgrading" document accordingly
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177933 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-security/src')
2 files changed, 1 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java index e6ed541d1..5adfbbc77 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java @@ -60,11 +60,6 @@ public class ArchivaServletAuthenticatorTest setupRepository( "corporate" ); } - protected String getPlexusConfigLocation() - { - return "org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml"; - } - protected void assignRepositoryManagerRole( String principal, String repoId ) throws Exception { diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml index 39cc30558..2fc01c431 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml @@ -91,7 +91,7 @@ <system/> <xml fileName="${basedir}/target/test-conf/archiva.xml" config-forceCreate="true" config-optional="true" - config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/> + config-name="org.apache.archiva.base" config-at="org.apache.archiva"/> </configuration> ]]> </value> |