From 7bf6e183ff8abd0c35eeb29f399da12389562ecb Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 29 Nov 2013 11:05:51 -0500 Subject: [PATCH] Moved servlets and services to separate packages --- src/main/java/com/gitblit/service/FederationPullService.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gitblit/FederationPullExecutor.java b/src/main/java/com/gitblit/service/FederationPullService.java similarity index 96% rename from src/main/java/com/gitblit/FederationPullExecutor.java rename to src/main/java/com/gitblit/service/FederationPullService.java index bbe73cf..91fe015 100644 --- a/src/main/java/com/gitblit/FederationPullExecutor.java +++ b/src/main/java/com/gitblit/service/FederationPullService.java @@ -1,4 +1,4 @@ -package com.gitblit; +package com.gitblit.service; import static org.eclipse.jgit.lib.Constants.DOT_GIT_EXT; @@ -26,10 +26,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.gitblit.ConfigUserService; +import com.gitblit.Constants; import com.gitblit.Constants.AccessPermission; import com.gitblit.Constants.FederationPullStatus; import com.gitblit.Constants.FederationStrategy; import com.gitblit.GitBlitException.ForbiddenException; +import com.gitblit.Gitblit; +import com.gitblit.IUserService; +import com.gitblit.Keys; import com.gitblit.models.FederationModel; import com.gitblit.models.RefModel; import com.gitblit.models.RepositoryModel; @@ -42,7 +47,7 @@ import com.gitblit.utils.JGitUtils.CloneResult; import com.gitblit.utils.StringUtils; -public abstract class FederationPullExecutor implements Runnable { +public abstract class FederationPullService implements Runnable { Logger logger = LoggerFactory.getLogger(getClass()); @@ -57,7 +62,7 @@ * @param provider * @param registration */ - public FederationPullExecutor(FederationModel registration) { + public FederationPullService(FederationModel registration) { this(Arrays.asList(registration)); } @@ -72,14 +77,14 @@ * if true, registrations are rescheduled in perpetuity. if * false, the federation pull operation is executed once. */ - public FederationPullExecutor(List<FederationModel> registrations) { + public FederationPullService(List<FederationModel> registrations) { this.registrations = registrations; } public abstract void reschedule(FederationModel registration); /** - * Run method for this pull executor. + * Run method for this pull service. */ @Override public void run() { -- Gitblit v1.9.1