Changeset 451

Timestamp:

01/14/11 18:57:04 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-ua/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/uk/ac/cardiff/RaptorUA/engine/ICARegistry.java (modified) (2 diffs)
• src/main/java/uk/ac/cardiff/RaptorUA/engine/MUARegistry.java (modified) (2 diffs)
• src/main/java/uk/ac/cardiff/RaptorUA/model/MemoryEntryHandler.java (modified) (2 diffs)
• src/main/resources/log4j.properties (modified) (1 diff)

raptor-ua/trunk/pom.xml

@@ -66 +66 @@
                         <version>2.2.7</version>
                 </dependency>
-                <dependency>
+                <!-- <dependency>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                         <version>1.2.14</version>
-                </dependency>
+                </dependency>-->
                 <dependency>
                         <groupId>junit</groupId>

raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/engine/ICARegistry.java

@@ -20 +20 @@
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
-import org.apache.log4j.Logger;
 
 import uk.ac.cardiff.RaptorUA.model.ICAEntry;
@@ -30 +31 @@
  */
 public class ICARegistry {
-    static Logger log = Logger.getLogger(ICARegistry.class);
+    static Logger log = LoggerFactory.getLogger(ICARegistry.class);
 
     private List<ICAEntry> ICAEntries;

raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/engine/MUARegistry.java

@@ -20 +20 @@
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-
-import org.apache.log4j.Logger;
 
 import uk.ac.cardiff.RaptorUA.model.ICAEntry;
@@ -31 +31 @@
  */
 public class MUARegistry {
-    static Logger log = Logger.getLogger(MUARegistry.class);
+    static Logger log = LoggerFactory.getLogger(MUARegistry.class);
 
     private List<MUAEntry> MUAEntries;

raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/model/MemoryEntryHandler.java

@@ -24 +24 @@
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 import uk.ac.cardiff.model.Entry;
@@ -33 +35 @@
  */
 public class MemoryEntryHandler implements EntryHandler{
-    static Logger log = Logger.getLogger(EntryHandler.class);
+    static Logger log = LoggerFactory.getLogger(EntryHandler.class);
 
         /* set of all entries stored by this EntryHanlder */

raptor-ua/trunk/src/main/resources/log4j.properties

@@ -21 +21 @@
 
 log4j.category.uk=DEBUG, stdout
+log4j.category.org.springframework=DEBUG,stdout
 
 #### First appender writes to console