diff --git a/integration/pom.xml b/integration/pom.xml index 735a6daa..b612ae67 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 integration diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 12ddd576..f365a428 100755 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index a267c674..d398de9a 100755 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 jul-to-slf4j diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 73b09ed5..cfbec2dd 100755 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index e5231860..3a2c290c 100755 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 osgi-over-slf4j diff --git a/pom.xml b/pom.xml index 4831ba67..70af2727 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 pom SLF4J @@ -262,6 +262,8 @@ ${javadoc.plugin.version} true + none + org.slf4j.migrator:org.slf4j.migrator.* diff --git a/slf4j-android/pom.xml b/slf4j-android/pom.xml index c2a3b5d5..bd3d651b 100644 --- a/slf4j-android/pom.xml +++ b/slf4j-android/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-android diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 69417c31..21d4fe82 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-api diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index b5342149..9a69b3cd 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-ext diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java b/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java deleted file mode 100755 index cdfbb04c..00000000 --- a/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java +++ /dev/null @@ -1,305 +0,0 @@ -/** - * Copyright (c) 2004-2011 QOS.ch - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -package org.slf4j.ext; - -import java.io.Serializable; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.beans.XMLDecoder; -import java.beans.XMLEncoder; -import java.beans.ExceptionListener; - -/** - * Base class for Event Data. Event Data contains data to be logged about an - * event. Users may extend this class for each EventType they want to log. - * - * @author Ralph Goers - */ -public class EventData implements Serializable { - - private static final long serialVersionUID = 153270778642103985L; - - private Map eventData = new HashMap(); - public static final String EVENT_MESSAGE = "EventMessage"; - public static final String EVENT_TYPE = "EventType"; - public static final String EVENT_DATETIME = "EventDateTime"; - public static final String EVENT_ID = "EventId"; - - /** - * Default Constructor - */ - public EventData() { - } - - /** - * Constructor to create event data from a Map. - * - * @param map - * The event data. - */ - public EventData(Map map) { - eventData.putAll(map); - } - - /** - * Construct from a serialized form of the Map containing the RequestInfo - * elements - * - * @param xml - * The serialized form of the RequestInfo Map. - */ - @SuppressWarnings("unchecked") - public EventData(String xml) { - ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes()); - try { - XMLDecoder decoder = new XMLDecoder(bais); - this.eventData = (Map) decoder.readObject(); - } catch (Exception e) { - throw new EventException("Error decoding " + xml, e); - } - } - - /** - * Serialize all the EventData items into an XML representation. - * - * @return an XML String containing all the EventData items. - */ - public String toXML() { - return toXML(eventData); - } - - /** - * Serialize all the EventData items into an XML representation. - * - * @param map the Map to transform - * @return an XML String containing all the EventData items. - */ - public static String toXML(Map map) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try { - XMLEncoder encoder = new XMLEncoder(baos); - encoder.setExceptionListener(new ExceptionListener() { - public void exceptionThrown(Exception exception) { - exception.printStackTrace(); - } - }); - encoder.writeObject(map); - encoder.close(); - return baos.toString(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - /** - * Retrieve the event identifier. - * - * @return The event identifier - */ - public String getEventId() { - return (String) this.eventData.get(EVENT_ID); - } - - /** - * Set the event identifier. - * - * @param eventId - * The event identifier. - */ - public void setEventId(String eventId) { - if (eventId == null) { - throw new IllegalArgumentException("eventId cannot be null"); - } - this.eventData.put(EVENT_ID, eventId); - } - - /** - * Retrieve the message text associated with this event, if any. - * - * @return The message text associated with this event or null if there is - * none. - */ - public String getMessage() { - return (String) this.eventData.get(EVENT_MESSAGE); - } - - /** - * Set the message text associated with this event. - * - * @param message - * The message text. - */ - public void setMessage(String message) { - this.eventData.put(EVENT_MESSAGE, message); - } - - /** - * Retrieve the date and time the event occurred. - * - * @return The Date associated with the event. - */ - public Date getEventDateTime() { - return (Date) this.eventData.get(EVENT_DATETIME); - } - - /** - * Set the date and time the event occurred in case it is not the same as when - * the event was logged. - * - * @param eventDateTime - * The event Date. - */ - public void setEventDateTime(Date eventDateTime) { - this.eventData.put(EVENT_DATETIME, eventDateTime); - } - - /** - * Set the type of event that occurred. - * - * @param eventType - * The type of the event. - */ - public void setEventType(String eventType) { - this.eventData.put(EVENT_TYPE, eventType); - } - - /** - * Retrieve the type of the event. - * - * @return The event type. - */ - public String getEventType() { - return (String) this.eventData.get(EVENT_TYPE); - } - - /** - * Add arbitrary attributes about the event. - * - * @param name - * The attribute's key. - * @param obj - * The data associated with the key. - */ - public void put(String name, Serializable obj) { - this.eventData.put(name, obj); - } - - /** - * Retrieve an event attribute. - * - * @param name - * The attribute's key. - * @return The value associated with the key or null if the key is not - * present. - */ - public Serializable get(String name) { - return (Serializable) this.eventData.get(name); - } - - /** - * Populate the event data from a Map. - * - * @param data - * The Map to copy. - */ - public void putAll(Map data) { - this.eventData.putAll(data); - } - - /** - * Returns the number of attributes in the EventData. - * - * @return the number of attributes in the EventData. - */ - public int getSize() { - return this.eventData.size(); - } - - /** - * Returns an Iterator over all the entries in the EventData. - * - * @return an Iterator that can be used to access all the event attributes. - */ - public Iterator> getEntrySetIterator() { - return this.eventData.entrySet().iterator(); - } - - /** - * Retrieve all the attributes in the EventData as a Map. Changes to this map - * will be reflected in the EventData. - * - * @return The Map of attributes in this EventData instance. - */ - public Map getEventMap() { - return this.eventData; - } - - /** - * Convert the EventData to a String. - * - * @return The EventData as a String. - */ - @Override - public String toString() { - return toXML(); - } - - /** - * Compare two EventData objects for equality. - * - * @param o - * The Object to compare. - * @return true if the objects are the same instance or contain all the same - * keys and their values. - */ - @SuppressWarnings("unchecked") - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof EventData || o instanceof Map)) { - return false; - } - Map map = (o instanceof EventData) ? ((EventData) o).getEventMap() : (Map) o; - - return this.eventData.equals(map); - } - - /** - * Compute the hashCode for this EventData instance. - * - * @return The hashcode for this EventData instance. - */ - @Override - public int hashCode() { - return this.eventData.hashCode(); - } -} \ No newline at end of file diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/EventException.java b/slf4j-ext/src/main/java/org/slf4j/ext/EventException.java deleted file mode 100644 index a77b9e54..00000000 --- a/slf4j-ext/src/main/java/org/slf4j/ext/EventException.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright (c) 2004-2011 QOS.ch - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -package org.slf4j.ext; - -/** - * Exception used to identify issues related to an event that is being logged. - */ -public class EventException extends RuntimeException { - - private static final long serialVersionUID = -22873966112391992L; - - /** - * Default constructor. - */ - public EventException() { - super(); - } - - /** - * Constructor that allows an exception message. - * @param exceptionMessage The exception message. - */ - public EventException(String exceptionMessage) { - super(exceptionMessage); - } - - /** - * Constructor that chains another Exception or Error. - * @param originalException The original exception. - */ - public EventException(Throwable originalException) { - super(originalException); - } - - /** - * Constructor that chains another Exception or Error and also allows a message - * to be specified. - * @param exceptionMessage The exception message. - * @param originalException The original exception. - */ - public EventException(String exceptionMessage, Throwable originalException) { - super(exceptionMessage, originalException); - } -} diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java b/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java deleted file mode 100755 index a72e656e..00000000 --- a/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Copyright (c) 2004-2011 QOS.ch - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -package org.slf4j.ext; - -import org.slf4j.LoggerFactory; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; -import org.slf4j.spi.LocationAwareLogger; - -/** - * Simple Logger used to log events. All events are directed to a logger named "EventLogger" - * with a level of INFO and with an Event marker. - * - * @author Ralph Goers - */ -public class EventLogger { - - private static final String FQCN = EventLogger.class.getName(); - - static Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT"); - - private static LoggerWrapper eventLogger = new LoggerWrapper(LoggerFactory.getLogger("EventLogger"), FQCN); - - /** - * There can only be a single EventLogger. - */ - private EventLogger() { - } - - /** - * Logs the event. - * - * @param data The EventData. - */ - public static void logEvent(EventData data) { - if (eventLogger.instanceofLAL) { - ((LocationAwareLogger) eventLogger.logger).log(EVENT_MARKER, FQCN, LocationAwareLogger.INFO_INT, data.toXML(), new Object[] { data }, null); - } else { - eventLogger.logger.info(EVENT_MARKER, data.toXML(), data); - } - } -} diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java deleted file mode 100644 index bb04f3f3..00000000 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright (c) 2004-2011 QOS.ch - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -package org.slf4j.dummyExt; - -import static org.junit.Assert.assertEquals; - -import java.util.Date; -import java.util.Locale; -import java.util.TimeZone; - -import org.apache.log4j.spi.LocationInfo; -import org.apache.log4j.spi.LoggingEvent; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.MDC; -import org.slf4j.ext.EventData; -import org.slf4j.ext.EventLogger; - -public class EventLoggerTest { - - ListAppender listAppender; - org.apache.log4j.Logger log4; - - final static String EXPECTED_FILE_NAME = "EventLoggerTest.java"; - - @Before - public void setUp() throws Exception { - - // start from a clean slate for each test - - listAppender = new ListAppender(); - listAppender.extractLocationInfo = true; - org.apache.log4j.Logger eventLogger = org.apache.log4j.Logger.getLogger("EventLogger"); - eventLogger.addAppender(listAppender); - eventLogger.setLevel(org.apache.log4j.Level.TRACE); - eventLogger.setAdditivity(false); - // Items that apply to any activity - MDC.put("ipAddress", "192.168.1.110"); - MDC.put("login", "TestUSer"); - MDC.put("hostname", "localhost"); - MDC.put("productName", "SLF4J"); - MDC.put("locale", Locale.getDefault().getDisplayName()); - MDC.put("timezone", TimeZone.getDefault().getDisplayName()); - - } - - @After - public void tearDown() throws Exception { - MDC.clear(); - } - - void verify(LoggingEvent le, String expectedMsg) { - assertEquals(expectedMsg, le.getMessage()); - assertEquals(EXPECTED_FILE_NAME, le.getLocationInformation().getFileName()); - } - - @Test - public void testEventLogger() { - EventData data[] = new EventData[2]; - data[0] = new EventData(); - data[0].setEventType("Login"); - data[0].setEventId("1"); - data[0].setEventDateTime(new Date()); - data[0].put("Userid", "TestUser"); - EventLogger.logEvent(data[0]); - - data[1] = new EventData(); - data[1].setEventType("Update"); - data[1].setEventId("2"); - data[1].setEventDateTime(new Date()); - data[1].put("FileName", "/etc/hosts"); - EventLogger.logEvent(data[1]); - - assertEquals(2, listAppender.list.size()); - for (int i = 0; i < 2; ++i) { - LoggingEvent event = listAppender.list.get(i); - verify(event, data[i].toXML()); - LocationInfo li = event.getLocationInformation(); - assertEquals(this.getClass().getName(), li.getClassName()); - assertEquals(event.getMDC("hostname"), "localhost"); - } - } -} \ No newline at end of file diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/PackageTest.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/PackageTest.java index 15300525..c4fba257 100644 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/PackageTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/PackageTest.java @@ -29,6 +29,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({ MDCStrLookupTest.class, XLoggerTest.class, EventLoggerTest.class }) +@SuiteClasses({ MDCStrLookupTest.class, XLoggerTest.class }) public class PackageTest { } diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index cdfa8693..1ad7e9eb 100755 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-jcl diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index e34e2a29..8116eb15 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-jdk14 diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index d5f8b329..3b8b3715 100755 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-log4j12 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 69dfa31c..203ec8e6 100755 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-migrator diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index b0027ae0..9a9906df 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-nop diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 0c72fc0b..d376c605 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-simple diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 749f1713..40e19559 100755 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.25 + 1.7.26 slf4j-site