JGit 3.0: move internal classes into an internal subpackage

This breaks all existing callers once. Applications are not supposed
to build against the internal storage API unless they can accept API
churn and make necessary updates as versions change.

Change-Id: I2ab1327c202ef2003565e1b0770a583970e432e9

org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF

@@ -3,15 +3,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.ant.test
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.tools.ant,
  org.apache.tools.ant.types,
- org.eclipse.jgit.ant.tasks;version="2.4.0",
+ org.eclipse.jgit.ant.tasks;version="3.0.0",
+ org.eclipse.jgit.internal.storage.file;version="3.0.0",
  org.eclipse.jgit.junit,
- org.eclipse.jgit.lib;version="2.4.0",
+ org.eclipse.jgit.lib;version="3.0.0",
- org.eclipse.jgit.storage.file;version="2.4.0",
+ org.eclipse.jgit.util;version="3.0.0",
- org.eclipse.jgit.util;version="2.4.0",
  org.hamcrest;version="1.1.0",
  org.junit;version="[4.0.0,5.0.0)"

org.eclipse.jgit.ant.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant.test</artifactId>

org.eclipse.jgit.ant.test/src/org/eclipse/jgit/ant/tasks/GitCloneTaskTest.java

@@ -50,9 +50,9 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.lib.RepositoryCache;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.util.FS;
 import org.junit.Before;
 import org.junit.Test;

org.eclipse.jgit.ant/META-INF/MANIFEST.MF

@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.apache.tools.ant
+Import-Package: org.apache.tools.ant,
+  org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)"
 Bundle-Localization: plugin
 Bundle-Vendor: %Provider-Name
-Export-Package: org.eclipse.jgit.ant.tasks;version="2.4.0"
+Export-Package: org.eclipse.jgit.ant.tasks;version="3.0.0"

org.eclipse.jgit.ant/pom.xml

@@ -48,7 +48,7 @@
 	<parent>
 		<groupId>org.eclipse.jgit</groupId>
 		<artifactId>org.eclipse.jgit-parent</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.jgit.ant</artifactId>

org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitAddTask.java

@@ -53,9 +53,9 @@
 import org.apache.tools.ant.types.resources.Union;
 import org.eclipse.jgit.api.AddCommand;
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryCache;
-import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.util.FS;
 
 /**

org.eclipse.jgit.console/META-INF/MANIFEST.MF

@@ -3,12 +3,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.console
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.jgit.console;version="2.4.0"
+Export-Package: org.eclipse.jgit.console;version="3.0.0"
-Import-Package: org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+Import-Package: org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.nls;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.nls;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)"
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)"
 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"

org.eclipse.jgit.console/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.console</artifactId>

org.eclipse.jgit.http.server/META-INF/MANIFEST.MF

@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Export-Package: 
- org.eclipse.jgit.http.server;version="2.4.0",
+ org.eclipse.jgit.http.server;version="3.0.0",
- org.eclipse.jgit.http.server.glue;version="2.4.0",
+ org.eclipse.jgit.http.server.glue;version="3.0.0",
- org.eclipse.jgit.http.server.resolver;version="2.4.0"
+ org.eclipse.jgit.http.server.resolver;version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
  javax.servlet.http;version="[2.5.0,3.0.0)",
- org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.nls;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.nls;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport.resolver;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)"
+ org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)"

org.eclipse.jgit.http.server/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.server</artifactId>

org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoPacksServlet.java

@@ -52,9 +52,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jgit.internal.storage.file.ObjectDirectory;
+import org.eclipse.jgit.internal.storage.file.PackFile;
 import org.eclipse.jgit.lib.ObjectDatabase;
-import org.eclipse.jgit.storage.file.ObjectDirectory;
-import org.eclipse.jgit.storage.file.PackFile;
 
 /** Sends the current list of pack files, sorted most recent first. */
 class InfoPacksServlet extends HttpServlet {

org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/IsLocalFilter.java

@@ -56,8 +56,8 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jgit.internal.storage.file.ObjectDirectory;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.ObjectDirectory;
 
 /**
  * Requires the target {@link Repository} to be available via local filesystem.

org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java

@@ -60,8 +60,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jgit.internal.storage.file.ObjectDirectory;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.ObjectDirectory;
 
 /** Sends any object from {@code GIT_DIR/objects/??/0 38}, or any pack file. */
 abstract class ObjectFileServlet extends HttpServlet {

org.eclipse.jgit.http.test/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -22,19 +22,20 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
  org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)",
- org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.http.server;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.http.server;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.http.server.glue;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.http.server.glue;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.http.server.resolver;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.http.server.resolver;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.internal;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.junit;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.junit.http;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.junit;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.junit.http;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.nls;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.nls;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport.resolver;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.0.0,3.1.0)",
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
  org.junit;version="[4.0.0,5.0.0)"

org.eclipse.jgit.http.test/pom.xml

@@ -51,7 +51,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.test</artifactId>

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java

@@ -56,6 +56,7 @@
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.http.HttpTestCase;
 import org.eclipse.jgit.lib.Constants;
