Use slf4j to log instead of printing to System.err

CQ: 9206
Bug: 458445
Change-Id: Ic68fb7dbe0fb46bf30f157db45bf18d8f3a704c0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
index 10ea2c9e569ed02b19e69bc62fbfcf8df481a60f..def15417170e5ac320be1eb2d3bc80d02bfd386e 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
@@ -63,4 +63,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
index c0eff7da432af08447e64cc790f6b766477f310d..76361d88f2d9241bbdea29802e7a654b0ccc23ba 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.3" sequenceNumber="1424128174">
+<target name="jgit-4.3" sequenceNumber="1424129461">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
@@ -53,6 +53,8 @@
       <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
       <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
+      <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+      <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
index c414f4152664515ee1f2dbd8b4073360bed6a8bf..8f7053d0545732513d82ace498e2677bb286a97b 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.4" sequenceNumber="1424128038">
+<target name="jgit-4.4" sequenceNumber="1424129435">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
@@ -53,6 +53,8 @@
       <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
       <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
+      <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+      <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
index 45dec35aef367f1691998dfe6407b6316f2b7d6f..4909416f74e281e70c69af00d0c178804cb6edfe 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.5" sequenceNumber="1424127977">
+<target name="jgit-4.5" sequenceNumber="1424129206">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
@@ -53,6 +53,8 @@
       <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
       <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
+      <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+      <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
index 5384a9a213352bf2a0622aab59725bdd1541b0e8..683a8c7ce5839b84cc0883c636e6aa0e8b0ab1ea 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
@@ -32,4 +32,6 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2015012407374
        javax.servlet.source [2.5.0.v201103041518,2.5.0.v201103041518]
        org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617]
        org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617]
+       org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
 }
\ No newline at end of file

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
index d41a5f4dfe5ac2994a163a10431024a321806595..415fdca5d0acdb6087055f39f1407dbc217ca7a4 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
@@ -32,4 +32,6 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2015020220353
        javax.servlet.source [2.5.0.v201103041518,2.5.0.v201103041518]
        org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617]
        org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617]
+       org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
 }
\ No newline at end of file

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index eea13ec7be9b036db1eb67bdfb17ee62e9098a6f..55ef0605b23c540c0c58aba54349797bfc84cba5 100644 (file)
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -147,5 +147,6 @@ Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
  javax.crypto,
  javax.net.ssl,
+ org.slf4j;version="[1.7.0,2.0.0)",
  org.xml.sax,
  org.xml.sax.helpers

diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 36a579ec226f1d8db2b3258ce85535cc57572613..6ca299ed5b8c8534401425719fbd8e0134f99bd1 100644 (file)
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -83,6 +83,11 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
index adbe1f8652a08a00d5260b44d70994d2575a4570..687408e19d7eed865617208c726301067f91f31a 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
@@ -52,8 +52,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -85,6 +83,8 @@ import org.eclipse.jgit.lib.RepositoryCache;
 import org.eclipse.jgit.lib.RepositoryCache.FileKey;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Traditional file system based {@link ObjectDatabase}.
@@ -105,6 +105,9 @@ import org.eclipse.jgit.util.FileUtils;
  * considered.
  */
 public class ObjectDirectory extends FileObjectDatabase {
+       private final static Logger LOG = LoggerFactory
+                       .getLogger(ObjectDirectory.class);
+
        private static final PackList NO_PACKS = new PackList(
                        FileSnapshot.DIRTY, new PackFile[0]);
 
@@ -565,14 +568,8 @@ public class ObjectDirectory extends FileObjectDatabase {
                        // Don't remove the pack from the list, as the error may be
                        // transient.
                }
-               StringBuilder buf = new StringBuilder(MessageFormat.format(tmpl,
-                               p.getPackFile().getAbsolutePath()));
-               StringWriter sw = new StringWriter();
-               e.printStackTrace(new PrintWriter(sw));
-               buf.append('\n');
-               buf.append(sw.toString());
-               // TODO instead of syserr we should use a logging framework
-               System.err.println(buf.toString());
+               LOG.error(MessageFormat.format(tmpl,
+                               p.getPackFile().getAbsolutePath()), e);
        }
 
        @Override

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 081bf87c5472bdef2ac9fdd12808a3205d702f9c..875e12f57b4684ed5243170ff63aa46265ffa1ca 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -69,6 +69,8 @@ import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.util.ProcessResult.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Abstraction to support various file system operations not in Java. */
 public abstract class FS {
@@ -107,6 +109,8 @@ public abstract class FS {
                }
        }
 
