Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix junit due to previous changes 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1200020 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-09 22:54:03 +00:00
parent 609cdaabe9
commit 8424699c98
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
View File

@ -609,7 +609,7 @@ public class DefaultRepositoriesService
public Boolean deleteArtifact( Artifact artifact, String repositoryId )
throws ArchivaRestServiceException
{
String userName = (String) getAuditInformation().getUser().getPrincipal();
String userName = (String) getAuditInformation().getUser().getUsername();
if ( StringUtils.isBlank( userName ) )
{
// TODO use constants from a class instead of magic number

2
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java
View File

@ -243,7 +243,7 @@ public abstract class AbstractActionSupport
public String getUsername()
{
return null;
return this.principal;
}
public void setUsername( String name )

1
archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
View File

@ -50,5 +50,6 @@
</value>
</property>
</bean>
<bean name="repositorySessionFactory" class="org.apache.archiva.webtest.memory.TestRepositorySessionFactory"/>
</beans>

2
archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-merge-index-download.xml
View File

@ -51,4 +51,6 @@
</property>
</bean>
<bean name="repositorySessionFactory" class="org.apache.archiva.webtest.memory.TestRepositorySessionFactory"/>
</beans>