Reset build identifiers for the next release

James Moger

2012-04-11 a9eb6b1105cd47f00ae45dacda9af8e829ade191

 src/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -26,10 +26,10 @@
import java.util.Set;



import org.apache.wicket.PageParameters;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.DropDownChoice;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.IChoiceRenderer;

@@ -42,13 +42,16 @@


import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BulletListPanel;



@@ -80,6 +83,7 @@
      // ensure this user can create or edit this repository

      checkPermissions(repositoryModel);



      List<String> indexedBranches = new ArrayList<String>();

      List<String> federationSets = new ArrayList<String>();

      List<String> repositoryUsers = new ArrayList<String>();

      List<String> repositoryTeams = new ArrayList<String>();

@@ -96,42 +100,55 @@
            Collections.sort(repositoryUsers);

         }

         federationSets.addAll(repositoryModel.federationSets);

         if (!ArrayUtils.isEmpty(repositoryModel.indexedBranches)) {

            indexedBranches.addAll(repositoryModel.indexedBranches);

         }

      }



      final String oldName = repositoryModel.name;

      // users palette

      final Palette<String> usersPalette = new Palette<String>("users", new ListModel<String>(

            repositoryUsers), new CollectionModel<String>(GitBlit.self().getAllUsernames()),

            new ChoiceRenderer<String>("", ""), 10, false);

            new StringChoiceRenderer(), 10, false);



      // teams palette

      final Palette<String> teamsPalette = new Palette<String>("teams", new ListModel<String>(

            repositoryTeams), new CollectionModel<String>(GitBlit.self().getAllTeamnames()),

            new ChoiceRenderer<String>("", ""), 5, false);

            new StringChoiceRenderer(), 8, false);



      // indexed local branches palette

      List<String> allLocalBranches = new ArrayList<String>();

      allLocalBranches.add(Constants.DEFAULT_BRANCH);

      allLocalBranches.addAll(repositoryModel.getLocalBranches());

      boolean luceneEnabled = GitBlit.getBoolean(Keys.web.allowLuceneIndexing, true);

      final Palette<String> indexedBranchesPalette = new Palette<String>("indexedBranches", new ListModel<String>(

            indexedBranches), new CollectionModel<String>(allLocalBranches),

            new StringChoiceRenderer(), 8, false);

      indexedBranchesPalette.setEnabled(luceneEnabled);

		
      // federation sets palette

      List<String> sets = GitBlit.getStrings(Keys.federation.sets);

      final Palette<String> federationSetsPalette = new Palette<String>("federationSets",

            new ListModel<String>(federationSets), new CollectionModel<String>(sets),

            new ChoiceRenderer<String>("", ""), 5, false);

            new StringChoiceRenderer(), 8, false);



      // pre-receive palette

      if (repositoryModel.preReceiveScripts != null) {

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

         preReceiveScripts.addAll(repositoryModel.preReceiveScripts);

      }

      final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts",

            new ListModel<String>(preReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getAvailableScripts()), new ChoiceRenderer<String>("", ""), 12,

            true);

                  .self().getPreReceiveScriptsUnused(repositoryModel)),

            new StringChoiceRenderer(), 12, true);



      // post-receive palette

      if (repositoryModel.postReceiveScripts != null) {

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

         postReceiveScripts.addAll(repositoryModel.postReceiveScripts);

      }

      final Palette<String> postReceivePalette = new Palette<String>("postReceiveScripts",

            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getAvailableScripts()), new ChoiceRenderer<String>("", ""), 12,

            true);

                  .self().getPostReceiveScriptsUnused(repositoryModel)),

            new StringChoiceRenderer(), 12, true);



      CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>(

            repositoryModel);

