Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

75032: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71716: Added a webscript to raise browser events ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:10:20 +00:00
parent f4f3bdd860
commit 567f58eca1

View File

@@ -18,25 +18,34 @@
*/ */
package org.alfresco.repo.events; package org.alfresco.repo.events;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
import org.alfresco.events.types.Event; import org.alfresco.events.types.Event;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
/** /**
* An implementation of EventPublisher that is used for testing * An implementation of EventPublisher that is used for testing
* * Uses a java.util.logging.FileHandler for logging Events to a file.
* It also uses the standard log4j logging for Alfresco.
*
* @author Gethin James * @author Gethin James
* @since 5.0 * @since 5.0
*/ */
public class EventPublisherForTestingOnly extends AbstractEventPublisher implements EventPublisher public class EventPublisherForTestingOnly extends AbstractEventPublisher implements EventPublisher, InitializingBean
{ {
private static final Logger logger = LoggerFactory.getLogger(EventPublisherForTestingOnly.class); private static final Logger logger = LoggerFactory.getLogger(EventPublisherForTestingOnly.class);
Queue<Event> queue = new ConcurrentLinkedQueue<Event>(); Queue<Event> queue = new ConcurrentLinkedQueue<Event>();
FileHandler fileHandler;
@Override @Override
public void publishEvent(Event event) public void publishEvent(Event event)
@@ -59,7 +68,8 @@ public class EventPublisherForTestingOnly extends AbstractEventPublisher impleme
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug(logMessage); logger.debug(logMessage);
} }
fileHandler.publish(new LogRecord(Level.INFO, logMessage));
} }
public Queue<Event> getQueue() public Queue<Event> getQueue()
@@ -81,4 +91,13 @@ public class EventPublisherForTestingOnly extends AbstractEventPublisher impleme
return (List<T>) toReturn; return (List<T>) toReturn;
} }
@Override
public void afterPropertiesSet() throws Exception
{
File eventLog = new File("alfresco-events.log");
fileHandler = new FileHandler(eventLog.getAbsolutePath(), true);
fileHandler.setLevel(Level.INFO);
fileHandler.setFormatter(new SimpleFormatter());
}
} }