From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index bd84ae3..af1b2b4 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -42,6 +42,7 @@
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;
@@ -116,13 +117,14 @@
new StringChoiceRenderer(), 8, false);
// indexed local branches palette
- List<String> allLocalBranches = repositoryModel.getLocalBranches();
-
+ 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(allLocalBranches.size() > 0);
-
+ indexedBranchesPalette.setEnabled(luceneEnabled);
// federation sets palette
List<String> sets = GitBlit.getStrings(Keys.federation.sets);
@@ -159,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;
}
@@ -170,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;
}
@@ -302,7 +304,7 @@
if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {
availableRefs.addAll(repositoryModel.availableRefs);
}
- form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(!isCreate));
+ form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));
// federation strategies - remove ORIGIN choice if this repository has
// no origin.
--
Gitblit v1.9.1