@@ -65,7 +66,6 @@
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.ReceivePack;
 import org.eclipse.jgit.transport.RemoteRefUpdate;
 import org.eclipse.jgit.transport.Transport;

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java

@@ -61,6 +61,7 @@
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jgit.errors.NotSupportedException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.http.AccessEvent;
 import org.eclipse.jgit.junit.http.HttpTestCase;
@@ -70,7 +71,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.FetchConnection;
 import org.eclipse.jgit.transport.HttpTransport;
 import org.eclipse.jgit.transport.Transport;

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java

@@ -65,6 +65,7 @@
 import org.eclipse.jgit.errors.NotSupportedException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.http.server.GitServlet;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.http.AccessEvent;
 import org.eclipse.jgit.junit.http.HttpTestCase;
@@ -74,7 +75,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.FetchConnection;
 import org.eclipse.jgit.transport.HttpTransport;
 import org.eclipse.jgit.transport.Transport;

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java

@@ -58,6 +58,7 @@
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.http.AccessEvent;
 import org.eclipse.jgit.junit.http.HttpTestCase;
@@ -68,7 +69,6 @@
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.PreReceiveHook;
 import org.eclipse.jgit.transport.PushResult;
 import org.eclipse.jgit.transport.ReceiveCommand;

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java

@@ -64,6 +64,7 @@
 import org.eclipse.jgit.errors.TransportException;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.http.AccessEvent;
 import org.eclipse.jgit.junit.http.AppServer;
@@ -74,7 +75,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.FetchConnection;
 import org.eclipse.jgit.transport.Transport;
 import org.eclipse.jgit.transport.URIish;

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java

@@ -61,6 +61,7 @@
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.http.server.GitSmartHttpTools;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.http.HttpTestCase;
 import org.eclipse.jgit.lib.Constants;
@@ -68,7 +69,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.PacketLineIn;
 import org.eclipse.jgit.transport.PacketLineOut;
 import org.eclipse.jgit.transport.URIish;

org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java

@@ -78,6 +78,9 @@
 import org.eclipse.jgit.errors.TransportException;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.ReflogEntry;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.TestRng;
 import org.eclipse.jgit.junit.http.AccessEvent;
@@ -89,10 +92,7 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogEntry;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.storage.file.ReflogReader;
 import org.eclipse.jgit.transport.FetchConnection;
 import org.eclipse.jgit.transport.HttpTransport;
 import org.eclipse.jgit.transport.RemoteRefUpdate;

org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
@@ -22,14 +22,14 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
  org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)",
- org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.http.server;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.http.server;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.http.server.resolver;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.http.server.resolver;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.junit;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.junit;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport.resolver;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.0.0,3.1.0)",
  org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="2.4.0"
+Export-Package: org.eclipse.jgit.junit.http;version="3.0.0"

org.eclipse.jgit.junit.http/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.http</artifactId>

org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java

@@ -55,6 +55,7 @@
 import java.util.Set;
 
 import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.AnyObjectId;
@@ -63,7 +64,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.RemoteRefUpdate;
 import org.eclipse.jgit.transport.URIish;

org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java

@@ -52,8 +52,8 @@
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.http.server.GitServlet;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.URIish;
 import org.eclipse.jgit.transport.resolver.RepositoryResolver;
 import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;

org.eclipse.jgit.junit/META-INF/MANIFEST.MF

@@ -2,30 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[2.4.0,2.5.0)",
+Import-Package: org.eclipse.jgit.api;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.api.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.diff;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.diff;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.dircache;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.fnmatch;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.fnmatch;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.merge;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.patch;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revplot;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.merge;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk.filter;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.patch;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revplot;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.pack;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.treewalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)",
+ org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)",
  org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="2.4.0"
+Export-Package: org.eclipse.jgit.junit;version="3.0.0"
 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"

org.eclipse.jgit.junit/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit</artifactId>

org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java

@@ -54,7 +54,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.util.FileUtils;
 import org.eclipse.jgit.util.IO;
 import org.eclipse.jgit.util.RawParseUtils;

org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java

@@ -58,13 +58,12 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryCache;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.storage.file.WindowCache;
 import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.FileUtils;
@@ -150,7 +149,7 @@ public void run() {
 		c.setPackedGitWindowSize(8 * WindowCacheConfig.KB);
 		c.setPackedGitMMAP(useMMAP);
 		c.setDeltaBaseCacheLimit(8 * WindowCacheConfig.KB);
-		WindowCache.reconfigure(c);
+		c.install();
 	}
 
 

org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java

@@ -64,6 +64,7 @@
 import org.eclipse.jgit.dircache.DirCacheBuilder;
 import org.eclipse.jgit.dircache.DirCacheCheckout;
 import org.eclipse.jgit.dircache.DirCacheEntry;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.FileMode;
 import org.eclipse.jgit.lib.ObjectId;
@@ -72,7 +73,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.treewalk.FileTreeIterator;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.Before;

org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java

