Move Git daemon into different package

James Moger

2014-03-08 31f477050f223b975bce4862a6aa415ee3045857

Move Git daemon into different package

 src/main/java/com/gitblit/git/GitblitReceivePackFactory.java

@@ -31,6 +31,7 @@
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;

 src/main/java/com/gitblit/git/GitblitUploadPackFactory.java

@@ -25,6 +25,7 @@

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

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

 src/main/java/com/gitblit/git/RepositoryResolver.java

@@ -30,6 +30,7 @@
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;

/**

 src/main/java/com/gitblit/manager/ServicesManager.java

@@ -37,11 +37,11 @@
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;

 src/main/java/com/gitblit/transport/git/GitDaemon.java

File was renamed from src/main/java/com/gitblit/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 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;




 src/main/java/com/gitblit/transport/git/GitDaemonClient.java

File was renamed from src/main/java/com/gitblit/git/GitDaemonClient.java
@@ -1,4 +1,4 @@
package com.gitblit.git;

package com.gitblit.transport.git;



/*

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


 src/main/java/com/gitblit/transport/git/GitDaemonService.java

File was renamed from src/main/java/com/gitblit/git/GitDaemonService.java
@@ -1,4 +1,4 @@
package com.gitblit.git;

package com.gitblit.transport.git;



/*

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


 src/main/java/com/gitblit/transport/ssh/SshDaemon.java

@@ -44,7 +44,7 @@

/**
 * 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
 *