renaming JSONEventLayout to JSONEventLayoutV0

Author: lusis

src/main/java/net/logstash/log4j/JSONEventLayout.java renamed to src/main/java/net/logstash/log4j/JSONEventLayoutV0.java

@@ -9,12 +9,11 @@
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.ThrowableInformation;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 
-public class JSONEventLayout extends Layout {
+public class JSONEventLayoutV0 extends Layout {
 
     private boolean locationInfo = false;
 
@@ -44,7 +43,7 @@ public static String dateFormat(long timestamp) {
      * For backwards compatibility, the default is to generate location information
      * in the log messages.
      */
-    public JSONEventLayout() {
+    public JSONEventLayoutV0() {
         this(true);
     }
 
@@ -53,7 +52,7 @@ public JSONEventLayout() {
      *
      * @param locationInfo whether or not to include location information in the log messages.
      */
-    public JSONEventLayout(boolean locationInfo) {
+    public JSONEventLayoutV0(boolean locationInfo) {
         this.locationInfo = locationInfo;
     }
 

src/main/resources/log4j.properties.example renamed to src/main/resources/log4j.v0.properties.example

@@ -6,9 +6,7 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.NDC;
-import org.junit.Before;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -20,9 +18,9 @@
  * Time: 12:07 AM
  * To change this template use File | Settings | File Templates.
  */
-public class JSONEventLayoutTest {
+public class JSONEventLayoutV0Test {
     static Logger logger;
-    static MockAppender appender;
+    static MockAppenderV0 appender;
     static final String[] logstashFields = new String[]{
             "@message",
             "@source_host",
@@ -32,7 +30,7 @@ public class JSONEventLayoutTest {
 
     @BeforeClass
     public static void setupTestAppender() {
-        appender = new MockAppender(new JSONEventLayout());
+        appender = new MockAppenderV0(new JSONEventLayoutV0());
         logger = Logger.getRootLogger();
         appender.setThreshold(Level.TRACE);
         appender.setName("mockappender");
@@ -148,7 +146,7 @@ public void testJSONEventHasThreadName() {
 
     @Test
     public void testJSONEventLayoutNoLocationInfo() {
-        JSONEventLayout layout = (JSONEventLayout) appender.getLayout();
+        JSONEventLayoutV0 layout = (JSONEventLayoutV0) appender.getLayout();
         boolean prevLocationInfo = layout.getLocationInfo();
 
         layout.setLocationInfo(false);
@@ -171,7 +169,7 @@ public void testJSONEventLayoutNoLocationInfo() {
     @Test
     @Ignore
     public void measureJSONEventLayoutLocationInfoPerformance() {
-        JSONEventLayout layout = (JSONEventLayout) appender.getLayout();
+        JSONEventLayoutV0 layout = (JSONEventLayoutV0) appender.getLayout();
         boolean locationInfo = layout.getLocationInfo();
         int iterations = 100000;
         long start, stop;
@@ -201,6 +199,6 @@ public void measureJSONEventLayoutLocationInfoPerformance() {
     @Test
     public void testDateFormat() {
         long timestamp = 1364844991207L;
-        Assert.assertEquals("format does not produce expected output", "2013-04-01T19:36:31.207Z", JSONEventLayout.dateFormat(timestamp));
+        Assert.assertEquals("format does not produce expected output", "2013-04-01T19:36:31.207Z", JSONEventLayoutV0.dateFormat(timestamp));
     }
 }

src/test/java/net/logstash/log4j/JSONEventLayoutTest.java renamed to src/test/java/net/logstash/log4j/JSONEventLayoutV0Test.java

@@ -20,7 +20,7 @@
  * Time: 12:07 AM
  * To change this template use File | Settings | File Templates.
  */
-public class JSONEventV1LayoutTest {
+public class JSONEventLayoutV1Test {
     static Logger logger;
     static MockAppenderV1 appender;
     static final String[] logstashFields = new String[]{

src/test/java/net/logstash/log4j/JSONEventV1LayoutTest.java renamed to src/test/java/net/logstash/log4j/JSONEventLayoutV1Test.java

@@ -7,11 +7,11 @@
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.Layout;
 
-public class MockAppender extends AppenderSkeleton {
+public class MockAppenderV0 extends AppenderSkeleton {
 
     private static List messages = new ArrayList();
 
-    public MockAppender(Layout layout){
+    public MockAppenderV0(Layout layout){
         this.layout = layout;
     }
     @Override