@@ -68,6 +68,12 @@
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.ObjectWritingException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.LockFile;
+import org.eclipse.jgit.internal.storage.file.ObjectDirectory;
+import org.eclipse.jgit.internal.storage.file.PackFile;
+import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
+import org.eclipse.jgit.internal.storage.pack.PackWriter;
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.FileMode;
@@ -88,12 +94,6 @@
 import org.eclipse.jgit.revwalk.RevTag;
 import org.eclipse.jgit.revwalk.RevTree;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.storage.file.LockFile;
-import org.eclipse.jgit.storage.file.ObjectDirectory;
-import org.eclipse.jgit.storage.file.PackFile;
-import org.eclipse.jgit.storage.file.PackIndex.MutableEntry;
-import org.eclipse.jgit.storage.pack.PackWriter;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
 import org.eclipse.jgit.util.FileUtils;

org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit"
       label="%featureName"
-      version="2.4.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.junit"
       label="%featureName"
-      version="2.4.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
@@ -63,17 +63,17 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.junit</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.junit.http</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.server</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm"
       label="%featureName"
-      version="2.4.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="2.4.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="3.0.0" match="equivalent"/>
    </requires>
 
    <plugin

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
@@ -64,19 +64,19 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ui</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm.source"
       label="%featureName"
-      version="2.4.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.repository</artifactId>

org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.source"
       label="%featureName"
-      version="2.4.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/pom.xml

@@ -53,7 +53,7 @@
 
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>jgit.tycho.parent</artifactId>
-  <version>2.4.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JGit Tycho Parent</name>
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>${project.version}</version>
+      <version>3.0.0-SNAPSHOT</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>

org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF

@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[2.4.0,2.5.0)",
+Import-Package: org.eclipse.jgit.api;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.dircache;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.junit;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.junit;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.merge;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.pgm;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.merge;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.pgm.opt;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.pgm;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.pgm.opt;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.junit;version="[4.4.0,5.0.0)",
  org.kohsuke.args4j;version="[2.0.12,2.1.0)",

org.eclipse.jgit.pgm.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm.test</artifactId>

org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java

@@ -47,10 +47,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.pgm.CLIGitCommand;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.junit.Before;
 
 public class CLIRepositoryTestCase extends LocalDiskRepositoryTestCase {

org.eclipse.jgit.pgm/META-INF/MANIFEST.MF

@@ -2,39 +2,41 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)",
  org.apache.commons.compress.archivers.tar;version="[1.3,2.0)",
  org.apache.commons.compress.archivers.zip;version="[1.3,2.0)",
- org.eclipse.jgit.api;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.api;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.api.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.awtui;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.awtui;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.blame;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.blame;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.diff;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.diff;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.dircache;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.merge;version="2.4.0",
+ org.eclipse.jgit.internal.storage.pack;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.nls;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.notes;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.merge;version="3.0.0",
- org.eclipse.jgit.revplot;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.nls;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.notes;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk.filter;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revplot;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.pack;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport.resolver;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.storage.pack;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.treewalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.0.0,3.1.0)",
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)",
+ org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)",
  org.kohsuke.args4j;version="[2.0.12,2.1.0)",
  org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jgit.pgm;version="2.4.0";
+Export-Package: org.eclipse.jgit.pgm;version="3.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.nls,
    org.eclipse.jgit.treewalk,
@@ -43,7 +45,7 @@ Export-Package: org.eclipse.jgit.pgm;version="2.4.0";
    org.eclipse.jgit.pgm.opt,
    org.eclipse.jgit.awtui,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.pgm.debug;version="2.4.0",
+ org.eclipse.jgit.pgm.debug;version="3.0.0",
- org.eclipse.jgit.pgm.opt;version="2.4.0"
+ org.eclipse.jgit.pgm.opt;version="3.0.0"
 Main-Class: org.eclipse.jgit.pgm.Main
 Implementation-Title: JGit Command Line Interface

org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF

@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.pgm - Sources
 Bundle-SymbolicName: org.eclipse.jgit.pgm.source;singleton:=true
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="2.4.0";roots="."
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.0.0";roots="."
 

org.eclipse.jgit.pgm/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm</artifactId>

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java

@@ -52,6 +52,7 @@
 import org.eclipse.jgit.dircache.DirCacheCheckout;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.RefUpdate;
@@ -59,7 +60,6 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.FetchResult;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.RemoteConfig;

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java

@@ -51,7 +51,6 @@
 import java.util.concurrent.Executors;
 
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.WindowCache;
 import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.storage.pack.PackConfig;
 import org.eclipse.jgit.transport.DaemonClient;
@@ -111,11 +110,7 @@ protected void run() throws Exception {
 
 			FileBasedConfig cfg = new FileBasedConfig(configFile, FS.DETECTED);
 			cfg.load();
-
+			new WindowCacheConfig().fromConfig(cfg).install();
-			WindowCacheConfig wcc = new WindowCacheConfig();
-			wcc.fromConfig(cfg);
-			WindowCache.reconfigure(wcc);
-
 			packConfig.fromConfig(cfg);
 		}
 

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java

@@ -46,9 +46,9 @@
 
 import java.io.BufferedInputStream;
 
