You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2009/08/14 22:04:16 UTC
svn commit: r804349 - in /incubator/thrift/trunk: ./
compiler/cpp/src/generate/ lib/java/ lib/java/src/org/apache/thrift/server/
lib/java/src/org/apache/thrift/transport/
Author: bryanduxbury
Date: Fri Aug 14 20:04:15 2009
New Revision: 804349
URL: http://svn.apache.org/viewvc?rev=804349&view=rev
Log:
THRIFT-558. java: Replace use of log4j by commons-logging in Java library and generated Java code
This patch switches Thrift to use slf4j instead of log4j.
Modified:
incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/java/ivy.xml
incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TSimpleServer.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java
Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc Fri Aug 14 20:04:15 2009
@@ -294,7 +294,8 @@
"import java.util.HashSet;\n" +
"import java.util.Collections;\n" +
"import java.util.BitSet;\n" +
- "import org.apache.log4j.Logger;\n\n";
+ "import org.slf4j.Logger;\n" +
+ "import org.slf4j.LoggerFactory;\n\n";
}
/**
@@ -1932,7 +1933,7 @@
"public static class Processor" << extends_processor << " implements TProcessor {" << endl;
indent_up();
- indent(f_service_) << "private static final Logger LOGGER = Logger.getLogger(Processor.class.getName());" << endl;
+ indent(f_service_) << "private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());" << endl;
indent(f_service_) <<
"public Processor(Iface iface)" << endl;
Modified: incubator/thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Fri Aug 14 20:04:15 2009
@@ -70,11 +70,13 @@
if test "$with_java" = "yes"; then
AX_JAVAC_AND_JAVA
AC_PATH_PROG([ANT], [ant])
- AX_CHECK_JAVA_CLASS(org.apache.log4j.Logger)
- have_log4j="$success"
+ AX_CHECK_JAVA_CLASS(org.slf4j.Logger)
+ have_slf4j="$success"
+ AX_CHECK_JAVA_CLASS(org.slf4j.impl.SimpleLogger)
+ have_slf4j_simple="$success"
AX_CHECK_JAVA_CLASS(org.apache.commons.lang.builder.HashCodeBuilder)
have_hashcode="$success"
- if test "x$have_log4j" = "xyes" && test "x$have_hashcode" = "xyes" ; then
+ if test "x$have_slf4j_simple" = "xyes" && test "x$have_slf4j" = "xyes" && test "x$have_hashcode" = "xyes" ; then
ANT_FLAGS="$ANT_FLAGS -Dnoivy="
fi
AC_SUBST(CLASSPATH)
Modified: incubator/thrift/trunk/lib/java/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/ivy.xml?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/ivy.xml (original)
+++ incubator/thrift/trunk/lib/java/ivy.xml Fri Aug 14 20:04:15 2009
@@ -1,7 +1,8 @@
<ivy-module version="1.0">
<info organisation="jayasoft" module="hello-ivy" />
<dependencies>
- <dependency org="log4j" name="log4j" rev="1.2.15" conf="default->master"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
+ <dependency org="org.slf4j" name="slf4j-simple" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="* -> *,!sources,!javadoc"/>
</dependencies>
</ivy-module>
Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TNonblockingServer.java?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TNonblockingServer.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TNonblockingServer.java Fri Aug 14 20:04:15 2009
@@ -30,7 +30,8 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.thrift.TByteArrayOutputStream;
import org.apache.thrift.TException;
@@ -59,7 +60,7 @@
*/
public class TNonblockingServer extends TServer {
private static final Logger LOGGER =
- Logger.getLogger(TNonblockingServer.class.getName());
+ LoggerFactory.getLogger(TNonblockingServer.class.getName());
// Flag for stopping the server
private volatile boolean stopped_;
Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TSimpleServer.java
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TSimpleServer.java?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TSimpleServer.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TSimpleServer.java Fri Aug 14 20:04:15 2009
@@ -28,7 +28,9 @@
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportFactory;
import org.apache.thrift.transport.TTransportException;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Simple singlethreaded server for testing.
@@ -36,7 +38,7 @@
*/
public class TSimpleServer extends TServer {
- private static final Logger LOGGER = Logger.getLogger(TSimpleServer.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(TSimpleServer.class.getName());
private boolean stopped_ = false;
Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java Fri Aug 14 20:04:15 2009
@@ -29,8 +29,9 @@
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.TTransportFactory;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -46,7 +47,7 @@
*/
public class TThreadPoolServer extends TServer {
- private static final Logger LOGGER = Logger.getLogger(TThreadPoolServer.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(TThreadPoolServer.class.getName());
// Executor service for handling client connections
private ExecutorService executorService_;
Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java Fri Aug 14 20:04:15 2009
@@ -19,7 +19,8 @@
package org.apache.thrift.transport;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -34,7 +35,7 @@
*/
public class TIOStreamTransport extends TTransport {
- private static final Logger LOGGER = Logger.getLogger(TIOStreamTransport.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(TIOStreamTransport.class.getName());
/** Underlying inputStream */
protected InputStream inputStream_ = null;
Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java Fri Aug 14 20:04:15 2009
@@ -19,7 +19,8 @@
package org.apache.thrift.transport;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -33,7 +34,7 @@
*/
public class TServerSocket extends TServerTransport {
- private static final Logger LOGGER = Logger.getLogger(TServerSocket.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(TServerSocket.class.getName());
/**
* Underlying serversocket object
Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java?rev=804349&r1=804348&r2=804349&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java Fri Aug 14 20:04:15 2009
@@ -19,7 +19,8 @@
package org.apache.thrift.transport;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -34,7 +35,7 @@
*/
public class TSocket extends TIOStreamTransport {
- private static final Logger LOGGER = Logger.getLogger(TSocket.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(TSocket.class.getName());
/**
* Wrapped Socket object