Adjustments to build script for missing build.properties (issue 18)

James Moger

2011-09-12 ff3015527b89a29df0918b7f9ff76f4c983ca7d2

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

@@ -19,13 +19,13 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.Date;

import java.util.Iterator;

import java.util.List;

import java.util.Map;



import org.apache.wicket.PageParameters;

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;

@@ -37,6 +37,7 @@
import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

@@ -104,21 +105,29 @@


               // automatically convert backslashes to forward slashes

               repositoryModel.name = repositoryModel.name.replace('\\', '/');

               // Automatically replace // with /

               repositoryModel.name = repositoryModel.name.replace("//", "/");



               // prohibit folder paths

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

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

                  return;

               }

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

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

                  return;

               }

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

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

                  return;

               }



               // confirm valid characters in repository name

               char[] validChars = { '/', '.', '_', '-' };

               for (char c : repositoryModel.name.toCharArray()) {

                  if (!Character.isLetterOrDigit(c)) {

                     boolean ok = false;

                     for (char vc : validChars) {

                        ok |= c == vc;

                     }

                     if (!ok) {

                        error(MessageFormat.format(

                              "Illegal character ''{0}'' in repository name!", c));

                        return;

                     }

                  }

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

               if (c != null) {

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

                        c));

                  return;

               }



               // confirm access restriction selection

@@ -128,7 +137,7 @@
               }



               // save the repository

               GitBlit.self().editRepositoryModel(oldName, repositoryModel, isCreate);

               GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);



               // save the repository access list

               if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

@@ -161,11 +170,35 @@
      form.add(new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays

            .asList(AccessRestrictionType.values()), new AccessRestrictionRenderer()));

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

      // TODO enable origin definition

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

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

      // no origin.

      List<FederationStrategy> federationStrategies = new ArrayList<FederationStrategy>(

            Arrays.asList(FederationStrategy.values()));

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

         federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);

      }

      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

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

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

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

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

      form.add(usersPalette);



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

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;



         @Override

         public void onSubmit() {

            setResponsePage(RepositoriesPage.class);

         }

      };

      cancel.setDefaultFormProcessing(false);

      form.add(cancel);



      add(form);

   }

@@ -236,4 +269,25 @@
         return Integer.toString(index);

      }

   }



   private class FederationTypeRenderer implements IChoiceRenderer<FederationStrategy> {



      private static final long serialVersionUID = 1L;



      private final Map<FederationStrategy, String> map;



      public FederationTypeRenderer() {

         map = getFederationTypes();

      }



      @Override

      public String getDisplayValue(FederationStrategy type) {

         return map.get(type);

      }



      @Override

      public String getIdValue(FederationStrategy type, int index) {

         return Integer.toString(index);

      }

   }

}