+import org.eclipse.jgit.internal.storage.file.ObjectDirectoryPackParser;
 import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.TextProgressMonitor;
-import org.eclipse.jgit.storage.file.ObjectDirectoryPackParser;
 import org.eclipse.jgit.transport.PackParser;
 import org.kohsuke.args4j.Option;
 

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java

@@ -46,10 +46,10 @@
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ReflogCommand;
+import org.eclipse.jgit.internal.storage.file.ReflogEntry;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.ReflogEntry;
 import org.kohsuke.args4j.Argument;
 
 @Command(common = true, usage = "usage_manageReflogInformation")

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/Gc.java

@@ -43,10 +43,10 @@
 
 package org.eclipse.jgit.pgm.debug;
 
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.GC;
 import org.eclipse.jgit.lib.TextProgressMonitor;
 import org.eclipse.jgit.pgm.TextBuiltin;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.storage.file.GC;
 
 class Gc extends TextBuiltin {
 	@Override

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java

@@ -58,6 +58,7 @@
 
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.ObjectWritingException;
+import org.eclipse.jgit.internal.storage.file.LockFile;
 import org.eclipse.jgit.lib.CommitBuilder;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
@@ -72,7 +73,6 @@
 import org.eclipse.jgit.pgm.CLIText;
 import org.eclipse.jgit.pgm.TextBuiltin;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.LockFile;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
 

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java

@@ -51,18 +51,18 @@
 
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException;
+import org.eclipse.jgit.internal.storage.pack.BinaryDelta;
+import org.eclipse.jgit.internal.storage.pack.ObjectReuseAsIs;
+import org.eclipse.jgit.internal.storage.pack.ObjectToPack;
+import org.eclipse.jgit.internal.storage.pack.PackOutputStream;
+import org.eclipse.jgit.internal.storage.pack.PackWriter;
+import org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation;
 import org.eclipse.jgit.lib.NullProgressMonitor;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectReader;
 import org.eclipse.jgit.pgm.TextBuiltin;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.pack.BinaryDelta;
-import org.eclipse.jgit.storage.pack.ObjectReuseAsIs;
-import org.eclipse.jgit.storage.pack.ObjectToPack;
-import org.eclipse.jgit.storage.pack.PackOutputStream;
-import org.eclipse.jgit.storage.pack.PackWriter;
-import org.eclipse.jgit.storage.pack.StoredObjectRepresentation;
 import org.eclipse.jgit.util.TemporaryBuffer;
 import org.kohsuke.args4j.Argument;
 

org.eclipse.jgit.test/META-INF/MANIFEST.MF

@@ -2,42 +2,44 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javaewah;version="0.5.6",
- org.eclipse.jgit.api;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.api;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.api.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.awtui;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.awtui;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.blame;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.blame;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.console;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.console;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.diff;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.diff;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.dircache;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.errors;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.errors;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.events;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.events;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.fnmatch;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.fnmatch;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.ignore;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.ignore;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.internal;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.junit;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.lib;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.merge;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.junit;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.nls;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.notes;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.merge;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.patch;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.nls;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.pgm;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.notes;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revplot;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.patch;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.pgm;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.revwalk.filter;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revplot;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.storage.pack;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.submodule;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.transport;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.storage.pack;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.submodule;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.transport;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.treewalk;version="[3.0.0,3.1.0)",
- org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.0.0,3.1.0)",
+ org.eclipse.jgit.util;version="[3.0.0,3.1.0)",
+ org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)",
  org.hamcrest;version="[1.1.0,2.0.0)",
  org.hamcrest.text.pattern;version="[1.1.0,2.0.0)",
  org.junit;version="[4.4.0,5.0.0)",
@@ -45,4 +47,4 @@ Import-Package: javaewah;version="0.5.6",
  org.junit.runner;version="[4.4.0,5.0.0)"
 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.jgit.lib;version="2.4.0"
+Export-Package: org.eclipse.jgit.lib;version="3.0.0"

org.eclipse.jgit.test/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java

