github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'stable-3.7' 

* stable-3.7:
  Add log4j and slf4j-log4j bridge to jgit feature
  Use slf4j to log instead of printing to System.err
  Use Target Platform Definition DSL to generate target platforms

Change-Id: Ic8779868150c910fa55fd20348e35723e6add0f1
stable-4.0
Matthias Sohn 10 years ago
parent
b9725a54fd a8743df19c
commit
d216ce4143
15 changed files with 249 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
  2. 37
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
  3. 8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd
  4. 35
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
  5. 8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd
  6. 35
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
  7. 8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
  8. 39
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
  9. 39
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
  10. 20
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd
  11. 1
      org.eclipse.jgit/META-INF/MANIFEST.MF
  12. 5
      org.eclipse.jgit/pom.xml
  13. 17
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
  14. 40
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
  15. 20
      pom.xml

22
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
Unescape View File

@ -63,4 +63,26 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.slf4j.impl.log4j12"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.apache.log4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

37
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
Unescape View File

@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- <?pde?>
Copyright (C) 2012, 2013 Matthias Sohn <matthias.sohn@sap.com> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.3" sequenceNumber="1424129720">
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<?pde version="3.6"?>
<target name="jgit.target" sequenceNumber="55">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
<unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
@ -28,11 +20,11 @@
<unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
<repository id="jetty-7.6.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/> <unit id="org.apache.ant" version="1.9.2.v201404171502"/>
<unit id="org.apache.ant.source" version="1.8.4.v201303080030"/> <unit id="org.apache.ant.source" version="1.9.2.v201404171502"/>
<unit id="org.apache.ant" version="1.8.4.v201303080030"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/> <unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/> <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
@ -53,18 +45,23 @@
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/> <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/> <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
<unit id="com.jcraft.jsch" version="0.1.50.v201310081430"/> <unit id="com.jcraft.jsch" version="0.1.51.v201410302000"/>
<unit id="com.jcraft.jsch.source" version="0.1.50.v201310081430"/> <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
<unit id="org.junit" version="4.11.0.v201303080030"/> <unit id="org.junit" version="4.11.0.v201303080030"/>
<unit id="org.junit.source" version="4.11.0.v201303080030"/> <unit id="org.junit.source" version="4.11.0.v201303080030"/>
<unit id="javax.servlet" version="2.5.0.v201103041518"/> <unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/> <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" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" 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"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/kepler/"/>
<unit id="org.eclipse.osgi" version="0.0.0"/> <unit id="org.eclipse.osgi" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/kepler/"/>
</location> </location>
</locations> </locations>
</target> </target>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd
Unescape View File

@ -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
}

35
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
Unescape View File

@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- <?pde?>
Copyright (C) 2012, 2013 Matthias Sohn <matthias.sohn@sap.com> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.4" sequenceNumber="1424129605">
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<?pde version="3.6"?>
<target name="jgit.target" sequenceNumber="55">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
<unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
@ -28,11 +20,11 @@
<unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
<repository id="jetty-7.6.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
<unit id="org.apache.ant.source" version="1.9.2.v201404171502"/>
<unit id="org.apache.ant" version="1.9.2.v201404171502"/> <unit id="org.apache.ant" version="1.9.2.v201404171502"/>
<unit id="org.apache.ant.source" version="1.9.2.v201404171502"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/> <unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/> <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
@ -53,18 +45,23 @@
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/> <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/> <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
<unit id="com.jcraft.jsch" version="0.1.50.v201403120620"/> <unit id="com.jcraft.jsch" version="0.1.51.v201410302000"/>
<unit id="com.jcraft.jsch.source" version="0.1.50.v201403120620"/> <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
<unit id="org.junit" version="4.11.0.v201303080030"/> <unit id="org.junit" version="4.11.0.v201303080030"/>
<unit id="org.junit.source" version="4.11.0.v201303080030"/> <unit id="org.junit.source" version="4.11.0.v201303080030"/>
<unit id="javax.servlet" version="2.5.0.v201103041518"/> <unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/> <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" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" 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"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/luna/"/>
<unit id="org.eclipse.osgi" version="0.0.0"/> <unit id="org.eclipse.osgi" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/luna/"/>
</location> </location>
</locations> </locations>
</target> </target>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd
Unescape View File

