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/RepositoriesPage.java | 404 +++++++++++++++------------------------------------------
1 files changed, 110 insertions(+), 294 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 14a5426..40d1a65 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -1,338 +1,154 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.pages;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.text.MessageFormat;
import java.util.List;
-import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.resource.ContextRelativeResource;
+import org.eclipse.jgit.lib.Constants;
-import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
-import com.gitblit.utils.TimeUtils;
-import com.gitblit.wicket.BasePage;
import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.LinkPanel;
+import com.gitblit.wicket.PageRegistration;
+import com.gitblit.wicket.PageRegistration.DropDownMenuItem;
+import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.models.RepositoryModel;
-import com.gitblit.wicket.models.UserModel;
+import com.gitblit.wicket.panels.RepositoriesPanel;
-public class RepositoriesPage extends BasePage {
+public class RepositoriesPage extends RootPage {
public RepositoriesPage() {
super();
+ setup(null);
+ }
+
+ public RepositoriesPage(PageParameters params) {
+ super(params);
+ setup(params);
+ }
+
+ @Override
+ protected boolean reusePageParameters() {
+ return true;
+ }
+
+ private void setup(PageParameters params) {
setupPage("", "");
-
- final boolean showAdmin;
- if (GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
- boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
- showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
- // authentication requires state and session
- setStatelessHint(false);
- } else {
- showAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
- if (GitBlit.self().settings().getBoolean(Keys.web.authenticateViewPages, false)) {
- // authentication requires state and session
- setStatelessHint(false);
- } else {
- // no authentication required, no state and no session required
- setStatelessHint(true);
- }
- }
-
- Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
- adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("editUsers", RepositoriesPage.class));
- add(adminLinks.setVisible(showAdmin));
-
- // display an error message cached from a redirect
- String cachedMessage = GitBlitWebSession.get().clearErrorMessage();
- if (!StringUtils.isEmpty(cachedMessage)) {
- error(cachedMessage);
- System.out.println("displayed message");
+ // check to see if we should display a login message
+ boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true);
+ if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) {
+ String messageSource = GitBlit.getString(Keys.web.loginMessage, "gitblit");
+ String message = readMarkdown(messageSource, "login.mkd");
+ Component repositoriesMessage = new Label("repositoriesMessage", message);
+ add(repositoriesMessage.setEscapeModelStrings(false));
+ add(new Label("repositoriesPanel"));
+ return;
}
// Load the markdown welcome message
- String messageSource = GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "gitblit");
- String message = "<br/>";
+ String messageSource = GitBlit.getString(Keys.web.repositoriesMessage, "gitblit");
+ String message = readMarkdown(messageSource, "welcome.mkd");
+ Component repositoriesMessage = new Label("repositoriesMessage", message)
+ .setEscapeModelStrings(false).setVisible(message.length() > 0);
+ add(repositoriesMessage);
+
+ List<RepositoryModel> repositories = getRepositories(params);
+
+ RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", showAdmin,
+ repositories, true, getAccessRestrictions());
+ // push the panel down if we are hiding the admin controls and the
+ // welcome message
+ if (!showAdmin && !repositoriesMessage.isVisible()) {
+ WicketUtils.setCssStyle(repositoriesPanel, "padding-top:5px;");
+ }
+ add(repositoriesPanel);
+ }
+
+ @Override
+ protected void addDropDownMenus(List<PageRegistration> pages) {
+ PageParameters params = getPageParameters();
+
+ DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters",
+ RepositoriesPage.class);
+ // preserve time filter option on repository choices
+ menu.menuItems.addAll(getRepositoryFilterItems(params));
+
+ // preserve repository filter option on time choices
+ menu.menuItems.addAll(getTimeFilterItems(params));
+
+ if (menu.menuItems.size() > 0) {
+ // Reset Filter
+ menu.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null));
+ }
+
+ pages.add(menu);
+ }
+
+ private String readMarkdown(String messageSource, String resource) {
+ String message = "";
if (messageSource.equalsIgnoreCase("gitblit")) {
- // Read default welcome message
- try {
- ContextRelativeResource res = WicketUtils.getResource("welcome.mkd");
- InputStream is = res.getResourceStream().getInputStream();
- InputStreamReader reader = new InputStreamReader(is);
- message = MarkdownUtils.transformMarkdown(reader);
- } catch (Throwable t) {
- message = "Failed to read default welcome message!";
- error(message, t, false);
- }
+ // Read default message
+ message = readDefaultMarkdown(resource);
} else {
- // Read user-supplied welcome message
+ // Read user-supplied message
if (!StringUtils.isEmpty(messageSource)) {
File file = new File(messageSource);
if (file.exists()) {
try {
- FileReader reader = new FileReader(file);
+ FileInputStream fis = new FileInputStream(file);
+ InputStreamReader reader = new InputStreamReader(fis,
+ Constants.CHARACTER_ENCODING);
message = MarkdownUtils.transformMarkdown(reader);
+ reader.close();
} catch (Throwable t) {
- message = "Failed to read " + file;
- error(message, t, false);
+ message = getString("gb.failedToRead") + " " + file;
+ warn(message, t);
}
} else {
- message = messageSource + " is not a valid file.";
+ message = messageSource + " " + getString("gb.isNotValidFile");
}
}
}
- Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);
- add(repositoriesMessage);
-
- final Map<AccessRestrictionType, String> accessRestrictionTranslations = getAccessRestrictions();
- final UserModel user = GitBlitWebSession.get().getUser();
- List<RepositoryModel> models = GitBlit.self().getRepositoryModels(user);
- IDataProvider<RepositoryModel> dp;
-
- if (GitBlit.self().settings().getString(Keys.web.repositoryListType, "flat").equalsIgnoreCase("grouped")) {
- Map<String, List<RepositoryModel>> groups = new HashMap<String, List<RepositoryModel>>();
- for (RepositoryModel model : models) {
- String rootPath = StringUtils.getRootPath(model.name);
- if (StringUtils.isEmpty(rootPath)) {
- rootPath = GitBlit.self().settings().getString(Keys.web.repositoryRootGroupName, " ");
- }
- if (!groups.containsKey(rootPath)) {
- groups.put(rootPath, new ArrayList<RepositoryModel>());
- }
- groups.get(rootPath).add(model);
- }
- List<String> roots = new ArrayList<String>(groups.keySet());
- Collections.sort(roots);
- List<RepositoryModel> groupedModels = new ArrayList<RepositoryModel>();
- for (String root : roots) {
- groupedModels.add(new GroupRepositoryModel(root));
- groupedModels.addAll(groups.get(root));
- }
- dp = new ListDataProvider<RepositoryModel>(groupedModels);
- } else {
- dp = new DataProvider(models);
- }
-
- DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {
- private static final long serialVersionUID = 1L;
- int counter = 0;
-
- public void populateItem(final Item<RepositoryModel> item) {
- final RepositoryModel entry = item.getModelObject();
- if (entry instanceof GroupRepositoryModel) {
- Fragment row = new Fragment("rowContent", "groupRow", this);
- item.add(row);
- row.add(new Label("groupName", entry.name));
- WicketUtils.setCssClass(item, "group");
- return;
- }
- Fragment row = new Fragment("rowContent", "repositoryRow", this);
- item.add(row);
- if (entry.hasCommits) {
- // Existing repository
- PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
- row.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));
- row.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));
- } else {
- // New repository
- row.add(new Label("repositoryName", entry.name + "<span class='empty'>(empty)</span>").setEscapeModelStrings(false));
- row.add(new Label("repositoryDescription", entry.description));
- }
-
- if (entry.useTickets) {
- row.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));
- } else {
- row.add(WicketUtils.newBlankImage("ticketsIcon"));
- }
-
- if (entry.useDocs) {
- row.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));
- } else {
- row.add(WicketUtils.newBlankImage("docsIcon"));
- }
-
- if (entry.isFrozen) {
- row.add(WicketUtils.newImage("frozenIcon", "cold_16x16.png", getString("gb.isFrozen")));
- } else {
- row.add(WicketUtils.newClearPixel("frozenIcon").setVisible(false));
- }
- switch (entry.accessRestriction) {
- case NONE:
- row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
- break;
- case PUSH:
- row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
- break;
- case CLONE:
- row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
- break;
- case VIEW:
- row.add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
- break;
- default:
- row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
- }
-
- row.add(new Label("repositoryOwner", entry.owner));
-
- String lastChange = TimeUtils.timeAgo(entry.lastChange);
- Label lastChangeLabel = new Label("repositoryLastChange", lastChange);
- row.add(lastChangeLabel);
- WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
-
- boolean showOwner = user != null && user.getUsername().equalsIgnoreCase(entry.owner);
- if (showAdmin) {
- Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryAdminLinks", this);
- repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));
- repositoryLinks.add(new BookmarkablePageLink<Void>("renameRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
- repositoryLinks.add(new BookmarkablePageLink<Void>("deleteRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
- row.add(repositoryLinks);
- } else if (showOwner) {
- Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryOwnerLinks", this);
- repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));
- row.add(repositoryLinks);
- } else {
- row.add(new Label("repositoryLinks"));
- }
- WicketUtils.setAlternatingBackground(item, counter);
- counter++;
- }
- };
- add(dataView);
-
- if (dp instanceof SortableDataProvider<?>) {
- // add sortable header
- SortableDataProvider<?> sdp = (SortableDataProvider<?>) dp;
- Fragment fragment = new Fragment("headerContent", "flatHeader", this);
- fragment.add(newSort("orderByRepository", SortBy.repository, sdp, dataView));
- fragment.add(newSort("orderByDescription", SortBy.description, sdp, dataView));
- fragment.add(newSort("orderByOwner", SortBy.owner, sdp, dataView));
- fragment.add(newSort("orderByDate", SortBy.date, sdp, dataView));
- add(fragment);
- } else {
- // not sortable
- Fragment fragment = new Fragment("headerContent", "groupHeader", this);
- add(fragment);
- }
+ return message;
}
- protected enum SortBy {
- repository, description, owner, date;
- }
-
- protected OrderByBorder newSort(String wicketId, SortBy field, SortableDataProvider<?> dp, final DataView<?> dataView) {
- return new OrderByBorder(wicketId, field.name(), dp) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSortChanged() {
- dataView.setCurrentPage(0);
- }
- };
- }
-
- private class DataProvider extends SortableDataProvider<RepositoryModel> {
- private static final long serialVersionUID = 1L;
- private List<RepositoryModel> list = null;
-
- protected DataProvider(List<RepositoryModel> list) {
- this.list = list;
- setSort(SortBy.date.name(), false);
+ private String readDefaultMarkdown(String file) {
+ String message;
+ try {
+ ContextRelativeResource res = WicketUtils.getResource(file);
+ InputStream is = res.getResourceStream().getInputStream();
+ InputStreamReader reader = new InputStreamReader(is, Constants.CHARACTER_ENCODING);
+ message = MarkdownUtils.transformMarkdown(reader);
+ reader.close();
+ } catch (Throwable t) {
+ message = MessageFormat.format(getString("gb.failedToReadMessage"), file);
+ error(message, t, false);
}
-
- @Override
- public int size() {
- if (list == null)
- return 0;
- return list.size();
- }
-
- @Override
- public IModel<RepositoryModel> model(RepositoryModel header) {
- return new Model<RepositoryModel>(header);
- }
-
- @Override
- public Iterator<RepositoryModel> iterator(int first, int count) {
- SortParam sp = getSort();
- String prop = sp.getProperty();
- final boolean asc = sp.isAscending();
-
- if (prop == null || prop.equals(SortBy.date.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.lastChange.compareTo(o2.lastChange);
- return o2.lastChange.compareTo(o1.lastChange);
- }
- });
- } else if (prop.equals(SortBy.repository.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.name.compareTo(o2.name);
- return o2.name.compareTo(o1.name);
- }
- });
- } else if (prop.equals(SortBy.owner.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.owner.compareTo(o2.owner);
- return o2.owner.compareTo(o1.owner);
- }
- });
- } else if (prop.equals(SortBy.description.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.description.compareTo(o2.description);
- return o2.description.compareTo(o1.description);
- }
- });
- }
- return list.subList(first, first + count).iterator();
- }
- }
-
- private class GroupRepositoryModel extends RepositoryModel {
-
- private static final long serialVersionUID = 1L;
-
- GroupRepositoryModel(String name) {
- super(name, "", "", new Date(0));
- }
+ return message;
}
}
--
Gitblit v1.9.1