@@ -56,6 +56,7 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
@@ -63,7 +64,6 @@
 import org.eclipse.jgit.lib.RepositoryState;
 import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogReader;
 import org.junit.Test;
 
 /**

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java

@@ -56,13 +56,13 @@
 import org.eclipse.jgit.api.errors.NoMessageException;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.RefUpdate;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogReader;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.FileUtils;

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java

@@ -56,6 +56,7 @@
 import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
 import org.eclipse.jgit.api.MergeResult.MergeStatus;
 import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
@@ -65,7 +66,6 @@
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.URIish;

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java

@@ -57,6 +57,7 @@
 import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
 import org.eclipse.jgit.api.MergeResult.MergeStatus;
 import org.eclipse.jgit.api.RebaseResult.Status;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
@@ -67,7 +68,6 @@
 import org.eclipse.jgit.merge.MergeStrategy;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.URIish;

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ReflogCommandTest.java

@@ -47,11 +47,11 @@
 
 import java.util.Collection;
 
+import org.eclipse.jgit.internal.storage.file.ReflogEntry;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogEntry;
 import org.junit.Before;
 import org.junit.Test;
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java

@@ -57,6 +57,7 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
@@ -64,7 +65,6 @@
 import org.eclipse.jgit.lib.RepositoryState;
 import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogReader;
 import org.junit.Test;
 
 /**

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java

@@ -54,6 +54,8 @@
 
 import org.eclipse.jgit.api.errors.UnmergedPathsException;
 import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.internal.storage.file.ReflogEntry;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
@@ -61,8 +63,6 @@
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.ReflogEntry;
-import org.eclipse.jgit.storage.file.ReflogReader;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.eclipse.jgit.util.FileUtils;

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashDropCommandTest.java

@@ -52,13 +52,13 @@
 import java.util.List;
 
 import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.internal.storage.file.ReflogEntry;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogEntry;
-import org.eclipse.jgit.storage.file.ReflogReader;
 import org.junit.Before;
 import org.junit.Test;
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
 import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
@@ -60,6 +60,9 @@
 import java.util.List;
 
 import org.eclipse.jgit.errors.AmbiguousObjectException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.PackIndexWriter;
+import org.eclipse.jgit.internal.storage.file.PackIndexWriterV2;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.AbbreviatedObjectId;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java

@@ -42,7 +42,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -55,8 +55,10 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.internal.storage.pack.PackWriter;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
@@ -67,7 +69,7 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.pack.PackWriter;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.util.FileUtils;
 import org.eclipse.jgit.util.io.SafeBufferedOutputStream;
 import org.junit.After;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -55,6 +55,8 @@
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.Test;
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileSnapshotTest.java

@@ -40,7 +40,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -51,6 +51,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.jgit.internal.storage.file.FileSnapshot;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.After;
 import org.junit.Before;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GCTest.java

@@ -40,7 +40,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static java.lang.Integer.valueOf;
 import static org.junit.Assert.assertEquals;
@@ -63,6 +63,15 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.GC;
+import org.eclipse.jgit.internal.storage.file.LockFile;
+import org.eclipse.jgit.internal.storage.file.PackFile;
+import org.eclipse.jgit.internal.storage.file.PackIndex;
+import org.eclipse.jgit.internal.storage.file.RefDirectory;
+import org.eclipse.jgit.internal.storage.file.RefDirectoryUpdate;
+import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics;
+import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
@@ -81,8 +90,6 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTag;
 import org.eclipse.jgit.revwalk.RevTree;
-import org.eclipse.jgit.storage.file.GC.RepoStatistics;
-import org.eclipse.jgit.storage.file.PackIndex.MutableEntry;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.After;
 import org.junit.Before;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java

@@ -41,13 +41,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import javaewah.EWAHCompressedBitmap;
 
+import org.eclipse.jgit.internal.storage.file.InflatingBitSet;
 import org.junit.Test;
 
 public class InflatingBitSetTest {

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/LockFileTest.java

@@ -40,7 +40,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -49,6 +49,7 @@
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.errors.LockFailedException;
+import org.eclipse.jgit.internal.storage.file.LockFile;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Test;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java

@@ -40,7 +40,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -49,6 +49,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+import org.eclipse.jgit.internal.storage.file.ObjectDirectory;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -60,6 +60,7 @@
 
 import org.eclipse.jgit.errors.LargeObjectException;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.pack.DeltaEncoder;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
@@ -71,7 +72,7 @@
 import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectStream;
 import org.eclipse.jgit.revwalk.RevBlob;
-import org.eclipse.jgit.storage.pack.DeltaEncoder;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.transport.PackParser;
 import org.eclipse.jgit.util.IO;
 import org.eclipse.jgit.util.NB;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -52,8 +52,9 @@
 import java.util.NoSuchElementException;
 
 import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.internal.storage.file.PackIndex;
+import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
 import org.eclipse.jgit.junit.RepositoryTestCase;
-import org.eclipse.jgit.storage.file.PackIndex.MutableEntry;
 import org.junit.Test;
 
 public abstract class PackIndexTestCase extends RepositoryTestCase {

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexV1Test.java

@@ -43,7 +43,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexV2Test.java

@@ -43,7 +43,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackReverseIndexTest.java

@@ -42,7 +42,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -50,9 +50,11 @@
 import static org.junit.Assert.fail;
 
 import org.eclipse.jgit.errors.CorruptObjectException;
+import org.eclipse.jgit.internal.storage.file.PackIndex;
+import org.eclipse.jgit.internal.storage.file.PackReverseIndex;
+import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.RepositoryTestCase;
-import org.eclipse.jgit.storage.file.PackIndex.MutableEntry;
 import org.junit.Before;
 import org.junit.Test;
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -63,6 +63,9 @@
 import java.util.Set;
 
 import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
+import org.eclipse.jgit.internal.storage.pack.PackWriter;
+import org.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.SampleDataRepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
@@ -75,10 +78,7 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.PackIndex.MutableEntry;
 import org.eclipse.jgit.storage.pack.PackConfig;
-import org.eclipse.jgit.storage.pack.PackWriter;
-import org.eclipse.jgit.storage.pack.PackWriter.ObjectIdSet;
 import org.eclipse.jgit.transport.PackParser;
 import org.junit.After;
 import org.junit.Before;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.eclipse.jgit.lib.Constants.HEAD;
 import static org.eclipse.jgit.lib.Constants.R_HEADS;
@@ -67,6 +67,8 @@
 import org.eclipse.jgit.events.ListenerHandle;
 import org.eclipse.jgit.events.RefsChangedEvent;
 import org.eclipse.jgit.events.RefsChangedListener;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.RefDirectory;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.AnyObjectId;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java

@@ -43,7 +43,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.eclipse.jgit.junit.Assert.assertEquals;
 import static org.junit.Assert.assertEquals;
@@ -61,6 +61,11 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.LockFile;
+import org.eclipse.jgit.internal.storage.file.RefDirectory;
+import org.eclipse.jgit.internal.storage.file.RefDirectoryUpdate;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.SampleDataRepositoryTestCase;
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
@@ -122,14 +127,14 @@ public void testNoCacheObjectIdSubclass() throws IOException {
 		assertNotSame(newid, r.getObjectId());
 		assertSame(ObjectId.class, r.getObjectId().getClass());
 		assertEquals(newid, r.getObjectId());
-		List<org.eclipse.jgit.storage.file.ReflogEntry> reverseEntries1 = db.getReflogReader("refs/heads/abc").getReverseEntries();
+		List<org.eclipse.jgit.internal.storage.file.ReflogEntry> reverseEntries1 = db.getReflogReader("refs/heads/abc").getReverseEntries();
-		org.eclipse.jgit.storage.file.ReflogEntry entry1 = reverseEntries1.get(0);
+		org.eclipse.jgit.internal.storage.file.ReflogEntry entry1 = reverseEntries1.get(0);
 		assertEquals(1, reverseEntries1.size());
 		assertEquals(ObjectId.zeroId(), entry1.getOldId());
 		assertEquals(r.getObjectId(), entry1.getNewId());
 		assertEquals(new PersonIdent(db).toString(),  entry1.getWho().toString());
 		assertEquals("", entry1.getComment());
-		List<org.eclipse.jgit.storage.file.ReflogEntry> reverseEntries2 = db.getReflogReader("HEAD").getReverseEntries();
+		List<org.eclipse.jgit.internal.storage.file.ReflogEntry> reverseEntries2 = db.getReflogReader("HEAD").getReverseEntries();
 		assertEquals(0, reverseEntries2.size());
 	}
 
@@ -335,7 +340,7 @@ public void testUpdateRefDetached() throws Exception {
 		// the branch HEAD referred to is left untouched
 		assertEquals(pid, db.resolve("refs/heads/master"));
 		ReflogReader reflogReader = new  ReflogReader(db, "HEAD");
-		org.eclipse.jgit.storage.file.ReflogEntry e = reflogReader.getReverseEntries().get(0);
+		org.eclipse.jgit.internal.storage.file.ReflogEntry e = reflogReader.getReverseEntries().get(0);
 		assertEquals(pid, e.getOldId());
 		assertEquals(ppid, e.getNewId());
 		assertEquals("GIT_COMMITTER_EMAIL", e.getWho().getEmailAddress());
@@ -365,7 +370,7 @@ public void testUpdateRefDetachedUnbornHead() throws Exception {
 		// the branch HEAD referred to is left untouched
 		assertNull(db.resolve("refs/heads/unborn"));
 		ReflogReader reflogReader = new  ReflogReader(db, "HEAD");
-		org.eclipse.jgit.storage.file.ReflogEntry e = reflogReader.getReverseEntries().get(0);
+		org.eclipse.jgit.internal.storage.file.ReflogEntry e = reflogReader.getReverseEntries().get(0);
 		assertEquals(ObjectId.zeroId(), e.getOldId());
 		assertEquals(ppid, e.getNewId());
 		assertEquals("GIT_COMMITTER_EMAIL", e.getWho().getEmailAddress());
@@ -701,9 +706,9 @@ public void tryRenameWhenLocked(String toLock, String fromName,
 		ObjectId oldfromId = db.resolve(fromName);
 		ObjectId oldHeadId = db.resolve(Constants.HEAD);
 		writeReflog(db, oldfromId, "Just a message", fromName);
-		List<org.eclipse.jgit.storage.file.ReflogEntry> oldFromLog = db
+		List<org.eclipse.jgit.internal.storage.file.ReflogEntry> oldFromLog = db
 				.getReflogReader(fromName).getReverseEntries();
-		List<org.eclipse.jgit.storage.file.ReflogEntry> oldHeadLog = oldHeadId != null ? db
+		List<org.eclipse.jgit.internal.storage.file.ReflogEntry> oldHeadLog = oldHeadId != null ? db
 				.getReflogReader(Constants.HEAD).getReverseEntries() : null;
 
 		assertTrue("internal check, we have a log", new File(db.getDirectory(),

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java

@@ -42,7 +42,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -55,6 +55,9 @@
 import java.text.SimpleDateFormat;
 import java.util.List;
 
+import org.eclipse.jgit.internal.storage.file.CheckoutEntry;
+import org.eclipse.jgit.internal.storage.file.ReflogEntry;
+import org.eclipse.jgit.internal.storage.file.ReflogReader;
 import org.eclipse.jgit.junit.SampleDataRepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RepositorySetupWorkDirTest.java

@@ -42,7 +42,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -58,6 +58,8 @@
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.Test;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java

@@ -41,14 +41,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.*;
 
 import javaewah.EWAHCompressedBitmap;
 
+import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.storage.file.BasePackBitmapIndex.StoredBitmap;
 import org.junit.Test;
 
 public class StoredBitmapTest {

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java

@@ -44,7 +44,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -81,6 +81,8 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTag;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.Test;
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0004_PackReaderTest.java

@@ -44,16 +44,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
-import static org.eclipse.jgit.storage.pack.PackExt.INDEX;
+import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
-import static org.eclipse.jgit.storage.pack.PackExt.PACK;
+import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.IOException;
 
+import org.eclipse.jgit.internal.storage.file.PackFile;
+import org.eclipse.jgit.internal.storage.file.WindowCursor;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.SampleDataRepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/UnpackedObjectTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -71,6 +71,7 @@
 import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectStream;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.util.FileUtils;
 import org.eclipse.jgit.util.IO;
 import org.junit.After;
@@ -98,7 +99,7 @@ public void setUp() throws Exception {
 
 		WindowCacheConfig cfg = new WindowCacheConfig();
 		cfg.setStreamFileThreshold(streamThreshold);
-		WindowCache.reconfigure(cfg);
+		cfg.install();
 
 		repo = createBareRepository();
 		wc = (WindowCursor) repo.newObjectReader();
@@ -108,7 +109,7 @@ public void setUp() throws Exception {
 	public void tearDown() throws Exception {
 		if (wc != null)
 			wc.release();
-		WindowCache.reconfigure(new WindowCacheConfig());
+		new WindowCacheConfig().install();
 		super.tearDown();
 	}
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/WindowCacheGetTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -60,6 +60,7 @@
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectLoader;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.util.MutableInteger;
 import org.junit.Before;
 import org.junit.Test;
@@ -97,8 +98,8 @@ public void setUp() throws Exception {
 
 	@Test
 	public void testCache_Defaults() throws IOException {
-		final WindowCacheConfig cfg = new WindowCacheConfig();
+		WindowCacheConfig cfg = new WindowCacheConfig();
-		WindowCache.reconfigure(cfg);
+		cfg.install();
 		doCacheTests();
 		checkLimits(cfg);
 
@@ -111,7 +112,7 @@ public void testCache_Defaults() throws IOException {
 	public void testCache_TooFewFiles() throws IOException {
 		final WindowCacheConfig cfg = new WindowCacheConfig();
 		cfg.setPackedGitOpenFiles(2);
-		WindowCache.reconfigure(cfg);
+		cfg.install();
 		doCacheTests();
 		checkLimits(cfg);
 	}
@@ -121,7 +122,7 @@ public void testCache_TooSmallLimit() throws IOException {
 		final WindowCacheConfig cfg = new WindowCacheConfig();
 		cfg.setPackedGitWindowSize(4096);
 		cfg.setPackedGitLimit(4096);
-		WindowCache.reconfigure(cfg);
+		cfg.install();
 		doCacheTests();
 		checkLimits(cfg);
 	}

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/WindowCacheReconfigureTest.java

@@ -41,12 +41,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import org.eclipse.jgit.junit.RepositoryTestCase;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.junit.Test;
 
 public class WindowCacheReconfigureTest extends RepositoryTestCase {
@@ -55,7 +56,7 @@ public void testConfigureCache_PackedGitLimit_0() {
 		try {
 			final WindowCacheConfig cfg = new WindowCacheConfig();
 			cfg.setPackedGitLimit(0);
-			WindowCache.reconfigure(cfg);
+			cfg.install();
 			fail("incorrectly permitted PackedGitLimit = 0");
 		} catch (IllegalArgumentException e) {
 			//
@@ -67,7 +68,7 @@ public void testConfigureCache_PackedGitWindowSize_0() {
 		try {
 			final WindowCacheConfig cfg = new WindowCacheConfig();
 			cfg.setPackedGitWindowSize(0);
-			WindowCache.reconfigure(cfg);
+			cfg.install();
 			fail("incorrectly permitted PackedGitWindowSize = 0");
 		} catch (IllegalArgumentException e) {
 			assertEquals("Invalid window size", e.getMessage());
@@ -79,7 +80,7 @@ public void testConfigureCache_PackedGitWindowSize_512() {
 		try {
 			final WindowCacheConfig cfg = new WindowCacheConfig();
 			cfg.setPackedGitWindowSize(512);
-			WindowCache.reconfigure(cfg);
+			cfg.install();
 			fail("incorrectly permitted PackedGitWindowSize = 512");
 		} catch (IllegalArgumentException e) {
 			assertEquals("Invalid window size", e.getMessage());
@@ -91,7 +92,7 @@ public void testConfigureCache_PackedGitWindowSize_4097() {
 		try {
 			final WindowCacheConfig cfg = new WindowCacheConfig();
 			cfg.setPackedGitWindowSize(4097);
-			WindowCache.reconfigure(cfg);
+			cfg.install();
 			fail("incorrectly permitted PackedGitWindowSize = 4097");
 		} catch (IllegalArgumentException e) {
 			assertEquals("Window size must be power of 2", e.getMessage());
@@ -103,7 +104,7 @@ public void testConfigureCache_PackedGitOpenFiles_0() {
 		try {
 			final WindowCacheConfig cfg = new WindowCacheConfig();
 			cfg.setPackedGitOpenFiles(0);
-			WindowCache.reconfigure(cfg);
+			cfg.install();
 			fail("incorrectly permitted PackedGitOpenFiles = 0");
 		} catch (IllegalArgumentException e) {
 			assertEquals("Open files must be >= 1", e.getMessage());
@@ -116,7 +117,7 @@ public void testConfigureCache_PackedGitWindowSizeAbovePackedGitLimit() {
 			final WindowCacheConfig cfg = new WindowCacheConfig();
 			cfg.setPackedGitLimit(1024);
 			cfg.setPackedGitWindowSize(8192);
-			WindowCache.reconfigure(cfg);
+			cfg.install();
 			fail("incorrectly permitted PackedGitWindowSize > PackedGitLimit");
 		} catch (IllegalArgumentException e) {
 			assertEquals("Window size must be < limit", e.getMessage());
@@ -133,6 +134,6 @@ public void testConfigureCache_Limits1() {
 		final WindowCacheConfig cfg = new WindowCacheConfig();
 		cfg.setPackedGitLimit(6 * 4096 / 5);
 		cfg.setPackedGitWindowSize(4096);
-		WindowCache.reconfigure(cfg);
+		cfg.install();
 	}
 }

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/XInputStream.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
 
 import java.io.BufferedInputStream;
 import java.io.EOFException;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/pack/DeltaIndexTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.pack;
+package org.eclipse.jgit.internal.storage.pack;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -50,6 +50,10 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+
+import org.eclipse.jgit.internal.storage.pack.BinaryDelta;
+import org.eclipse.jgit.internal.storage.pack.DeltaEncoder;
+import org.eclipse.jgit.internal.storage.pack.DeltaIndex;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.TestRng;
 import org.eclipse.jgit.lib.Constants;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/pack/DeltaStreamTest.java

@@ -41,7 +41,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.pack;
+package org.eclipse.jgit.internal.storage.pack;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -57,6 +57,9 @@
 
 import org.eclipse.jgit.errors.CorruptObjectException;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.pack.BinaryDelta;
+import org.eclipse.jgit.internal.storage.pack.DeltaEncoder;
+import org.eclipse.jgit.internal.storage.pack.DeltaStream;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.TestRng;
 import org.eclipse.jgit.lib.Constants;

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/pack/IntSetTest.java

@@ -41,9 +41,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.storage.pack;
+package org.eclipse.jgit.internal.storage.pack;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 

org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java

@@ -58,6 +58,7 @@
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.NoMergeBaseException;
 import org.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.junit.TestRepository.BranchBuilder;
@@ -70,7 +71,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.treewalk.FileTreeIterator;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilter;

org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java

@@ -61,6 +61,7 @@
 import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
 import org.eclipse.jgit.dircache.DirCacheEntry;
 import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.Config;
@@ -70,7 +71,6 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.treewalk.CanonicalTreeParser;
 import org.eclipse.jgit.treewalk.filter.PathFilter;

org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java

@@ -62,6 +62,8 @@
 
 import org.eclipse.jgit.errors.TooLargeObjectInPackException;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.file.ObjectDirectoryPackParser;
+import org.eclipse.jgit.internal.storage.file.PackFile;
 import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
@@ -71,8 +73,6 @@
 import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
-import org.eclipse.jgit.storage.file.ObjectDirectoryPackParser;
-import org.eclipse.jgit.storage.file.PackFile;
 import org.eclipse.jgit.util.NB;
 import org.eclipse.jgit.util.TemporaryBuffer;
 import org.eclipse.jgit.util.io.UnionInputStream;

org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java

@@ -62,6 +62,8 @@
 
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.UnpackException;
+import org.eclipse.jgit.internal.storage.file.ObjectDirectory;
+import org.eclipse.jgit.internal.storage.pack.BinaryDelta;
 import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.Constants;
@@ -75,8 +77,6 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTree;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.ObjectDirectory;
-import org.eclipse.jgit.storage.pack.BinaryDelta;
 import org.eclipse.jgit.util.NB;
 import org.eclipse.jgit.util.TemporaryBuffer;
 import org.junit.After;

org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportTest.java

@@ -55,10 +55,10 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.junit.SampleDataRepositoryTestCase;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.storage.file.FileRepository;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;