Author: lewismc
Date: Sun May 20 20:56:41 2012
New Revision: 1340838
URL: http://svn.apache.org/viewvc?rev=1340838&view=rev
Log:
commit to address GORA-77 and update to CHANGES.txt
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-core/src/examples/java/org/apache/gora/examples/WebPageDataCreator.java
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
gora/trunk/gora-core/src/test/java/org/apache/gora/GoraTestDriver.java
gora/trunk/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java
gora/trunk/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
gora/trunk/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
gora/trunk/gora-sql/src/main/java/org/apache/gora/sql/store/SqlStore.java
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogManager.java
gora/trunk/pom.xml
Modified: gora/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Sun May 20 20:56:41 2012
@@ -6,6 +6,8 @@ Gora Change Log
0.3 (trunk) Current Development:
+* GORA-77 Replace commons logging with Log4j (Renato Javier MarroquÃn
Mogrovejo via lewismc)
+
* GORA-134 ListGenericArray's hashCode causes StackOverflowError (Kazuomi
Kashii via lewismc)
* GORA-95 Catch incorrect mapping configurations and implement sufficient
logging in CassandraMapping. (lewismc)
Modified:
gora/trunk/gora-core/src/examples/java/org/apache/gora/examples/WebPageDataCreator.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/examples/java/org/apache/gora/examples/WebPageDataCreator.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-core/src/examples/java/org/apache/gora/examples/WebPageDataCreator.java
(original)
+++
gora/trunk/gora-core/src/examples/java/org/apache/gora/examples/WebPageDataCreator.java
Sun May 20 20:56:41 2012
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.HashMap;
import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.examples.generated.Metadata;
import org.apache.gora.examples.generated.WebPage;
import org.apache.gora.store.DataStore;
@@ -37,7 +37,7 @@ import org.apache.hadoop.conf.Configurat
*/
public class WebPageDataCreator {
- private static final Log log = LogFactory.getLog(WebPageDataCreator.class);
+ private static final Logger log =
LoggerFactory.getLogger(WebPageDataCreator.class);
public static final String[] URLS = {
"http://foo.com/";,
Modified:
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
(original)
+++
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
Sun May 20 20:56:41 2012
@@ -32,15 +32,15 @@ import org.apache.avro.Schema;
import org.apache.avro.Protocol.Message;
import org.apache.avro.Schema.Field;
import org.apache.avro.specific.SpecificData;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** Generate specific Java interfaces and classes for protocols and schemas. */
public class GoraCompiler {
private File dest;
private Writer out;
private Set<Schema> queue = new HashSet<Schema>();
- private static final Log log = LogFactory.getLog(GoraCompiler.class);
+ private static final Logger log =
LoggerFactory.getLogger(GoraCompiler.class);
private GoraCompiler(File dest) {
this.dest = dest; // root directory for output
Modified:
gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
(original)
+++
gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
Sun May 20 20:56:41 2012
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.store.impl.DataStoreBase;
import org.apache.gora.util.ClassLoadingUtils;
@@ -36,7 +36,7 @@ import org.apache.hadoop.conf.Configurat
*/
public class DataStoreFactory {
- public static final Log log = LogFactory.getLog(DataStoreFactory.class);
+ public static final Logger log =
LoggerFactory.getLogger(DataStoreFactory.class);
public static final String GORA_DEFAULT_PROPERTIES_FILE = "gora.properties";
@@ -426,4 +426,4 @@ public class DataStoreFactory {
void setDefaultSchemaName(Properties properties, Class<D> dataStoreClass,
String schemaName) {
setProperty(properties, dataStoreClass, SCHEMA_NAME, schemaName);
}
-}
\ No newline at end of file
+}
Modified: gora/trunk/gora-core/src/test/java/org/apache/gora/GoraTestDriver.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/test/java/org/apache/gora/GoraTestDriver.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
--- gora/trunk/gora-core/src/test/java/org/apache/gora/GoraTestDriver.java
(original)
+++ gora/trunk/gora-core/src/test/java/org/apache/gora/GoraTestDriver.java Sun
May 20 20:56:41 2012
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.store.DataStore;
import org.apache.gora.store.DataStoreFactory;
@@ -38,7 +38,7 @@ import org.apache.hadoop.conf.Configurat
*/
public class GoraTestDriver {
- protected static final Log log = LogFactory.getLog(GoraTestDriver.class);
+ protected static final Logger log =
LoggerFactory.getLogger(GoraTestDriver.class);
protected Class<? extends DataStore> dataStoreClass;
protected Configuration conf = new Configuration();
Modified:
gora/trunk/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java
(original)
+++
gora/trunk/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java
Sun May 20 20:56:41 2012
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.examples.WebPageDataCreator;
import org.apache.gora.examples.generated.TokenDatum;
import org.apache.gora.examples.generated.WebPage;
@@ -36,7 +36,7 @@ import org.junit.Assert;
public class MapReduceTestUtils {
- private static final Log log = LogFactory.getLog(MapReduceTestUtils.class);
+ private static final Logger log =
LoggerFactory.getLogger(MapReduceTestUtils.class);
/** Tests by running the {@link QueryCounter} mapreduce job */
public static void testCountQuery(DataStore<String, WebPage> dataStore
Modified:
gora/trunk/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
(original)
+++
gora/trunk/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
Sun May 20 20:56:41 2012
@@ -24,8 +24,8 @@ import java.nio.ByteBuffer;
import junit.framework.Assert;
import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.GoraTestDriver;
import org.apache.gora.examples.generated.Employee;
import org.apache.gora.examples.generated.Metadata;
@@ -45,7 +45,7 @@ import org.junit.Test;
*/
public abstract class DataStoreTestBase {
- public static final Log log = LogFactory.getLog(DataStoreTestBase.class);
+ public static final Logger log =
LoggerFactory.getLogger(DataStoreTestBase.class);
protected static GoraTestDriver testDriver;
Modified:
gora/trunk/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
--- gora/trunk/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
(original)
+++ gora/trunk/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
Sun May 20 20:56:41 2012
@@ -31,8 +31,8 @@ import junit.framework.Assert;
import org.apache.avro.ipc.ByteBufferInputStream;
import org.apache.avro.ipc.ByteBufferOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.mapreduce.GoraMapReduceUtils;
import org.apache.gora.util.IOUtils;
import org.apache.hadoop.conf.Configuration;
@@ -47,7 +47,7 @@ import org.junit.Test;
*/
public class TestIOUtils {
- public static final Log log = LogFactory.getLog(TestIOUtils.class);
+ public static final Logger log = LoggerFactory.getLogger(TestIOUtils.class);
public static Configuration conf = new Configuration();
Modified:
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
(original)
+++
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Sun May 20 20:56:41 2012
@@ -38,8 +38,8 @@ import org.apache.avro.Schema.Field;
import org.apache.avro.Schema.Type;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.hbase.query.HBaseGetResult;
import org.apache.gora.hbase.query.HBaseQuery;
import org.apache.gora.hbase.query.HBaseScannerResult;
@@ -80,7 +80,7 @@ import org.jdom.input.SAXBuilder;
public class HBaseStore<K, T extends Persistent> extends DataStoreBase<K, T>
implements Configurable {
- public static final Log LOG = LogFactory.getLog(HBaseStore.class);
+ public static final Logger LOG = LoggerFactory.getLogger(HBaseStore.class);
public static final String PARSE_MAPPING_FILE_KEY =
"gora.hbase.mapping.file";
Modified:
gora/trunk/gora-sql/src/main/java/org/apache/gora/sql/store/SqlStore.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-sql/src/main/java/org/apache/gora/sql/store/SqlStore.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
--- gora/trunk/gora-sql/src/main/java/org/apache/gora/sql/store/SqlStore.java
(original)
+++ gora/trunk/gora-sql/src/main/java/org/apache/gora/sql/store/SqlStore.java
Sun May 20 20:56:41 2012
@@ -45,8 +45,8 @@ import org.apache.avro.ipc.ByteBufferInp
import org.apache.avro.ipc.ByteBufferOutputStream;
import org.apache.avro.specific.SpecificFixed;
import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.persistency.StateManager;
import org.apache.gora.query.PartitionQuery;
@@ -112,7 +112,7 @@ public class SqlStore<K, T extends Persi
}
}
- private static final Log log = LogFactory.getLog(SqlStore.class);
+ private static final Logger log = LoggerFactory.getLogger(SqlStore.class);
/** The JDBC Driver class name */
protected static final String DRIVER_CLASS_PROPERTY = "jdbc.driver";
Modified:
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
(original)
+++
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
Sun May 20 20:56:41 2012
@@ -20,8 +20,8 @@ package org.apache.gora.tutorial.log;
import java.io.IOException;
import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.mapreduce.GoraMapper;
import org.apache.gora.mapreduce.GoraReducer;
import org.apache.gora.store.DataStore;
@@ -48,7 +48,7 @@ import org.apache.hadoop.util.ToolRunner
*/
public class LogAnalytics extends Configured implements Tool {
- private static final Log log = LogFactory.getLog(LogAnalytics.class);
+ private static final Logger log =
LoggerFactory.getLogger(LogAnalytics.class);
/** The number of miliseconds in a day */
private static final long DAY_MILIS = 1000 * 60 * 60 * 24;
@@ -195,4 +195,4 @@ public class LogAnalytics extends Config
System.exit(ret);
}
-}
\ No newline at end of file
+}
Modified:
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogManager.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogManager.java?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
---
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogManager.java
(original)
+++
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogManager.java
Sun May 20 20:56:41 2012
@@ -25,8 +25,8 @@ import java.text.SimpleDateFormat;
import java.util.StringTokenizer;
import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.gora.query.Query;
import org.apache.gora.query.Result;
import org.apache.gora.store.DataStore;
@@ -50,7 +50,7 @@ import org.apache.hadoop.conf.Configurat
*/
public class LogManager {
- private static final Log log = LogFactory.getLog(LogManager.class);
+ private static final Logger log = LoggerFactory.getLogger(LogManager.class);
private DataStore<Long, Pageview> dataStore;
Modified: gora/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1340838&r1=1340837&r2=1340838&view=diff
==============================================================================
--- gora/trunk/pom.xml (original)
+++ gora/trunk/pom.xml Sun May 20 20:56:41 2012
@@ -535,7 +535,6 @@
<mysql.version>5.1.18</mysql.version>
<xerces.version>2.9.1</xerces.version>
<!-- Logging Dependencies -->
- <commons-logging.version>1.1.1</commons-logging.version>
<slf4j.version>1.5.8</slf4j.version>
<log4j.version>1.2.16</log4j.version>