@@ -144,7 +161,7 @@
            try {

               // confirm a repository name was entered

               if (StringUtils.isEmpty(repositoryModel.name)) {

                  error("Please set repository name!");

                  error(getString("gb.pleaseSetRepositoryName"));

                  return;

               }



@@ -155,35 +172,35 @@


               // prohibit folder paths

               if (repositoryModel.name.startsWith("/")) {

                  error("Leading root folder references (/) are prohibited.");

                  error(getString("gb.illegalLeadingSlash"));

                  return;

               }

               if (repositoryModel.name.startsWith("../")) {

                  error("Relative folder references (../) are prohibited.");

                  error(getString("gb.illegalRelativeSlash"));

                  return;

               }

               if (repositoryModel.name.contains("/../")) {

                  error("Relative folder references (../) are prohibited.");

                  error(getString("gb.illegalRelativeSlash"));

                  return;

               }



               // confirm valid characters in repository name

               Character c = StringUtils.findInvalidCharacter(repositoryModel.name);

               if (c != null) {

                  error(MessageFormat.format("Illegal character ''{0}'' in repository name!",

                  error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),

                        c));

                  return;

               }



               // confirm access restriction selection

               if (repositoryModel.accessRestriction == null) {

                  error("Please select access restriction!");

                  error(getString("gb.selectAccessRestriction"));

                  return;

               }



               // confirm federation strategy selection

               if (repositoryModel.federationStrategy == null) {

                  error("Please select federation strategy!");

                  error(getString("gb.selectFederationStrategy"));

                  return;

               }



@@ -208,6 +225,14 @@
                  }

                  repositoryModel.mailingLists = new ArrayList<String>(list);

               }



               // indexed branches

               List<String> indexedBranches = new ArrayList<String>();

               Iterator<String> branches = indexedBranchesPalette.getSelectedChoices();

               while (branches.hasNext()) {

                  indexedBranches.add(branches.next());

               }

               repositoryModel.indexedBranches = indexedBranches;



               // pre-receive scripts

               List<String> preReceiveScripts = new ArrayList<String>();

@@ -260,6 +285,9 @@
         }

      };



      // do not let the browser pre-populate these fields

      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // field names reflective match RepositoryModel fields

      form.add(new TextField<String>("name").setEnabled(isCreate || isAdmin));

      form.add(new TextField<String>("description"));

@@ -270,6 +298,13 @@
      form.add(new CheckBox("isFrozen"));

      // TODO enable origin definition

      form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));

		
      // allow relinking HEAD to a branch or tag other than master on edit repository

      List<String> availableRefs = new ArrayList<String>();

      if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {

         availableRefs.addAll(repositoryModel.availableRefs);

      }

      form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));



      // federation strategies - remove ORIGIN choice if this repository has

      // no origin.

@@ -281,21 +316,24 @@
      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

      form.add(new CheckBox("useTickets"));

      form.add(new CheckBox("useDocs"));

      form.add(new CheckBox("useDocs"));		
      form.add(new CheckBox("showRemoteBranches"));

      form.add(new CheckBox("showReadme"));

      form.add(new CheckBox("skipSizeCalculation"));

      form.add(new CheckBox("skipSummaryMetrics"));

      mailingLists = new Model<String>(repositoryModel.mailingLists == null ? ""

      mailingLists = new Model<String>(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""

            : StringUtils.flattenStrings(repositoryModel.mailingLists, " "));

      form.add(new TextField<String>("mailingLists", mailingLists));

      form.add(indexedBranchesPalette);

      form.add(usersPalette);

      form.add(teamsPalette);

      form.add(federationSetsPalette);

      form.add(preReceivePalette);

      form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self().getInheritedPreReceiveScripts(repositoryModel)));

      form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self()

            .getPreReceiveScriptsInherited(repositoryModel)));

      form.add(postReceivePalette);

      form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self().getInheritedPostReceiveScripts(repositoryModel)));

      form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()

            .getPostReceiveScriptsInherited(repositoryModel)));



      form.add(new Button("save"));

      Button cancel = new Button("cancel") {