Merge branch '1.1.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java

@@ -22,8 +22,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.security.authentication.AuthenticationEventPublisher;
 import org.springframework.util.Assert;
 
 /**
@@ -32,8 +32,9 @@ import org.springframework.util.Assert;
  * such an event.
  * <p>
  * Users can inject a {@link AuditEventRepository} to publish their own events or
- * alternatively use Springs {@link AuthenticationEventPublisher} (usually obtained by
- * implementing {@link ApplicationEventPublisherAware}).
+ * alternatively use Spring's {@link ApplicationEventPublisher} (usually obtained by
+ * implementing {@link ApplicationEventPublisherAware}) to publish AuditApplicationEvents
+ * (wrappers for AuditEvent).
  *
  * @author Dave Syer
  * @see AuditEventRepository

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java

@@ -18,13 +18,12 @@ package org.springframework.boot.actuate.audit.listener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.actuate.audit.AuditEvent;
 import org.springframework.boot.actuate.audit.AuditEventRepository;
 import org.springframework.context.ApplicationListener;
 
 /**
- * {@link ApplicationListener} that listens for {@link AuditEvent}s and stores them in a
- * {@link AuditEventRepository}.
+ * {@link ApplicationListener} that listens for {@link AuditApplicationEvent}s and stores
+ * them in a {@link AuditEventRepository}.
  *
  * @author Dave Syer
  */