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 e630292d2..07e39be79 100644 --- 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,26 @@ version="0.0.0" unpack="false"/> + + + + + + 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 9bf94ccc8..44be1e513 100644 --- 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,17 +1,9 @@ - - - + + + - - + @@ -28,11 +20,11 @@ + - - - - + + + @@ -53,18 +45,23 @@ - - + + + + + + + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd new file mode 100644 index 000000000..1d16481cd --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd @@ -0,0 +1,8 @@ +target "jgit-4.3" with source configurePhase + +include "projects/jetty-7.6.14.tpd" +include "orbit/R20150124073747-Luna-SR2.tpd" + +location "http://download.eclipse.org/releases/kepler/" { + org.eclipse.osgi lazy +} 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 2645b1636..38e25a416 100644 --- 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,17 +1,9 @@ - - - + + + - - + @@ -28,11 +20,11 @@ + - - - + + @@ -53,18 +45,23 @@ - - + + + + + + + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd new file mode 100644 index 000000000..afbe9c9f7 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd @@ -0,0 +1,8 @@ +target "jgit-4.4" with source configurePhase + +include "projects/jetty-7.6.14.tpd" +include "orbit/R20150124073747-Luna-SR2.tpd" + +location "http://download.eclipse.org/releases/luna/" { + org.eclipse.osgi lazy +} \ No newline at end of file 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 1ba912232..e5d14330e 100644 --- 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,17 +1,9 @@ - - - + + + - - + @@ -28,11 +20,11 @@ + - - - + + @@ -53,18 +45,23 @@ - - + + + + + + + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd new file mode 100644 index 000000000..33b088a68 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd @@ -0,0 +1,8 @@ +target "jgit-4.5" with source configurePhase + +include "projects/jetty-7.6.14.tpd" +include "orbit/S20150202203538-Mars-M5.tpd" + +location "http://download.eclipse.org/releases/mars/" { + org.eclipse.osgi lazy +} \ No newline at end of file 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 new file mode 100644 index 000000000..d79b41ade --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd @@ -0,0 +1,39 @@ +target "R20150124073747" with source configurePhase +// see http://download.eclipse.org/tools/orbit/downloads/ + +location "http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/" { + org.apache.ant [1.9.2.v201404171502,1.9.2.v201404171502] + org.apache.ant.source [1.9.2.v201404171502,1.9.2.v201404171502] + org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.httpcomponents.httpcore [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpcore.source [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpclient [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.httpcomponents.httpclient.source [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] + org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] + org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] + org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] + org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] + org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] + javaewah [0.7.9.v201401101600,0.7.9.v201401101600] + javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600] + org.objenesis [1.0.0.v201105211943,1.0.0.v201105211943] + org.objenesis.source [1.0.0.v201105211943,1.0.0.v201105211943] + org.mockito [1.8.4.v201303031500,1.8.4.v201303031500] + org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500] + com.jcraft.jsch [0.1.51.v201410302000,0.1.51.v201410302000] + com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000] + org.junit [4.11.0.v201303080030,4.11.0.v201303080030] + org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030] + javax.servlet [2.5.0.v201103041518,2.5.0.v201103041518] + 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] + org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] + org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] +} \ 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 new file mode 100644 index 000000000..3ec1001c9 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd @@ -0,0 +1,39 @@ +target "S20141023165154-Mars-M3" with source configurePhase +// see http://download.eclipse.org/tools/orbit/downloads/ + +location "http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/" { + org.apache.ant [1.9.4.v201410062020,1.9.4.v201410062020] + org.apache.ant.source [1.9.4.v201410062020,1.9.4.v201410062020] + org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.httpcomponents.httpcore [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpcore.source [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpclient [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.httpcomponents.httpclient.source [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] + org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] + org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] + org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] + org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] + org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] + javaewah [0.7.9.v201401101600,0.7.9.v201401101600] + javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600] + org.objenesis [1.0.0.v201105211943,1.0.0.v201105211943] + org.objenesis.source [1.0.0.v201105211943,1.0.0.v201105211943] + org.mockito [1.8.4.v201303031500,1.8.4.v201303031500] + org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500] + com.jcraft.jsch [0.1.51.v201410302000,0.1.51.v201410302000] + com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000] + org.junit [4.11.0.v201303080030,4.11.0.v201303080030] + org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030] + javax.servlet [2.5.0.v201103041518,2.5.0.v201103041518] + 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] + org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] + org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] +} \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd new file mode 100644 index 000000000..2e338d637 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd @@ -0,0 +1,20 @@ +target "jetty-7.6.14" with source configurePhase + +location jetty-7.6.14 "http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/" { + org.eclipse.jetty.client [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.client.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.continuation [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.continuation.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.http [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.http.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.io [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.io.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.security [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.security.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.server [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.server.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.servlet [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.servlet.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.util [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.util.source [7.6.14.v20131031,7.6.14.v20131031] +} diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 21a8b574c..b403052a5 100644 --- 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 02af2c199..e42d604ce 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -83,6 +83,11 @@ org.apache.httpcomponents httpclient + + + org.slf4j + slf4j-api + 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 adbe1f865..687408e19 100644 --- 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 081bf87c5..875e12f57 100644 --- 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 863866df6..de56ca5bf 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,8 @@ 7.6.14.v20131031 2.6.1 4.1.3 + 1.7.2 + 1.2.15 2.9.1 @@ -543,6 +545,24 @@ httpclient ${httpclient-version} + + + org.slf4j + slf4j-api + ${slf4j-version} + + + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + + + + log4j + log4j + ${log4j-version} +