Replaced all hardwired instances of log4j with j.u.l

systay · Apr 25, 2011 · d935221 · d935221
1 parent b9462bf
commit d935221
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/server/src/main/java/org/neo4j/server/Bootstrapper.java b/server/src/main/java/org/neo4j/server/Bootstrapper.java
@@ -38,7 +38,9 @@ public abstract class Bootstrapper
     public static final Integer OK = 0;
     public static final Integer WEB_SERVER_STARTUP_ERROR_CODE = 1;
     public static final Integer GRAPH_DATABASE_STARTUP_ERROR_CODE = 2;
-    public static final String KEY_LOG4J_CONFIG_XML_PATH = "log4j.config.xml.path";
+    /*
+        public static final String KEY_LOG4J_CONFIG_XML_PATH = "log4j.config.xml.path";
+    */
 
     private static Logger log = Logger.getLogger( NeoServerBootstrapper.class );
 

diff --git a/server/src/main/java/org/neo4j/server/configuration/validation/Validator.java b/server/src/main/java/org/neo4j/server/configuration/validation/Validator.java
@@ -22,7 +22,7 @@
 import java.util.ArrayList;
 
 import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
+import org.neo4j.server.logging.Logger;
 
 public class Validator {
 

diff --git a/server/src/main/java/org/neo4j/server/plugins/PluginManager.java b/server/src/main/java/org/neo4j/server/plugins/PluginManager.java
@@ -20,9 +20,9 @@
 package org.neo4j.server.plugins;
 
 import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
 import org.neo4j.helpers.Pair;
 import org.neo4j.kernel.AbstractGraphDatabase;
+import org.neo4j.server.logging.Logger;
 import org.neo4j.server.rest.repr.BadInputException;
 import org.neo4j.server.rest.repr.ExtensionInjector;
 import org.neo4j.server.rest.repr.ExtensionPointRepresentation;