svn commit: r756587 - in /archiva/trunk/archiva-modules: archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/ archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ archiva-web/archiva-we...

[brett]

Author: brett
Date: Fri Mar 20 16:35:02 2009
New Revision: 756587

URL: http://svn.apache.org/viewvc?rev=756587&view=rev
Log:
fix test problems

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java?rev=756587&r1=756586&r2=756587&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
 Fri Mar 20 16:35:02 2009
@@ -46,7 +46,7 @@
         StringBuffer msg = new StringBuffer();
         msg.append( checkNull( event.getRepositoryId() ) ).append( DELIM );
         msg.append( event.getUserId() ).append( DELIM );
-        msg.append( event.getRemoteIP() ).append( DELIM );
+        msg.append( checkNull( event.getRemoteIP() ) ).append( DELIM );
         msg.append( '\"' ).append( checkNull( event.getResource() ) ).append( 
'\"' ).append( DELIM );
         msg.append( '\"' ).append( event.getAction() ).append( '\"' );
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java?rev=756587&r1=756586&r2=756587&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
 Fri Mar 20 16:35:02 2009
@@ -40,6 +40,11 @@
     
     public static String getActivePrincipal( Map<String, ?> sessionMap )
     {
+        if ( sessionMap == null )
+        {
+            return UserManager.GUEST_USERNAME;
+        }
+        
         SecuritySession securitySession =
             (SecuritySession) sessionMap.get( 
SecuritySystemConstants.SECURITY_SESSION_KEY );
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java?rev=756587&r1=756586&r2=756587&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
 Fri Mar 20 16:35:02 2009
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.maven.archiva.repository.audit.AuditEvent;
 import org.apache.maven.archiva.repository.audit.AuditListener;
 import org.apache.maven.archiva.repository.audit.Auditable;
@@ -75,7 +77,7 @@
     protected void triggerAuditEvent( String repositoryId, String resource, 
String action )
     {
         AuditEvent event = new AuditEvent( repositoryId, getPrincipal(), 
resource, action );
-        event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );
+        event.setRemoteIP( getRemoteAddr() );
     
         for ( AuditListener listener : auditListeners )
         {
@@ -86,7 +88,7 @@
     protected void triggerAuditEvent( String resource, String action )
     {
         AuditEvent event = new AuditEvent( getPrincipal(), resource, action );
-        event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );
+        event.setRemoteIP( getRemoteAddr() );
         
         for ( AuditListener listener : auditListeners )
         {
@@ -97,7 +99,7 @@
     protected void triggerAuditEvent( String action )
     {
         AuditEvent event = new AuditEvent( getPrincipal(), action );
-        event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );
+        event.setRemoteIP( getRemoteAddr() );
         
         for ( AuditListener listener : auditListeners )
         {
@@ -105,6 +107,12 @@
         }
     }
 
+    private String getRemoteAddr()
+    {
+        HttpServletRequest request = ServletActionContext.getRequest();
+        return request != null ? request.getRemoteAddr() : null;
+    }
+
     @SuppressWarnings( "unchecked" )
     protected String getPrincipal()
     {