Author: olamy
Date: Thu Nov 22 21:57:18 2012
New Revision: 1412689
URL: http://svn.apache.org/viewvc?rev=1412689&view=rev
Log:
remove this ugly Object getPrincipal method
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaXworkUser.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java?rev=1412689&r1=1412688&r2=1412689&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
Thu Nov 22 21:57:18 2012
@@ -63,7 +63,7 @@ public abstract class AbstractRepository
{
User user = auditInformation == null ? null :
auditInformation.getUser();
AuditEvent event =
- new AuditEvent( repositoryId, user == null ? "null" : (String)
user.getPrincipal(), resource, action );
+ new AuditEvent( repositoryId, user == null ? "null" :
user.getUsername(), resource, action );
event.setRemoteIP( auditInformation == null ? "null" :
auditInformation.getRemoteAddr() );
for ( AuditListener listener : getAuditListeners() )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java?rev=1412689&r1=1412688&r2=1412689&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
Thu Nov 22 21:57:18 2012
@@ -96,15 +96,7 @@ public abstract class AbstractRepository
protected User getFakeUser()
{
- SimpleUser user = new SimpleUser()
- {
- @Override
- public Object getPrincipal()
- {
- return "root";
- }
-
- };
+ SimpleUser user = new SimpleUser();
user.setUsername( "root" );
user.setFullName( "The top user" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java?rev=1412689&r1=1412688&r2=1412689&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
Thu Nov 22 21:57:18 2012
@@ -139,11 +139,11 @@ public abstract class AbstractSecurityTe
// Setup Admin User.
User adminUser = createUser( USER_ADMIN, "Admin User" );
- roleManager.assignRole( ArchivaRoleConstants.TEMPLATE_SYSTEM_ADMIN,
adminUser.getPrincipal().toString() );
+ roleManager.assignRole( ArchivaRoleConstants.TEMPLATE_SYSTEM_ADMIN,
adminUser.getUsername() );
// Setup Guest User.
User guestUser = createUser( USER_GUEST, "Guest User" );
- roleManager.assignRole( ArchivaRoleConstants.TEMPLATE_GUEST,
guestUser.getPrincipal().toString() );
+ roleManager.assignRole( ArchivaRoleConstants.TEMPLATE_GUEST,
guestUser.getUsername() );
}
protected void restoreGuestInitialValues( String userId )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java?rev=1412689&r1=1412688&r2=1412689&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
Thu Nov 22 21:57:18 2012
@@ -160,24 +160,20 @@ public class SecuritySystemStub
{
return new User()
{
- public Object getPrincipal()
- {
- return "guest";
- }
public String getUsername()
{
- return null; //To change body of implemented methods
use File | Settings | File Templates.
+ return "guest";
}
public void setUsername( String name )
{
- //To change body of implemented methods use File |
Settings | File Templates.
+
}
public String getFullName()
{
- return null; //To change body of implemented methods
use File | Settings | File Templates.
+ return null;
}
public void setFullName( String name )
@@ -349,19 +345,15 @@ public class SecuritySystemStub
{
return new User()
{
- public Object getPrincipal()
- {
- return "guest";
- }
public String getUsername()
{
- return null; //To change body of implemented methods
use File | Settings | File Templates.
+ return "guest";
}
public void setUsername( String name )
{
- //To change body of implemented methods use File |
Settings | File Templates.
+
}
public String getFullName()
