You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/11/09 23:54:03 UTC
svn commit: r1200020 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp/src/main/java/org/apache/archiva/web/action/
archiva-webapp/src/test/resources/
Author: olamy
Date: Wed Nov 9 22:54:03 2011
New Revision: 1200020
URL: http://svn.apache.org/viewvc?rev=1200020&view=rev
Log:
fix junit due to previous changes
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java
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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java?rev=1200020&r1=1200019&r2=1200020&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java Wed Nov 9 22:54:03 2011
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java?rev=1200020&r1=1200019&r2=1200020&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java Wed Nov 9 22:54:03 2011
@@ -243,7 +243,7 @@ public abstract class AbstractActionSupp
public String getUsername()
{
- return null;
+ return this.principal;
}
public void setUsername( String name )
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=1200020&r1=1200019&r2=1200020&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 Wed Nov 9 22:54:03 2011
@@ -50,5 +50,6 @@
</value>
</property>
</bean>
+ <bean name="repositorySessionFactory" class="org.apache.archiva.webtest.memory.TestRepositorySessionFactory"/>
</beans>
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=1200020&r1=1200019&r2=1200020&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 Wed Nov 9 22:54:03 2011
@@ -51,4 +51,6 @@
</property>
</bean>
+ <bean name="repositorySessionFactory" class="org.apache.archiva.webtest.memory.TestRepositorySessionFactory"/>
+
</beans>