logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1509096 [2/2] - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/ api/src/main/java/org/apache/logging/log4j/message/ api/src/main/java/org/apache/logging/log4j/spi/ api/src/test/java/org/apache/logging/log4j/ api...
Date Thu, 01 Aug 2013 06:39:13 GMT
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java
Thu Aug  1 06:39:11 2013
@@ -69,11 +69,11 @@ public class XmlRandomAccessFileAppender
         assertNotNull("line1", line1);
         final String msg1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
         assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]",
line1.equals(msg1));
-        
+
         assertNotNull("line2", line2);
         final String msg2 = "<log4j:events xmlns:log4j=\"http://logging.apache.org/log4j/\">";
         assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + "]",
line2.equals(msg2));
-        
+
         assertNotNull("line3", line3);
         final String msg3 = "<log4j:event ";
         assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + "]",
line3.contains(msg3));

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
Thu Aug  1 06:39:11 2013
@@ -139,7 +139,7 @@ public class RollingRandomAccessFileMana
         final long expectedMin = System.currentTimeMillis();
         final long expectedMax = expectedMin + 50;
         assertTrue(file.lastModified() < expectedMin);
-        
+
         final RollingRandomAccessFileManager manager = RollingRandomAccessFileManager
                 .getRollingRandomAccessFileManager(
                         //
@@ -159,7 +159,7 @@ public class RollingRandomAccessFileMana
 
         final boolean isAppend = true;
         assertTrue(file.lastModified() < System.currentTimeMillis());
-        
+
         final RollingRandomAccessFileManager manager = RollingRandomAccessFileManager
                 .getRollingRandomAccessFileManager(
                         //

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
Thu Aug  1 06:39:11 2013
@@ -56,7 +56,7 @@ public class AsyncLoggerContextSelectorT
     public void testContextNameIsAsyncLoggerContext() {
         final AsyncLoggerContextSelector selector = new AsyncLoggerContextSelector();
         final LoggerContext context = selector.getContext(null, null, false);
-        
+
         assertEquals("AsyncLoggerContext", context.getName());
     }
 

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
Thu Aug  1 06:39:11 2013
@@ -71,7 +71,7 @@ public class PerfTest {
 		final String name = args[1];
 		final String resultFile = args.length > 2 ? args[2] : null;
 		for (final String arg : args) {
-			if (verbose && throughput) { 
+			if (verbose && throughput) {
 			   break;
 			}
 			if ("-verbose".equalsIgnoreCase(arg)) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
Thu Aug  1 06:39:11 2013
@@ -46,19 +46,19 @@ public class BaseConfigurationTest {
         assertEquals("Appenders Size", 2, map.size());
         assertTrue("Contains List", map.containsKey("List"));
         assertTrue("Contains Console", map.containsKey("Console"));
-        
+
         final Map<String, LoggerConfig> loggerMap = config.getLoggers();
         assertNotNull("loggerMap not null", loggerMap);
         assertEquals("loggerMap Size", 1, loggerMap.size());
         // only the sample logger, no root logger in loggerMap!
         assertTrue("contains key=sample", loggerMap.containsKey("sample"));
-        
+
         final LoggerConfig sample = loggerMap.get("sample");
         final Map<String, Appender<?>> sampleAppenders = sample.getAppenders();
         assertEquals("sampleAppenders Size", 1, sampleAppenders.size());
         // sample only has List appender, not Console!
         assertTrue("sample has appender List", sampleAppenders.containsKey("List"));
-        
+
         final BaseConfiguration baseConfig = (BaseConfiguration) config;
         final LoggerConfig root = baseConfig.getRootLogger();
         final Map<String, Appender<?>> rootAppenders = root.getAppenders();

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
Thu Aug  1 06:39:11 2013
@@ -33,15 +33,15 @@ public class Log4jLogEventTest {
     public void testJavaIoSerializable() throws Exception {
         final Log4jLogEvent evt = new Log4jLogEvent("some.test", null, "",
                 Level.INFO, new SimpleMessage("abc"), null);
-        
+
         final ByteArrayOutputStream arr = new ByteArrayOutputStream();
         final ObjectOutputStream out = new ObjectOutputStream(arr);
         out.writeObject(evt);
-        
+
         final ByteArrayInputStream inArr = new ByteArrayInputStream(arr.toByteArray());
         final ObjectInputStream in = new ObjectInputStream(inArr);
         final Log4jLogEvent evt2 = (Log4jLogEvent) in.readObject();
-        
+
         assertEquals(evt.getMillis(), evt2.getMillis());
         assertEquals(evt.getFQCN(), evt2.getFQCN());
         assertEquals(evt.getLevel(), evt2.getLevel());

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
Thu Aug  1 06:39:11 2013
@@ -66,19 +66,19 @@ public class HTMLLayoutTest {
         final HTMLLayout layout = HTMLLayout.createLayout("true", null, null, null, "small",
null);
         assertEquals("text/html; charset=UTF-8", layout.getContentType());
     }
-    
+
     @Test
     public void testContentType() {
         final HTMLLayout layout = HTMLLayout.createLayout("true", null, "text/html; charset=UTF-16",
null, "small", null);
         assertEquals("text/html; charset=UTF-16", layout.getContentType());
     }
-    
+
     @Test
     public void testDefaultCharset() {
         final HTMLLayout layout = HTMLLayout.createLayout("true", null, null, null, "small",
null);
         assertEquals(Charsets.UTF_8, layout.getCharset());
     }
-    
+
     /**
      * Test case for MDC conversion pattern.
      */

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
Thu Aug  1 06:39:11 2013
@@ -246,11 +246,11 @@ public class RFC5424LayoutTest {
         for (final Appender appender : root.getAppenders().values()) {
             root.removeAppender(appender);
         }
-        
+
         final LoggerFields loggerFields = LoggerFields.createLoggerFields(new KeyValuePair[]
{
         		new KeyValuePair("source", "%C.%M")
         });
-        
+
         // set up layout/appender
         final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event",
"3692", "true", "RequestContext",
             null, null, "true", null, "ATM", null, "key1, key2, locale", null, null, null,
loggerFields, null);

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
Thu Aug  1 06:39:11 2013
@@ -46,7 +46,7 @@ public class Client {
     /**
      * Constructs a new {@code Client} object and creates proxies for all known
      * remote MBeans.
-     * 
+     *
      * @param connector used to create the MBean server connection through which
      *            to communicate with the remote mbeans
      * @throws MalformedObjectNameException if a problem occurred identifying
@@ -64,7 +64,7 @@ public class Client {
     /**
      * Constructs a new {@code Client} object and creates proxies for all known
      * remote MBeans.
-     * 
+     *
      * @param mBeanServerConnection the MBean server connection through which to
      *            communicate with the remote mbeans
      * @throws MalformedObjectNameException if a problem occurred identifying
@@ -103,7 +103,7 @@ public class Client {
     /**
      * Returns a proxy that allows operations to be performed on the remote
      * {@code ContextSelectorAdminMBean}.
-     * 
+     *
      * @return a proxy to the remote {@code ContextSelectorAdminMBean}
      */
     public ContextSelectorAdminMBean getContextSelectorAdmin() {
@@ -113,7 +113,7 @@ public class Client {
     /**
      * Returns a list of proxies that allow operations to be performed on the
      * remote {@code LoggerContextAdminMBean}s.
-     * 
+     *
      * @return a list of proxies to the remote {@code LoggerContextAdminMBean}s
      */
     public List<LoggerContextAdminMBean> getLoggerContextAdmins() {
@@ -135,7 +135,7 @@ public class Client {
     /**
      * Returns the MBean server connection through which to communicate with the
      * remote mbeans.
-     * 
+     *
      * @return the MBean server connection
      */
     public MBeanServerConnection getConnection() {
@@ -145,7 +145,7 @@ public class Client {
     /**
      * Returns a proxy that allows operations to be performed on the remote
      * {@code StatusLoggerAdminMBean}.
-     * 
+     *
      * @return a proxy to the remote {@code StatusLoggerAdminMBean}
      */
     public StatusLoggerAdminMBean getStatusLoggerAdmin() {

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
Thu Aug  1 06:39:11 2013
@@ -48,7 +48,7 @@ public class ClientEditConfigPanel exten
     private static final int CONFIG_TEXT_COLS = 60;
     private static final int CONFIG_TEXT_ROWS = 20;
     private static final int BUFFER_SIZE = 2048;
-    
+
     private JTextField locationTextField;
     private JLabel locationLabel;
     private JButton buttonSendLocation;

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
Thu Aug  1 06:39:11 2013
@@ -54,7 +54,7 @@ import org.apache.logging.log4j.core.jmx
 /**
  * Swing GUI that connects to a Java process via JMX and allows the user to view and
  * modify the Log4j 2 configuration, as well as monitor status logs.
- * 
+ *
  * @see <a href=
  *      "http://docs.oracle.com/javase/6/docs/technotes/guides/management/jconsole.html"
  *      >http://docs.oracle.com/javase/6/docs/technotes/guides/management/jconsole.html</a
>
@@ -143,7 +143,7 @@ public class ClientGUI extends JPanel im
      * Useful links:
      * http://www.componative.com/content/controller/developer/insights
      * /jconsole3/
-     * 
+     *
      * @param args must have at least one parameter, which specifies the
      *            location to connect to. Must be of the form {@code host:port}
      *            or {@code service:jmx:rmi:///jndi/rmi://<host>:<port>/jmxrmi}



Mime
View raw message