+       private final static Logger LOG = LoggerFactory.getLogger(FS.class);
+
        /** The auto-detected implementation selected for this operating system and JRE. */
        public static final FS DETECTED = detect();
 
@@ -418,12 +422,12 @@ public abstract class FS {
         * @return the one-line output of the command
         */
        protected static String readPipe(File dir, String[] command, String encoding) {
-               final boolean debug = Boolean.parseBoolean(SystemReader.getInstance()
-                               .getProperty("jgit.fs.debug")); //$NON-NLS-1$
+               final boolean debug = LOG.isDebugEnabled();
                try {
-                       if (debug)
-                               System.err.println("readpipe " + Arrays.asList(command) + "," //$NON-NLS-1$ //$NON-NLS-2$
+                       if (debug) {
+                               LOG.debug("readpipe " + Arrays.asList(command) + "," //$NON-NLS-1$ //$NON-NLS-2$
                                                + dir);
+                       }
                        final Process p = Runtime.getRuntime().exec(command, null, dir);
                        final BufferedReader lineRead = new BufferedReader(
                                        new InputStreamReader(p.getInputStream(), encoding));
@@ -451,8 +455,9 @@ public abstract class FS {
                                                is.close();
                                        } catch (IOException e) {
                                                // Just print on stderr for debugging
-                                               if (debug)
-                                                       e.printStackTrace(System.err);
+                                               if (debug) {
+                                                       LOG.debug("Caught exception in gobbler thread", e); //$NON-NLS-1$
+                                               }
                                                gooblerFail.set(true);
                                        }
                                }
@@ -462,13 +467,14 @@ public abstract class FS {
                        try {
                                r = lineRead.readLine();
                                if (debug) {
-                                       System.err.println("readpipe may return '" + r + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-                                       System.err.println("(ignoring remaing output:"); //$NON-NLS-1$
+                                       LOG.debug("readpipe may return '" + r + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+                                       LOG.debug("(ignoring remaing output:"); //$NON-NLS-1$
                                }
                                String l;
                                while ((l = lineRead.readLine()) != null) {
-                                       if (debug)
-                                               System.err.println(l);
+                                       if (debug) {
+                                               LOG.debug(l);
+                                       }
                                }
                        } finally {
                                p.getErrorStream().close();
@@ -482,20 +488,20 @@ public abstract class FS {
                                        if (rc == 0 && r != null && r.length() > 0
                                                        && !gooblerFail.get())
                                                return r;
-                                       if (debug)
-                                               System.err.println("readpipe rc=" + rc); //$NON-NLS-1$
+                                       if (debug) {
+                                               LOG.debug("readpipe rc=" + rc); //$NON-NLS-1$
+                                       }
                                        break;
                                } catch (InterruptedException ie) {
                                        // Stop bothering me, I have a zombie to reap.
                                }
                        }
                } catch (IOException e) {
-                       if (debug)
-                               System.err.println(e);
-                       // Ignore error (but report)
+                       LOG.error("Caught exception in FS.readPipe()", e); //$NON-NLS-1$
+               }
+               if (debug) {
+                       LOG.debug("readpipe returns null"); //$NON-NLS-1$
                }
-               if (debug)
-                       System.err.println("readpipe returns null"); //$NON-NLS-1$
                return null;
        }
 

diff --git a/pom.xml b/pom.xml
index d222dc2ba49bffe27febbc1437476924f9d9a62b..128d793777535b3140fbb1220926d11b4dc7d71f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
     <jetty-version>7.6.14.v20131031</jetty-version>
     <clirr-version>2.6.1</clirr-version>
     <httpclient-version>4.1.3</httpclient-version>
+    <slf4j-version>1.7.2</slf4j-version>
     <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version>
 
     <!-- Properties to enable jacoco code coverage analysis -->
@@ -543,6 +544,11 @@
         <artifactId>httpclient</artifactId>
         <version>${httpclient-version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j-version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>