@ -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
}

35
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
Unescape View File

@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- <?pde?>
Copyright (C) 2014 Matthias Sohn <matthias.sohn@sap.com> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.5" sequenceNumber="1424129587">
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<?pde version="3.6"?>
<target name="jgit.target" sequenceNumber="1">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
<unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
@ -28,11 +20,11 @@
<unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/> <unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
<repository id="jetty-7.6.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20141023165154/repository/"/>
<unit id="org.apache.ant.source" version="1.9.4.v201410062020"/>
<unit id="org.apache.ant" version="1.9.4.v201410062020"/> <unit id="org.apache.ant" version="1.9.4.v201410062020"/>
<unit id="org.apache.ant.source" version="1.9.4.v201410062020"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/> <unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/> <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
@ -53,18 +45,23 @@
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/> <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/> <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
<unit id="com.jcraft.jsch" version="0.1.51.v201410231640"/> <unit id="com.jcraft.jsch" version="0.1.51.v201410302000"/>
<unit id="com.jcraft.jsch.source" version="0.1.51.v201410231640"/> <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
<unit id="org.junit" version="4.11.0.v201303080030"/> <unit id="org.junit" version="4.11.0.v201303080030"/>
<unit id="org.junit.source" version="4.11.0.v201303080030"/> <unit id="org.junit.source" version="4.11.0.v201303080030"/>
<unit id="javax.servlet" version="2.5.0.v201103041518"/> <unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/> <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" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" 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"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/mars/"/>
<unit id="org.eclipse.osgi" version="0.0.0"/> <unit id="org.eclipse.osgi" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/mars/"/>
</location> </location>
</locations> </locations>
</target> </target>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
Unescape View File

@ -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
}

39
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
Unescape View File

@ -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]
}

39
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
Unescape View File

@ -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]
}

20
org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd
Unescape View File

@ -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]
}

1
org.eclipse.jgit/META-INF/MANIFEST.MF
Unescape View File

@ -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)", Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
javax.crypto, javax.crypto,
javax.net.ssl, javax.net.ssl,
org.slf4j;version="[1.7.0,2.0.0)",
org.xml.sax, org.xml.sax,
org.xml.sax.helpers org.xml.sax.helpers

5
org.eclipse.jgit/pom.xml
Unescape View File

@ -83,6 +83,11 @@
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

17
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
Unescape View File

@ -52,8 +52,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; 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.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Traditional file system based {@link ObjectDatabase}. * Traditional file system based {@link ObjectDatabase}.
@ -105,6 +105,9 @@ import org.eclipse.jgit.util.FileUtils;
* considered. * considered.
*/ */
public class ObjectDirectory extends FileObjectDatabase { public class ObjectDirectory extends FileObjectDatabase {
private final static Logger LOG = LoggerFactory
.getLogger(ObjectDirectory.class);
private static final PackList NO_PACKS = new PackList( private static final PackList NO_PACKS = new PackList(
FileSnapshot.DIRTY, new PackFile[0]); 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 // Don't remove the pack from the list, as the error may be
// transient. // transient.
} }
StringBuilder buf = new StringBuilder(MessageFormat.format(tmpl, LOG.error(MessageFormat.format(tmpl,
p.getPackFile().getAbsolutePath())); p.getPackFile().getAbsolutePath()), e);
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());
} }
@Override @Override

40
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
Unescape View File

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

20
pom.xml
Unescape View File

@ -189,6 +189,8 @@
<jetty-version>7.6.14.v20131031</jetty-version> <jetty-version>7.6.14.v20131031</jetty-version>
<clirr-version>2.6.1</clirr-version> <clirr-version>2.6.1</clirr-version>
<httpclient-version>4.1.3</httpclient-version> <httpclient-version>4.1.3</httpclient-version>
<slf4j-version>1.7.2</slf4j-version>
<log4j-version>1.2.15</log4j-version>
<maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version>
<!-- Properties to enable jacoco code coverage analysis --> <!-- Properties to enable jacoco code coverage analysis -->
@ -543,6 +545,24 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${httpclient-version}</version> <version>${httpclient-version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j-version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

Write Preview
Loading…
Cancel
Save