root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Dave Syer 2014-09-25 18:15:33 +01:00
parent 0d0e5eb590 c1404b1e41
commit 9d9819c338
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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