Move Git daemon into different package

8 files changed, 13 insertions, 6 deletions

diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
index 9911258c..af5a8381 100644
--- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
@@ -31,6 +31,7 @@ import com.gitblit.Keys;
 import com.gitblit.manager.IGitblit;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
+import com.gitblit.transport.git.GitDaemonClient;
 import com.gitblit.transport.ssh.SshSession;
 import com.gitblit.utils.HttpUtils;
 import com.gitblit.utils.StringUtils;
diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index d4e3ca15..39ad0724 100644
--- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
@@ -25,6 +25,7 @@ import org.eclipse.jgit.transport.resolver.UploadPackFactory;
 
 import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.models.UserModel;
+import com.gitblit.transport.git.GitDaemonClient;
 
 /**
  * The upload pack factory creates an upload pack which controls what refs are
@@ -51,7 +52,8 @@ public class GitblitUploadPackFactory<X> implements UploadPackFactory<X> {
 
 		if (req instanceof HttpServletRequest) {
 			// http/https request may or may not be authenticated
-			user = authenticationManager.authenticate((HttpServletRequest) req);
+			HttpServletRequest client = (HttpServletRequest) req;
+			user = authenticationManager.authenticate(client);
 			if (user == null) {
 				user = UserModel.ANONYMOUS;
 			}
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index c859f6f6..08048195 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import com.gitblit.manager.IGitblit;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
+import com.gitblit.transport.git.GitDaemonClient;
 import com.gitblit.transport.ssh.SshSession;
 
 /**
diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index 11083be3..f75c6d14 100644
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -37,11 +37,11 @@ import com.gitblit.Keys;
 import com.gitblit.fanout.FanoutNioService;
 import com.gitblit.fanout.FanoutService;
 import com.gitblit.fanout.FanoutSocketService;
-import com.gitblit.git.GitDaemon;
 import com.gitblit.models.FederationModel;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.service.FederationPullService;
+import com.gitblit.transport.git.GitDaemon;
 import com.gitblit.transport.ssh.SshDaemon;
 import com.gitblit.utils.IdGenerator;
 import com.gitblit.utils.StringUtils;
diff --git a/src/main/java/com/gitblit/git/GitDaemon.java b/src/main/java/com/gitblit/transport/git/GitDaemon.java
index d026b5ed..6581ad87 100644
--- a/src/main/java/com/gitblit/git/GitDaemon.java
+++ b/src/main/java/com/gitblit/transport/git/GitDaemon.java
@@ -41,7 +41,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */

-package com.gitblit.git;

+package com.gitblit.transport.git;

 

 import java.io.IOException;

 import java.io.InputStream;

@@ -69,6 +69,9 @@ import org.slf4j.LoggerFactory;
 

 import com.gitblit.IStoredSettings;

 import com.gitblit.Keys;

+import com.gitblit.git.GitblitReceivePackFactory;

+import com.gitblit.git.GitblitUploadPackFactory;

+import com.gitblit.git.RepositoryResolver;

 import com.gitblit.manager.IGitblit;

 import com.gitblit.utils.StringUtils;

 

diff --git a/src/main/java/com/gitblit/git/GitDaemonClient.java b/src/main/java/com/gitblit/transport/git/GitDaemonClient.java
index 8d8cac6d..bc3d4cf7 100644
--- a/src/main/java/com/gitblit/git/GitDaemonClient.java
+++ b/src/main/java/com/gitblit/transport/git/GitDaemonClient.java
@@ -1,4 +1,4 @@
-package com.gitblit.git;

+package com.gitblit.transport.git;

 

 /*

  * Copyright (C) 2008-2009, Google Inc.

diff --git a/src/main/java/com/gitblit/git/GitDaemonService.java b/src/main/java/com/gitblit/transport/git/GitDaemonService.java
index 8dee7d0b..989b2b4c 100644
--- a/src/main/java/com/gitblit/git/GitDaemonService.java
+++ b/src/main/java/com/gitblit/transport/git/GitDaemonService.java
@@ -1,4 +1,4 @@
-package com.gitblit.git;

+package com.gitblit.transport.git;

 

 /*

  * Copyright (C) 2008-2009, Google Inc.

diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
index b23ddd58..cc938bc1 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -44,7 +44,7 @@ import com.gitblit.utils.WorkQueue;
 
 /**
  * Manager for the ssh transport. Roughly analogous to the
- * {@link com.gitblit.git.GitDaemon} class.
+ * {@link com.gitblit.transport.git.GitDaemon} class.
  *
  * @author Eric Myhre
  *