svn commit: r824664 - in /directory/studio/trunk/rcp: pom.xml src/main/java/org/apache/directory/studio/Application.java src/main/java/org/apache/directory/studio/Messages.java src/main/resources/log4j.conf src/main/resources/log4j.properties

[se...@apache.org]

Author: seelmann
Date: Tue Oct 13 10:22:12 2009
New Revision: 824664

URL: http://svn.apache.org/viewvc?rev=824664&view=rev
Log:
Removed nlog4j dependency, use slf4j+log4j instead

Added:
    directory/studio/trunk/rcp/src/main/resources/log4j.properties
      - copied unchanged from r824442, directory/studio/trunk/rcp/src/main/resources/log4j.conf
Removed:
    directory/studio/trunk/rcp/src/main/resources/log4j.conf
Modified:
    directory/studio/trunk/rcp/pom.xml
    directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Application.java
    directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Messages.java

Modified: directory/studio/trunk/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp/pom.xml?rev=824664&r1=824663&r2=824664&view=diff
==============================================================================
--- directory/studio/trunk/rcp/pom.xml (original)
+++ directory/studio/trunk/rcp/pom.xml Tue Oct 13 10:22:12 2009
@@ -168,10 +168,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>jface</artifactId>
       <scope>provided</scope>
@@ -246,6 +242,19 @@
       <artifactId>app</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Application.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Application.java?rev=824664&r1=824663&r2=824664&view=diff
==============================================================================
--- directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Application.java (original)
+++ directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Application.java Tue Oct 13 10:22:12 2009
@@ -21,14 +21,13 @@
 package org.apache.directory.studio;
 
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -43,7 +42,7 @@
     public static final String PLUGIN_ID = "org.apache.directory.studio.rcp"; //$NON-NLS-1$
 
     /** The logger*/
-    private static Logger logger = Logger.getLogger( Application.class );
+    private static Logger logger = LoggerFactory.getLogger( Application.class );
 
 
     /* (non-Javadoc)
@@ -51,8 +50,6 @@
      */
     public Object start( IApplicationContext context ) throws Exception
     {
-        // Set up a simple configuration that logs on the console.
-        PropertyConfigurator.configure( Platform.getBundle( Application.PLUGIN_ID ).getResource( "log4j.conf" ) ); //$NON-NLS-1$
         logger.info( "Entering Apache Directory Studio." ); //$NON-NLS-1$
         Display display = PlatformUI.createDisplay();
 

Modified: directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Messages.java?rev=824664&r1=824663&r2=824664&view=diff
==============================================================================
--- directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Messages.java (original)
+++ directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/Messages.java Tue Oct 13 10:22:12 2009
@@ -24,7 +24,9 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 
 /**
@@ -36,7 +38,7 @@
 public class Messages
 {
     // The logger
-    private static Logger logger = Logger.getLogger( Messages.class );
+    private static Logger logger = LoggerFactory.getLogger( Messages.class );
 
     private static final String BUNDLE_NAME = "org.apache.directory.studio.messages"; //$NON-NLS-1$