summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-security
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-06-08 16:50:23 +0000
committerOlivier Lamy <olamy@apache.org>2011-06-08 16:50:23 +0000
commit7d9ef40bf31d80f2ada2294e6a24cef2291a28e4 (patch)
treedbd51a90f52bf4e2c093478ab6c012cd401b9718 /archiva-modules/archiva-web/archiva-security
parentde7890f4a3dbfaee1a2abeda4a78044dde6454b4 (diff)
downloadarchiva-7d9ef40bf31d80f2ada2294e6a24cef2291a28e4.tar.gz
archiva-7d9ef40bf31d80f2ada2294e6a24cef2291a28e4.zip
fix unit tests in archiva-security
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133465 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-security')
-rw-r--r--archiva-modules/archiva-web/archiva-security/pom.xml10
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java29
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/AbstractSecurityTest.java6
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml39
4 files changed, 42 insertions, 42 deletions
diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index 510fda073..512397898 100644
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -53,6 +53,10 @@
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<!-- Test Scoped -->
<dependency>
<groupId>org.codehaus.redback</groupId>
@@ -84,10 +88,6 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java
index 88a28e2ac..c4603e411 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java
@@ -19,9 +19,7 @@ package org.apache.maven.archiva.security;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
+import com.google.common.collect.Lists;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.redback.authentication.AuthenticationResult;
@@ -38,14 +36,16 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
/**
* DefaultUserRepositories
- *
+ *
* @version $Id$
- * plexus.component role="org.apache.maven.archiva.security.UserRepositories" role-hint="default"
+ * plexus.component role="org.apache.maven.archiva.security.UserRepositories" role-hint="default"
*/
-@Service("userRepositories")
+@Service( "userRepositories" )
public class DefaultUserRepositories
implements UserRepositories
{
@@ -66,7 +66,7 @@ public class DefaultUserRepositories
*/
@Inject
private ArchivaConfiguration archivaConfiguration;
-
+
private Logger log = LoggerFactory.getLogger( DefaultUserRepositories.class );
public List<String> getObservableRepositoryIds( String principal )
@@ -92,8 +92,7 @@ public class DefaultUserRepositories
List<String> repoIds = new ArrayList<String>();
- List<ManagedRepositoryConfiguration> repos =
- archivaConfiguration.getConfiguration().getManagedRepositories();
+ List<ManagedRepositoryConfiguration> repos = archivaConfiguration.getConfiguration().getManagedRepositories();
for ( ManagedRepositoryConfiguration repo : repos )
{
@@ -108,8 +107,11 @@ public class DefaultUserRepositories
catch ( AuthorizationException e )
{
// swallow.
- log.debug( "Not authorizing '" + principal + "' for repository '" + repo.getId() + "': "
- + e.getMessage() );
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "Not authorizing '{}' for repository '{}': {}",
+ Lists.<Object>newArrayList( principal, repo.getId(), e.getMessage() ) );
+ }
}
}
@@ -160,8 +162,7 @@ public class DefaultUserRepositories
}
catch ( RoleManagerException e )
{
- throw new ArchivaSecurityException(
- "Unable to create roles for configured repositories: " + e.getMessage(),
+ throw new ArchivaSecurityException( "Unable to create roles for configured repositories: " + e.getMessage(),
e );
}
}
@@ -182,7 +183,7 @@ public class DefaultUserRepositories
throw new ArchivaSecurityException( e.getMessage() );
}
}
-
+
public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId )
throws AccessDeniedException, ArchivaSecurityException
{
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/AbstractSecurityTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/AbstractSecurityTest.java
index 84d6b8c51..6308f075a 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/AbstractSecurityTest.java
+++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/AbstractSecurityTest.java
@@ -74,6 +74,7 @@ public abstract class AbstractSecurityTest
protected RoleManager roleManager;
@Inject
+ @Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration archivaConfiguration;
@Inject
@@ -87,7 +88,10 @@ public abstract class AbstractSecurityTest
repoConfig.setId( repoId );
repoConfig.setName( "Testable repo <" + repoId + ">" );
repoConfig.setLocation( new File( "./target/test-repo/" + repoId ).getPath() );
- archivaConfiguration.getConfiguration().addManagedRepository( repoConfig );
+ if ( !archivaConfiguration.getConfiguration().getManagedRepositoriesAsMap().containsKey( repoId ) )
+ {
+ archivaConfiguration.getConfiguration().addManagedRepository( repoConfig );
+ }
// Add repo roles to security.
userRepos.createMissingRepositoryRoles( repoId );
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 44e71526c..24723b149 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
@@ -78,32 +78,27 @@
<alias name="servletAuthenticator" alias="servletAuthenticator#test"/>
- <!--
+ <bean name="archivaConfiguration#default" class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
+ <property name="registry" ref="registry#test"/>
+ </bean>
+ <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
- <component>
- <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
- <implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.registry.Registry</role>
- <role-hint>configured</role-hint>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.registry.Registry</role>
- <role-hint>configured</role-hint>
- <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
- <configuration>
- <properties>
+ <bean name="registry#test" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
<system/>
- <xml fileName="${basedir}/target/test-conf/archiva.xml"
+ <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"/>
- </properties>
- </configuration>
- </component>
-
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+ <!--
partially configured
<component>