Moved servlets and services to separate packages

James Moger

2013-11-21 7bf6e183ff8abd0c35eeb29f399da12389562ecb

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

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


import com.gitblit.Constants;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.GitBlit;

import com.gitblit.Gitblit;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.client.Translation;

import com.gitblit.models.RepositoryModel;

@@ -88,14 +89,25 @@


   protected GroovyScriptEngine gse;



   public GitblitReceivePack(Repository db, RepositoryModel repository, UserModel user) {

   private final IStoredSettings settings;



   private final Gitblit gitblit;



   public GitblitReceivePack(

         Gitblit gitblit,

         Repository db,

         RepositoryModel repository,

         UserModel user) {



      super(db);

      this.settings = gitblit.getSettings();

      this.gitblit = gitblit;

      this.repository = repository;

      this.user = user == null ? UserModel.ANONYMOUS : user;

      this.groovyDir = GitBlit.getGroovyScriptsFolder();

      this.groovyDir = gitblit.getHooksFolder();

      try {

         // set Grape root

         File grapeRoot = GitBlit.getFileOrFolder(Keys.groovy.grapeFolder, "${baseFolder}/groovy/grape").getAbsoluteFile();

         File grapeRoot = gitblit.getGrapesFolder();

         grapeRoot.mkdirs();

         System.setProperty("grape.root", grapeRoot.getAbsolutePath());

         this.gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());

@@ -106,7 +118,7 @@
      setAllowCreates(user.canCreateRef(repository));

      setAllowDeletes(user.canDeleteRef(repository));

      setAllowNonFastForwards(user.canRewindRef(repository));

		


      // setup pre and post receive hook

      setPreReceiveHook(this);

      setPostReceiveHook(this);

@@ -119,6 +131,14 @@
    */

   @Override

   public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {



      if (repository.isMirror) {

         // repository is a mirror

         for (ReceiveCommand cmd : commands) {

            sendRejection(cmd, "Gitblit does not allow pushes to \"{0}\" because it is a mirror!", repository.name);

         }

         return;

      }



      if (repository.isFrozen) {

         // repository is frozen/readonly

@@ -226,7 +246,7 @@
      }



      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(GitBlit.self().getPreReceiveScriptsInherited(repository));

      scripts.addAll(gitblit.getPreReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {

         scripts.addAll(repository.preReceiveScripts);

      }

@@ -295,7 +315,7 @@
               String msg = MessageFormat.format(template, branch);

               String prefix;

               if (StringUtils.isEmpty(repository.incrementalPushTagPrefix)) {

                  prefix = GitBlit.getString(Keys.git.defaultIncrementalPushTagPrefix, "r");

                  prefix = settings.getString(Keys.git.defaultIncrementalPushTagPrefix, "r");

               } else {

                  prefix = repository.incrementalPushTagPrefix;

               }

@@ -321,7 +341,7 @@


      // run Groovy hook scripts

      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(GitBlit.self().getPostReceiveScriptsInherited(repository));

      scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {

         scripts.addAll(repository.postReceiveScripts);

      }

@@ -389,14 +409,22 @@
      LOGGER.error(text + " (" + user.username + ")");

   }



   protected void sendHeader(String msg, Object... objects) {

      sendMessage("--->", msg, objects);

   }



   protected void sendMessage(String msg, Object... objects) {

      sendMessage("    ", msg, objects);

   }



   protected void sendMessage(String prefix, String msg, Object... objects) {

      String text;

      if (ArrayUtils.isEmpty(objects)) {

         text = msg;

         super.sendMessage(msg);

         super.sendMessage(prefix + msg);

      } else {

         text = MessageFormat.format(msg, objects);

         super.sendMessage(text);

         super.sendMessage(prefix + text);

      }

      LOGGER.info(text + " (" + user.username + ")");

   }

@@ -421,14 +449,14 @@
    * @param commands

    * @param scripts

    */

   protected void runGroovy(Collection<ReceiveCommand> commands, Set<String> scripts) {

   private void runGroovy(Collection<ReceiveCommand> commands, Set<String> scripts) {

      if (scripts == null || scripts.size() == 0) {

         // no Groovy scripts to execute

         return;

      }



      Binding binding = new Binding();

      binding.setVariable("gitblit", GitBlit.self());

      binding.setVariable("gitblit", gitblit);

      binding.setVariable("repository", repository);

      binding.setVariable("receivePack", this);

      binding.setVariable("user", user);