Merge changes I282ee1c6,I5700ca48,Ic243544a,Ia2cce34d,I2fd81be2

* changes:
  Move HttpSupport's configureHttpProxy to jgit-pgm
  Move AmazonS3 command line utility to jgit-pgm
  Move setupReflog test function to only test that cares
  Remove useless test005_todopack test
  Standardize the source code formatter for Eclipse

3 files changed, 22 insertions, 47 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogReaderTest.java
index dae7cb8955..1f2f25d5e2 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogReaderTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogReaderTest.java
@@ -44,6 +44,10 @@
 
 package org.eclipse.jgit.lib;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.List;
 
@@ -173,4 +177,22 @@ public class ReflogReaderTest extends RepositoryTestCase {
 		assertEquals(0, db.getReflogReader("master").getReverseEntries().size());
 		assertNull(db.getReflogReader("master").getLastEntry());
 	}
+
+	private void setupReflog(String logName, byte[] data)
+			throws FileNotFoundException, IOException {
+				File logfile = new File(db.getDirectory(), logName);
+				if (!logfile.getParentFile().mkdirs()
+						&& !logfile.getParentFile().isDirectory()) {
+					throw new IOException(
+							"oops, cannot create the directory for the test reflog file"
+									+ logfile);
+				}
+				FileOutputStream fileOutputStream = new FileOutputStream(logfile);
+				try {
+					fileOutputStream.write(data);
+				} finally {
+					fileOutputStream.close();
+				}
+			}
+
 }
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
index 2870e4126a..ac8881b1fc 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
@@ -46,7 +46,6 @@ package org.eclipse.jgit.lib;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -326,22 +325,4 @@ public abstract class RepositoryTestCase extends TestCase {
 		repositoriesToClose.add(newRepo);
 		return newRepo;
 	}
-
-	protected void setupReflog(String logName, byte[] data)
-			throws FileNotFoundException, IOException {
-				File logfile = new File(db.getDirectory(), logName);
-				if (!logfile.getParentFile().mkdirs()
-						&& !logfile.getParentFile().isDirectory()) {
-					throw new IOException(
-							"oops, cannot create the directory for the test reflog file"
-									+ logfile);
-				}
-				FileOutputStream fileOutputStream = new FileOutputStream(logfile);
-				try {
-					fileOutputStream.write(data);
-				} finally {
-					fileOutputStream.close();
-				}
-			}
-
 }
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0004_PackReader.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0004_PackReader.java
index adddbfe099..be801e4940 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0004_PackReader.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0004_PackReader.java
@@ -83,32 +83,4 @@ public class T0004_PackReader extends RepositoryTestCase {
 		assertEquals(18009, or.getSize());
 		assertEquals(537, ((PackedObjectLoader) or).getDataOffset());
 	}
-
-	public void test005_todopack() throws IOException {
-		final File todopack = JGitTestUtil.getTestResourceFile("todopack");
-		if (!todopack.isDirectory()) {
-			System.err.println("Skipping " + getName() + ": no " + todopack);
-			return;
-		}
-
-		final File packDir = new File(db.getObjectsDirectory(), "pack");
-		final String packname = "pack-2e71952edc41f3ce7921c5e5dd1b64f48204cf35";
-		copyFile(new File(todopack, packname + ".pack"), new File(packDir,
-				packname + ".pack"));
-		copyFile(new File(todopack, packname + ".idx"), new File(packDir,
-				packname + ".idx"));
-		Tree t;
-
-		t = db
-				.mapTree(ObjectId.fromString(
-						"aac9df07f653dd18b935298deb813e02c32d2e6f"));
-		assertNotNull(t);
-		t.memberCount();
-
-		t = db
-				.mapTree(ObjectId.fromString(
-						"6b9ffbebe7b83ac6a61c9477ab941d999f5d0c96"));
-		assertNotNull(t);
-		t.memberCount();
-	}
 }