From ce048e750f7ae986dddfc8ab9b57750114d2b7b9 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 25 Apr 2014 23:52:30 -0400 Subject: Create and update milestone pages with rename support --- .../java/com/gitblit/tickets/ITicketService.java | 31 +++- src/main/java/com/gitblit/tickets/TicketLabel.java | 7 +- .../java/com/gitblit/tickets/TicketMilestone.java | 4 + .../java/com/gitblit/wicket/GitBlitWebApp.java | 4 + .../com/gitblit/wicket/GitBlitWebApp.properties | 4 +- .../gitblit/wicket/pages/EditMilestonePage.html | 38 +++++ .../gitblit/wicket/pages/EditMilestonePage.java | 166 +++++++++++++++++++++ .../com/gitblit/wicket/pages/NewMilestonePage.html | 37 +++++ .../com/gitblit/wicket/pages/NewMilestonePage.java | 123 +++++++++++++++ .../java/com/gitblit/wicket/pages/TicketsPage.html | 5 +- .../java/com/gitblit/wicket/pages/TicketsPage.java | 21 ++- 11 files changed, 430 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html create mode 100644 src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java create mode 100644 src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html create mode 100644 src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java index c2f3283e..e1a377a6 100644 --- a/src/main/java/com/gitblit/tickets/ITicketService.java +++ b/src/main/java/com/gitblit/tickets/ITicketService.java @@ -49,6 +49,7 @@ import com.gitblit.models.TicketModel.Field; import com.gitblit.models.TicketModel.Patchset; import com.gitblit.models.TicketModel.Status; import com.gitblit.tickets.TicketIndexer.Lucene; +import com.gitblit.utils.DeepCopier; import com.gitblit.utils.DiffUtils; import com.gitblit.utils.DiffUtils.DiffStat; import com.gitblit.utils.StringUtils; @@ -556,9 +557,10 @@ public abstract class ITicketService { public TicketMilestone getMilestone(RepositoryModel repository, String milestone) { for (TicketMilestone ms : getMilestones(repository)) { if (ms.name.equalsIgnoreCase(milestone)) { + TicketMilestone tm = DeepCopier.copy(ms); String q = QueryBuilder.q(Lucene.rid.matches(repository.getRID())).and(Lucene.milestone.matches(milestone)).build(); - ms.tickets = indexer.queryFor(q, 1, 0, Lucene.number.name(), true); - return ms; + tm.tickets = indexer.queryFor(q, 1, 0, Lucene.number.name(), true); + return tm; } } return null; @@ -639,6 +641,21 @@ public abstract class ITicketService { * @since 1.4.0 */ public synchronized boolean renameMilestone(RepositoryModel repository, String oldName, String newName, String createdBy) { + return renameMilestone(repository, oldName, newName, createdBy, true); + } + + /** + * Renames a milestone. + * + * @param repository + * @param oldName + * @param newName + * @param createdBy + * @param send ticket notifications + * @return true if successful + * @since 1.6.0 + */ + public synchronized boolean renameMilestone(RepositoryModel repository, String oldName, String newName, String createdBy, boolean notify) { if (StringUtils.isEmpty(newName)) { throw new IllegalArgumentException("new milestone can not be empty!"); } @@ -651,7 +668,7 @@ public abstract class ITicketService { config.setString(MILESTONE, newName, STATUS, milestone.status.name()); config.setString(MILESTONE, newName, COLOR, milestone.color); if (milestone.due != null) { - config.setString(MILESTONE, milestone.name, DUE, + config.setString(MILESTONE, newName, DUE, new SimpleDateFormat(DUE_DATE_PATTERN).format(milestone.due)); } config.save(); @@ -663,9 +680,13 @@ public abstract class ITicketService { Change change = new Change(createdBy); change.setField(Field.milestone, newName); TicketModel ticket = updateTicket(repository, qr.number, change); - notifier.queueMailing(ticket); + if (notify && ticket.isOpen()) { + notifier.queueMailing(ticket); + } + } + if (notify) { + notifier.sendAll(); } - notifier.sendAll(); return true; } catch (IOException e) { diff --git a/src/main/java/com/gitblit/tickets/TicketLabel.java b/src/main/java/com/gitblit/tickets/TicketLabel.java index 686ce88b..a7f0ebec 100644 --- a/src/main/java/com/gitblit/tickets/TicketLabel.java +++ b/src/main/java/com/gitblit/tickets/TicketLabel.java @@ -30,14 +30,17 @@ public class TicketLabel implements Serializable { private static final long serialVersionUID = 1L; - public final String name; + public String name; public String color; public List tickets; - public TicketLabel(String name) { + setName(name); + } + + public void setName(String name) { this.name = name; this.color = StringUtils.getColor(name); } diff --git a/src/main/java/com/gitblit/tickets/TicketMilestone.java b/src/main/java/com/gitblit/tickets/TicketMilestone.java index c6b4fcca..680615a9 100644 --- a/src/main/java/com/gitblit/tickets/TicketMilestone.java +++ b/src/main/java/com/gitblit/tickets/TicketMilestone.java @@ -37,6 +37,10 @@ public class TicketMilestone extends TicketLabel { super(name); status = Status.Open; } + + public void setDue(Date due) { + this.due = due; + } public int getProgress() { int total = getTotalTickets(); diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index c4fdeda5..d4c1bc40 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -51,6 +51,7 @@ import com.gitblit.wicket.pages.CommitPage; import com.gitblit.wicket.pages.ComparePage; import com.gitblit.wicket.pages.DocPage; import com.gitblit.wicket.pages.DocsPage; +import com.gitblit.wicket.pages.EditMilestonePage; import com.gitblit.wicket.pages.EditTicketPage; import com.gitblit.wicket.pages.ExportTicketPage; import com.gitblit.wicket.pages.FederationRegistrationPage; @@ -63,6 +64,7 @@ import com.gitblit.wicket.pages.LogoutPage; import com.gitblit.wicket.pages.LuceneSearchPage; import com.gitblit.wicket.pages.MetricsPage; import com.gitblit.wicket.pages.MyDashboardPage; +import com.gitblit.wicket.pages.NewMilestonePage; import com.gitblit.wicket.pages.NewTicketPage; import com.gitblit.wicket.pages.OverviewPage; import com.gitblit.wicket.pages.PatchPage; @@ -187,6 +189,8 @@ public class GitBlitWebApp extends WebApplication { mount("/tickets/new", NewTicketPage.class, "r"); mount("/tickets/edit", EditTicketPage.class, "r", "h"); mount("/tickets/export", ExportTicketPage.class, "r", "h"); + mount("/milestones/new", NewMilestonePage.class, "r"); + mount("/milestones/edit", EditMilestonePage.class, "r", "h"); // setup the markup document urls mount("/docs", DocsPage.class, "r"); diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index aeb2d9ef..ce4c0b22 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -671,4 +671,6 @@ gb.serverDoesNotAcceptPatchsets = This server does not accept patchsets. gb.ticketIsClosed = This ticket is closed. gb.mergeToDescription = default integration branch for merging ticket patchsets gb.anonymousCanNotPropose = Anonymous users can not propose patchsets. -gb.youDoNotHaveClonePermission = You are not permitted to clone this repository. \ No newline at end of file +gb.youDoNotHaveClonePermission = You are not permitted to clone this repository. +gb.newMilestone = new milestone +gb.editMilestone = edit milestone \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html new file mode 100644 index 00000000..66b47848 --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html @@ -0,0 +1,38 @@ + + + + + + +
+ +
+ +
+ +
+
+
+ + + + + +
*
+
+
+ +
+
+
 
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java new file mode 100644 index 00000000..44077884 --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java @@ -0,0 +1,166 @@ +/* + * Copyright 2014 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.util.Arrays; +import java.util.Date; +import java.util.List; + +import org.apache.wicket.PageParameters; +import org.apache.wicket.RestartResponseException; +import org.apache.wicket.extensions.markup.html.form.DateTextField; +import org.apache.wicket.markup.html.form.Button; +import org.apache.wicket.markup.html.form.DropDownChoice; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.parboiled.common.StringUtils; + +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.TicketModel; +import com.gitblit.models.TicketModel.Status; +import com.gitblit.models.UserModel; +import com.gitblit.tickets.TicketMilestone; +import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.WicketUtils; + +/** + * Page for creating a new milestone. + * + * @author James Moger + * + */ +public class EditMilestonePage extends RepositoryPage { + + private final String oldName; + + private IModel nameModel; + + private IModel dueModel; + + private IModel statusModel; + + private IModel notificationModel; + + public EditMilestonePage(PageParameters params) { + super(params); + + RepositoryModel model = getRepositoryModel(); + if (!app().tickets().isAcceptingTicketUpdates(model)) { + // ticket service is read-only + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + + UserModel currentUser = GitBlitWebSession.get().getUser(); + if (currentUser == null) { + currentUser = UserModel.ANONYMOUS; + } + + if (!currentUser.isAuthenticated || !currentUser.canAdmin(model)) { + // administration prohibited + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + + oldName = WicketUtils.getObject(params); + if (StringUtils.isEmpty(oldName)) { + // milestone not specified + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + + TicketMilestone tm = app().tickets().getMilestone(getRepositoryModel(), oldName); + if (tm == null) { + // milestone does not exist + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + + setStatelessHint(false); + setOutputMarkupId(true); + + Form form = new Form("editForm") { + + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit() { + + String name = nameModel.getObject(); + if (StringUtils.isEmpty(name)) { + return; + } + + Date due = dueModel.getObject(); + Status status = statusModel.getObject(); + boolean rename = !name.equals(oldName); + boolean notify = notificationModel.getObject(); + + UserModel currentUser = GitBlitWebSession.get().getUser(); + String createdBy = currentUser.username; + + TicketMilestone tm = app().tickets().getMilestone(getRepositoryModel(), oldName); + tm.setName(name); + tm.setDue(due); + tm.status = status; + + boolean success = true; + if (rename) { + success = app().tickets().renameMilestone(getRepositoryModel(), oldName, name, createdBy, notify); + } + + if (success && app().tickets().updateMilestone(getRepositoryModel(), tm, createdBy)) { + setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(getRepositoryModel().name)); + } else { + // TODO error + } + } + }; + add(form); + + nameModel = Model.of(tm.name); + dueModel = Model.of(tm.due); + statusModel = Model.of(tm.status); + notificationModel = Model.of(true); + + form.add(new TextField("name", nameModel)); + form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + + List statusChoices = Arrays.asList(Status.Open, Status.Closed); + form.add(new DropDownChoice("status", statusModel, statusChoices)); + + form.add(new Button("save")); + Button cancel = new Button("cancel") { + private static final long serialVersionUID = 1L; + + @Override + public void onSubmit() { + setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + }; + cancel.setDefaultFormProcessing(false); + form.add(cancel); + + } + + @Override + protected String getPageName() { + return getString("gb.editMilestone"); + } + + @Override + protected Class getRepoNavPageClass() { + return TicketsPage.class; + } +} diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html new file mode 100644 index 00000000..1b7e11ae --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html @@ -0,0 +1,37 @@ + + + + + + +
+ +
+ +
+ +
+
+
+ + + + +
+
+
+ +
+
+
 
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java new file mode 100644 index 00000000..2c95f018 --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java @@ -0,0 +1,123 @@ +/* + * Copyright 2014 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.util.Date; + +import org.apache.wicket.PageParameters; +import org.apache.wicket.RestartResponseException; +import org.apache.wicket.extensions.markup.html.form.DateTextField; +import org.apache.wicket.markup.html.form.Button; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; + +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.UserModel; +import com.gitblit.tickets.TicketMilestone; +import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.WicketUtils; + +/** + * Page for creating a new milestone. + * + * @author James Moger + * + */ +public class NewMilestonePage extends RepositoryPage { + + private IModel nameModel; + + private IModel dueModel; + + public NewMilestonePage(PageParameters params) { + super(params); + + RepositoryModel model = getRepositoryModel(); + if (!app().tickets().isAcceptingTicketUpdates(model)) { + // ticket service is read-only + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + + UserModel currentUser = GitBlitWebSession.get().getUser(); + if (currentUser == null) { + currentUser = UserModel.ANONYMOUS; + } + + if (!currentUser.isAuthenticated || !currentUser.canAdmin(model)) { + // administration prohibited + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + + setStatelessHint(false); + setOutputMarkupId(true); + + Form form = new Form("editForm") { + + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit() { + + String name = nameModel.getObject(); + Date due = dueModel.getObject(); + + UserModel currentUser = GitBlitWebSession.get().getUser(); + String createdBy = currentUser.username; + + TicketMilestone milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy); + if (milestone != null) { + milestone.due = due; + app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(getRepositoryModel().name)); + } else { + // TODO error + } + } + }; + add(form); + + nameModel = Model.of(""); + dueModel = Model.of(new Date()); + + form.add(new TextField("name", nameModel)); + form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + + form.add(new Button("create")); + Button cancel = new Button("cancel") { + private static final long serialVersionUID = 1L; + + @Override + public void onSubmit() { + setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } + }; + cancel.setDefaultFormProcessing(false); + form.add(cancel); + + } + + @Override + protected String getPageName() { + return getString("gb.newMilestone"); + } + + @Override + protected Class getRepoNavPageClass() { + return TicketsPage.class; + } +} diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html index 7d13852b..e144bea1 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html @@ -138,10 +138,13 @@
+
+ +

- +
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java index ca509e28..984b3754 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java @@ -42,6 +42,7 @@ import com.gitblit.Constants; import com.gitblit.Constants.AccessPermission; import com.gitblit.Keys; import com.gitblit.models.RegistrantAccessPermission; +import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; import com.gitblit.models.TicketModel.Status; import com.gitblit.models.UserModel; @@ -646,7 +647,19 @@ public class TicketsPage extends TicketBasePage { }; add(ticketsView); - List allMilestones = app().tickets().getMilestones(getRepositoryModel()); + // new milestone link + RepositoryModel repositoryModel = getRepositoryModel(); + final boolean acceptingUpdates = app().tickets().isAcceptingTicketUpdates(repositoryModel) + && user != null && user.canAdmin(getRepositoryModel()); + if (acceptingUpdates) { + add(new LinkPanel("newMilestone", null, getString("gb.newMilestone"), + NewMilestonePage.class, WicketUtils.newRepositoryParameter(repositoryName))); + } else { + add(new Label("newMilestone").setVisible(false)); + } + + // milestones list + List allMilestones = app().tickets().getMilestones(repositoryModel); ListDataProvider allMilestonesDp = new ListDataProvider(allMilestones); DataView milestonesList = new DataView("milestoneList", allMilestonesDp) { private static final long serialVersionUID = 1L; @@ -675,6 +688,12 @@ public class TicketsPage extends TicketBasePage { } else { item.add(WicketUtils.createDatestampLabel("milestoneDue", tm.due, getTimeZone(), getTimeUtils())); } + if (acceptingUpdates) { + item.add(new LinkPanel("editMilestone", null, getString("gb.edit"), EditMilestonePage.class, + WicketUtils.newObjectParameter(repositoryName, tm.name))); + } else { + item.add(new Label("editMilestone").setVisible(false)); + } } }; add(milestonesList); -- cgit v1.2.3 From 01995873731e7efa517ca66246547b3084f8d529 Mon Sep 17 00:00:00 2001 From: James Moger Date: Sat, 26 Apr 2014 13:51:39 -0400 Subject: Allow milestone deletion within the edit milestone page --- .../java/com/gitblit/tickets/ITicketService.java | 11 +++++- src/main/java/com/gitblit/tickets/QueryResult.java | 8 ++++ .../gitblit/wicket/pages/EditMilestonePage.html | 2 +- .../gitblit/wicket/pages/EditMilestonePage.java | 45 +++++++++++++++------- .../com/gitblit/wicket/pages/NewMilestonePage.java | 18 ++++++--- 5 files changed, 62 insertions(+), 22 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java index e1a377a6..cce805ed 100644 --- a/src/main/java/com/gitblit/tickets/ITicketService.java +++ b/src/main/java/com/gitblit/tickets/ITicketService.java @@ -643,7 +643,7 @@ public abstract class ITicketService { public synchronized boolean renameMilestone(RepositoryModel repository, String oldName, String newName, String createdBy) { return renameMilestone(repository, oldName, newName, createdBy, true); } - + /** * Renames a milestone. * @@ -714,6 +714,7 @@ public abstract class ITicketService { } Repository db = null; try { + TicketMilestone tm = getMilestone(repository, milestone); db = repositoryManager.getRepository(repository.name); StoredConfig config = db.getConfig(); config.unsetSection(MILESTONE, milestone); @@ -721,6 +722,14 @@ public abstract class ITicketService { milestonesCache.remove(repository.name); + for (QueryResult qr : tm.tickets) { + if (qr.isOpen()) { + // reset the milestone only for open tickets + Change change = new Change(createdBy); + change.setField(Field.milestone, ""); + TicketModel ticket = updateTicket(repository, qr.number, change); + } + } return true; } catch (IOException e) { log.error("failed to delete milestone " + milestone + " in " + repository, e); diff --git a/src/main/java/com/gitblit/tickets/QueryResult.java b/src/main/java/com/gitblit/tickets/QueryResult.java index 9f5d3a55..7a2b1abe 100644 --- a/src/main/java/com/gitblit/tickets/QueryResult.java +++ b/src/main/java/com/gitblit/tickets/QueryResult.java @@ -74,6 +74,14 @@ public class QueryResult implements Serializable { return type != null && Type.Proposal == type; } + public boolean isOpen() { + return !status.isClosed(); + } + + public boolean isClosed() { + return status.isClosed(); + } + public boolean isMerged() { return Status.Merged == status && !StringUtils.isEmpty(mergeSha); } diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html index 66b47848..31f76f1c 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html @@ -27,7 +27,7 @@
-
 
+
   
diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java index 44077884..b92ba8ba 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java @@ -28,13 +28,13 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.parboiled.common.StringUtils; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; import com.gitblit.models.TicketModel.Status; import com.gitblit.models.UserModel; import com.gitblit.tickets.TicketMilestone; +import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; @@ -47,13 +47,13 @@ import com.gitblit.wicket.WicketUtils; public class EditMilestonePage extends RepositoryPage { private final String oldName; - + private IModel nameModel; private IModel dueModel; - + private IModel statusModel; - + private IModel notificationModel; public EditMilestonePage(PageParameters params) { @@ -64,7 +64,7 @@ public class EditMilestonePage extends RepositoryPage { // ticket service is read-only throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); } - + UserModel currentUser = GitBlitWebSession.get().getUser(); if (currentUser == null) { currentUser = UserModel.ANONYMOUS; @@ -74,13 +74,13 @@ public class EditMilestonePage extends RepositoryPage { // administration prohibited throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); } - + oldName = WicketUtils.getObject(params); if (StringUtils.isEmpty(oldName)) { // milestone not specified throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); } - + TicketMilestone tm = app().tickets().getMilestone(getRepositoryModel(), oldName); if (tm == null) { // milestone does not exist @@ -96,30 +96,30 @@ public class EditMilestonePage extends RepositoryPage { @Override protected void onSubmit() { - + String name = nameModel.getObject(); if (StringUtils.isEmpty(name)) { return; } - + Date due = dueModel.getObject(); Status status = statusModel.getObject(); boolean rename = !name.equals(oldName); boolean notify = notificationModel.getObject(); - + UserModel currentUser = GitBlitWebSession.get().getUser(); String createdBy = currentUser.username; - + TicketMilestone tm = app().tickets().getMilestone(getRepositoryModel(), oldName); tm.setName(name); tm.setDue(due); tm.status = status; - + boolean success = true; if (rename) { success = app().tickets().renameMilestone(getRepositoryModel(), oldName, name, createdBy, notify); } - + if (success && app().tickets().updateMilestone(getRepositoryModel(), tm, createdBy)) { setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(getRepositoryModel().name)); } else { @@ -133,7 +133,7 @@ public class EditMilestonePage extends RepositoryPage { dueModel = Model.of(tm.due); statusModel = Model.of(tm.status); notificationModel = Model.of(true); - + form.add(new TextField("name", nameModel)); form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); @@ -152,6 +152,23 @@ public class EditMilestonePage extends RepositoryPage { cancel.setDefaultFormProcessing(false); form.add(cancel); + Button delete = new Button("delete") { + private static final long serialVersionUID = 1L; + + @Override + public void onSubmit() { + UserModel currentUser = GitBlitWebSession.get().getUser(); + String createdBy = currentUser.username; + + if (app().tickets().deleteMilestone(getRepositoryModel(), oldName, createdBy)) { + setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + } else { + // TODO error processing + } + } + }; + delete.setDefaultFormProcessing(false); + form.add(delete); } @Override diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java index 2c95f018..4c393786 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java @@ -29,6 +29,8 @@ import org.apache.wicket.model.Model; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.tickets.TicketMilestone; +import com.gitblit.utils.StringUtils; +import com.gitblit.utils.TimeUtils; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; @@ -43,7 +45,7 @@ public class NewMilestonePage extends RepositoryPage { private IModel nameModel; private IModel dueModel; - + public NewMilestonePage(PageParameters params) { super(params); @@ -52,7 +54,7 @@ public class NewMilestonePage extends RepositoryPage { // ticket service is read-only throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); } - + UserModel currentUser = GitBlitWebSession.get().getUser(); if (currentUser == null) { currentUser = UserModel.ANONYMOUS; @@ -72,13 +74,17 @@ public class NewMilestonePage extends RepositoryPage { @Override protected void onSubmit() { - + String name = nameModel.getObject(); + if (StringUtils.isEmpty(name)) { + return; + } + Date due = dueModel.getObject(); UserModel currentUser = GitBlitWebSession.get().getUser(); String createdBy = currentUser.username; - + TicketMilestone milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy); if (milestone != null) { milestone.due = due; @@ -92,8 +98,8 @@ public class NewMilestonePage extends RepositoryPage { add(form); nameModel = Model.of(""); - dueModel = Model.of(new Date()); - + dueModel = Model.of(new Date(System.currentTimeMillis() + TimeUtils.ONEDAY)); + form.add(new TextField("name", nameModel)); form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); -- cgit v1.2.3 From 6209dc4fd442887e18e3dd6fe7056f4b842091c2 Mon Sep 17 00:00:00 2001 From: James Moger Date: Sun, 27 Apr 2014 19:49:33 -0400 Subject: Use ajax buttons in the New|Edit Milestone pages --- .../gitblit/wicket/pages/EditMilestonePage.java | 37 +++++++++++----------- .../com/gitblit/wicket/pages/NewMilestonePage.java | 26 ++++++++------- 2 files changed, 33 insertions(+), 30 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java index b92ba8ba..967d8f35 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java @@ -21,6 +21,8 @@ import java.util.List; import org.apache.wicket.PageParameters; import org.apache.wicket.RestartResponseException; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.extensions.markup.html.form.DateTextField; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -90,13 +92,26 @@ public class EditMilestonePage extends RepositoryPage { setStatelessHint(false); setOutputMarkupId(true); - Form form = new Form("editForm") { + Form form = new Form("editForm"); + add(form); + + nameModel = Model.of(tm.name); + dueModel = Model.of(tm.due); + statusModel = Model.of(tm.status); + notificationModel = Model.of(true); + + form.add(new TextField("name", nameModel)); + form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + + List statusChoices = Arrays.asList(Status.Open, Status.Closed); + form.add(new DropDownChoice("status", statusModel, statusChoices)); + + form.add(new AjaxButton("save") { private static final long serialVersionUID = 1L; @Override - protected void onSubmit() { - + protected void onSubmit(AjaxRequestTarget target, Form form) { String name = nameModel.getObject(); if (StringUtils.isEmpty(name)) { return; @@ -126,21 +141,7 @@ public class EditMilestonePage extends RepositoryPage { // TODO error } } - }; - add(form); - - nameModel = Model.of(tm.name); - dueModel = Model.of(tm.due); - statusModel = Model.of(tm.status); - notificationModel = Model.of(true); - - form.add(new TextField("name", nameModel)); - form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); - - List statusChoices = Arrays.asList(Status.Open, Status.Closed); - form.add(new DropDownChoice("status", statusModel, statusChoices)); - - form.add(new Button("save")); + }); Button cancel = new Button("cancel") { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java index 4c393786..d6e34cb0 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java @@ -19,6 +19,8 @@ import java.util.Date; import org.apache.wicket.PageParameters; import org.apache.wicket.RestartResponseException; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.extensions.markup.html.form.DateTextField; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; @@ -68,13 +70,21 @@ public class NewMilestonePage extends RepositoryPage { setStatelessHint(false); setOutputMarkupId(true); - Form form = new Form("editForm") { + Form form = new Form("editForm"); + add(form); + + nameModel = Model.of(""); + dueModel = Model.of(new Date(System.currentTimeMillis() + TimeUtils.ONEDAY)); + + form.add(new TextField("name", nameModel)); + form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + + form.add(new AjaxButton("create") { private static final long serialVersionUID = 1L; @Override - protected void onSubmit() { - + protected void onSubmit(AjaxRequestTarget target, Form form) { String name = nameModel.getObject(); if (StringUtils.isEmpty(name)) { return; @@ -94,16 +104,8 @@ public class NewMilestonePage extends RepositoryPage { // TODO error } } - }; - add(form); - - nameModel = Model.of(""); - dueModel = Model.of(new Date(System.currentTimeMillis() + TimeUtils.ONEDAY)); - - form.add(new TextField("name", nameModel)); - form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + }); - form.add(new Button("create")); Button cancel = new Button("cancel") { private static final long serialVersionUID = 1L; -- cgit v1.2.3 From 667163976e4e51fc3ebf191525e44d97c8a724dc Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 28 Apr 2014 11:08:50 -0400 Subject: Overdue labeling, notify changed tickets control --- .../java/com/gitblit/tickets/ITicketService.java | 38 +++++++++++++++++----- .../java/com/gitblit/tickets/TicketMilestone.java | 10 +++++- .../com/gitblit/wicket/GitBlitWebApp.properties | 4 ++- .../gitblit/wicket/pages/EditMilestonePage.html | 3 +- .../gitblit/wicket/pages/EditMilestonePage.java | 7 +++- .../com/gitblit/wicket/pages/NewMilestonePage.html | 2 +- .../com/gitblit/wicket/pages/NewMilestonePage.java | 11 ++++++- .../java/com/gitblit/wicket/pages/TicketsPage.java | 26 ++++++++++++--- 8 files changed, 82 insertions(+), 19 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java index cce805ed..3261ca96 100644 --- a/src/main/java/com/gitblit/tickets/ITicketService.java +++ b/src/main/java/com/gitblit/tickets/ITicketService.java @@ -651,11 +651,12 @@ public abstract class ITicketService { * @param oldName * @param newName * @param createdBy - * @param send ticket notifications + * @param notifyOpenTickets * @return true if successful * @since 1.6.0 */ - public synchronized boolean renameMilestone(RepositoryModel repository, String oldName, String newName, String createdBy, boolean notify) { + public synchronized boolean renameMilestone(RepositoryModel repository, String oldName, + String newName, String createdBy, boolean notifyOpenTickets) { if (StringUtils.isEmpty(newName)) { throw new IllegalArgumentException("new milestone can not be empty!"); } @@ -680,11 +681,11 @@ public abstract class ITicketService { Change change = new Change(createdBy); change.setField(Field.milestone, newName); TicketModel ticket = updateTicket(repository, qr.number, change); - if (notify && ticket.isOpen()) { + if (notifyOpenTickets && ticket.isOpen()) { notifier.queueMailing(ticket); } } - if (notify) { + if (notifyOpenTickets) { notifier.sendAll(); } @@ -709,6 +710,21 @@ public abstract class ITicketService { * @since 1.4.0 */ public synchronized boolean deleteMilestone(RepositoryModel repository, String milestone, String createdBy) { + return deleteMilestone(repository, milestone, createdBy, true); + } + + /** + * Deletes a milestone. + * + * @param repository + * @param milestone + * @param createdBy + * @param notifyOpenTickets + * @return true if successful + * @since 1.6.0 + */ + public synchronized boolean deleteMilestone(RepositoryModel repository, String milestone, + String createdBy, boolean notifyOpenTickets) { if (StringUtils.isEmpty(milestone)) { throw new IllegalArgumentException("milestone can not be empty!"); } @@ -722,14 +738,18 @@ public abstract class ITicketService { milestonesCache.remove(repository.name); + TicketNotifier notifier = createNotifier(); for (QueryResult qr : tm.tickets) { - if (qr.isOpen()) { - // reset the milestone only for open tickets - Change change = new Change(createdBy); - change.setField(Field.milestone, ""); - TicketModel ticket = updateTicket(repository, qr.number, change); + Change change = new Change(createdBy); + change.setField(Field.milestone, ""); + TicketModel ticket = updateTicket(repository, qr.number, change); + if (notifyOpenTickets && ticket.isOpen()) { + notifier.queueMailing(ticket); } } + if (notifyOpenTickets) { + notifier.sendAll(); + } return true; } catch (IOException e) { log.error("failed to delete milestone " + milestone + " in " + repository, e); diff --git a/src/main/java/com/gitblit/tickets/TicketMilestone.java b/src/main/java/com/gitblit/tickets/TicketMilestone.java index 680615a9..dacedda6 100644 --- a/src/main/java/com/gitblit/tickets/TicketMilestone.java +++ b/src/main/java/com/gitblit/tickets/TicketMilestone.java @@ -37,7 +37,15 @@ public class TicketMilestone extends TicketLabel { super(name); status = Status.Open; } - + + public boolean isOpen() { + return status == Status.Open; + } + + public boolean isOverdue() { + return due == null ? false : System.currentTimeMillis() > due.getTime(); + } + public void setDue(Date due) { this.due = due; } diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index ce4c0b22..e66e53a7 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -673,4 +673,6 @@ gb.mergeToDescription = default integration branch for merging ticket patchsets gb.anonymousCanNotPropose = Anonymous users can not propose patchsets. gb.youDoNotHaveClonePermission = You are not permitted to clone this repository. gb.newMilestone = new milestone -gb.editMilestone = edit milestone \ No newline at end of file +gb.editMilestone = edit milestone +gb.notifyChangedOpenTickets = send notification for changed open tickets +gb.overdue = overdue \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html index 31f76f1c..0897ebee 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html @@ -19,8 +19,9 @@ - + +
 
*
diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java index 967d8f35..b844442a 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java @@ -24,7 +24,9 @@ import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.extensions.markup.html.form.DateTextField; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Button; +import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; @@ -102,6 +104,8 @@ public class EditMilestonePage extends RepositoryPage { form.add(new TextField("name", nameModel)); form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + form.add(new Label("dueFormat", "yyyy-MM-dd")); + form.add(new CheckBox("notify", notificationModel)); List statusChoices = Arrays.asList(Status.Open, Status.Closed); form.add(new DropDownChoice("status", statusModel, statusChoices)); @@ -160,8 +164,9 @@ public class EditMilestonePage extends RepositoryPage { public void onSubmit() { UserModel currentUser = GitBlitWebSession.get().getUser(); String createdBy = currentUser.username; + boolean notify = notificationModel.getObject(); - if (app().tickets().deleteMilestone(getRepositoryModel(), oldName, createdBy)) { + if (app().tickets().deleteMilestone(getRepositoryModel(), oldName, createdBy, notify)) { setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); } else { // TODO error processing diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html index 1b7e11ae..2ba5d5cc 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html @@ -19,7 +19,7 @@ - +
 
diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java index d6e34cb0..a9f76d3a 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java @@ -22,6 +22,7 @@ import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.extensions.markup.html.form.DateTextField; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; @@ -78,6 +79,7 @@ public class NewMilestonePage extends RepositoryPage { form.add(new TextField("name", nameModel)); form.add(new DateTextField("due", dueModel, "yyyy-MM-dd")); + form.add(new Label("dueFormat", "yyyy-MM-dd")); form.add(new AjaxButton("create") { @@ -87,6 +89,13 @@ public class NewMilestonePage extends RepositoryPage { protected void onSubmit(AjaxRequestTarget target, Form form) { String name = nameModel.getObject(); if (StringUtils.isEmpty(name)) { + // invalid name + return; + } + + TicketMilestone milestone = app().tickets().getMilestone(getRepositoryModel(), name); + if (milestone != null) { + // milestone already exists return; } @@ -95,7 +104,7 @@ public class NewMilestonePage extends RepositoryPage { UserModel currentUser = GitBlitWebSession.get().getUser(); String createdBy = currentUser.username; - TicketMilestone milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy); + milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy); if (milestone != null) { milestone.due = due; app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy); diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java index 984b3754..b7e392a2 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java @@ -20,6 +20,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -657,9 +658,20 @@ public class TicketsPage extends TicketBasePage { } else { add(new Label("newMilestone").setVisible(false)); } - + // milestones list - List allMilestones = app().tickets().getMilestones(repositoryModel); + List allMilestones = new ArrayList(app().tickets().getMilestones(repositoryModel)); + Collections.sort(allMilestones, new Comparator() { + @Override + public int compare(TicketMilestone o1, TicketMilestone o2) { + if (o2.isOpen() && !o1.isOpen()) { + return 1; + } else if (o1.isOpen() && !o2.isOpen()) { + return -1; + } + return o2.due.compareTo(o1.due); + } + }); ListDataProvider allMilestonesDp = new ListDataProvider(allMilestones); DataView milestonesList = new DataView("milestoneList", allMilestonesDp) { private static final long serialVersionUID = 1L; @@ -671,15 +683,21 @@ public class TicketsPage extends TicketBasePage { item.add(new LinkPanel("milestoneName", null, tm.name, TicketsPage.class, params).setRenderBodyOnly(true)); String css; + String status = tm.status.name(); switch (tm.status) { case Open: - css = "aui-lozenge aui-lozenge-subtle"; + if (tm.isOverdue()) { + css = "aui-lozenge aui-lozenge-subtle aui-lozenge-error"; + status = "overdue"; + } else { + css = "aui-lozenge aui-lozenge-subtle"; + } break; default: css = "aui-lozenge"; break; } - Label stateLabel = new Label("milestoneState", tm.status.name()); + Label stateLabel = new Label("milestoneState", status); WicketUtils.setCssClass(stateLabel, css); item.add(stateLabel); -- cgit v1.2.3 From 8d2caa7e81fcd995f0a5c07fa4454ae2f8e86e6e Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 30 Apr 2014 17:15:31 -0400 Subject: Show open milestone progress and change milestones list layout --- .../com/gitblit/wicket/GitBlitWebApp.properties | 4 +- .../java/com/gitblit/wicket/pages/TicketsPage.html | 40 ++++++++++- .../java/com/gitblit/wicket/pages/TicketsPage.java | 81 +++++++++++++++++----- 3 files changed, 104 insertions(+), 21 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index e66e53a7..1394890f 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -675,4 +675,6 @@ gb.youDoNotHaveClonePermission = You are not permitted to clone this repository. gb.newMilestone = new milestone gb.editMilestone = edit milestone gb.notifyChangedOpenTickets = send notification for changed open tickets -gb.overdue = overdue \ No newline at end of file +gb.overdue = overdue +gb.openMilestones = open milestones +gb.closedMilestones = closed milestones \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html index e144bea1..a40d3126 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html @@ -141,15 +141,49 @@
+ +
+

+
+
+
+
+
+
+
+
-
-

- +

+
+
+
+
+
+
+ +

+ +
+ + + +
+
+
+
+
+ , + , + +
+
+ + diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java index b7e392a2..5973d473 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java @@ -660,27 +660,49 @@ public class TicketsPage extends TicketBasePage { } // milestones list - List allMilestones = new ArrayList(app().tickets().getMilestones(repositoryModel)); - Collections.sort(allMilestones, new Comparator() { + List openMilestones = new ArrayList(); + List closedMilestones = new ArrayList(); + for (TicketMilestone milestone : app().tickets().getMilestones(repositoryModel)) { + if (milestone.isOpen()) { + openMilestones.add(milestone); + } else { + closedMilestones.add(milestone); + } + } + Collections.sort(openMilestones, new Comparator() { + @Override + public int compare(TicketMilestone o1, TicketMilestone o2) { + return o2.due.compareTo(o1.due); + } + }); + + Collections.sort(closedMilestones, new Comparator() { @Override public int compare(TicketMilestone o1, TicketMilestone o2) { - if (o2.isOpen() && !o1.isOpen()) { - return 1; - } else if (o1.isOpen() && !o2.isOpen()) { - return -1; - } return o2.due.compareTo(o1.due); } }); - ListDataProvider allMilestonesDp = new ListDataProvider(allMilestones); - DataView milestonesList = new DataView("milestoneList", allMilestonesDp) { + + DataView openMilestonesList = milestoneList("openMilestonesList", openMilestones, acceptingUpdates); + add(openMilestonesList); + + DataView closedMilestonesList = milestoneList("closedMilestonesList", closedMilestones, acceptingUpdates); + add(closedMilestonesList); + } + + protected DataView milestoneList(String wicketId, List milestones, final boolean acceptingUpdates) { + ListDataProvider milestonesDp = new ListDataProvider(milestones); + DataView milestonesList = new DataView(wicketId, milestonesDp) { private static final long serialVersionUID = 1L; @Override public void populateItem(final Item item) { + Fragment entryPanel = new Fragment("entryPanel", "milestoneListFragment", this); + item.add(entryPanel); + final TicketMilestone tm = item.getModelObject(); - PageParameters params = queryParameters(null, tm.name, null, null, null, desc, 1); - item.add(new LinkPanel("milestoneName", null, tm.name, TicketsPage.class, params).setRenderBodyOnly(true)); + PageParameters params = queryParameters(null, tm.name, null, null, null, true, 1); + entryPanel.add(new LinkPanel("milestoneName", null, tm.name, TicketsPage.class, params).setRenderBodyOnly(true)); String css; String status = tm.status.name(); @@ -699,22 +721,47 @@ public class TicketsPage extends TicketBasePage { } Label stateLabel = new Label("milestoneState", status); WicketUtils.setCssClass(stateLabel, css); - item.add(stateLabel); + entryPanel.add(stateLabel); if (tm.due == null) { - item.add(new Label("milestoneDue", getString("gb.notSpecified"))); + entryPanel.add(new Label("milestoneDue", getString("gb.notSpecified"))); } else { - item.add(WicketUtils.createDatestampLabel("milestoneDue", tm.due, getTimeZone(), getTimeUtils())); + entryPanel.add(WicketUtils.createDatestampLabel("milestoneDue", tm.due, getTimeZone(), getTimeUtils())); } if (acceptingUpdates) { - item.add(new LinkPanel("editMilestone", null, getString("gb.edit"), EditMilestonePage.class, + entryPanel.add(new LinkPanel("editMilestone", null, getString("gb.edit"), EditMilestonePage.class, WicketUtils.newObjectParameter(repositoryName, tm.name))); } else { - item.add(new Label("editMilestone").setVisible(false)); + entryPanel.add(new Label("editMilestone").setVisible(false)); + } + + if (tm.isOpen()) { + // re-load milestone with query results + TicketMilestone m = app().tickets().getMilestone(getRepositoryModel(), tm.name); + + Fragment milestonePanel = new Fragment("milestonePanel", "openMilestoneFragment", this); + Label label = new Label("progress"); + WicketUtils.setCssStyle(label, "width:" + tm.getProgress() + "%;"); + milestonePanel.add(label); + + milestonePanel.add(new LinkPanel("openTickets", null, + MessageFormat.format(getString("gb.nOpenTickets"), m.getOpenTickets()), + TicketsPage.class, + queryParameters(null, tm.name, openStatii, null, null, true, 1))); + + milestonePanel.add(new LinkPanel("closedTickets", null, + MessageFormat.format(getString("gb.nClosedTickets"), m.getClosedTickets()), + TicketsPage.class, + queryParameters(null, tm.name, closedStatii, null, null, true, 1))); + + milestonePanel.add(new Label("totalTickets", MessageFormat.format(getString("gb.nTotalTickets"), m.getTotalTickets()))); + entryPanel.add(milestonePanel); + } else { + entryPanel.add(new Label("milestonePanel").setVisible(false)); } } }; - add(milestonesList); + return milestonesList; } protected PageParameters queryParameters( -- cgit v1.2.3 From 3380373c3123f875f50e48b0290c84dfae0519e4 Mon Sep 17 00:00:00 2001 From: BUISSON Christian Date: Tue, 15 Apr 2014 15:21:33 +0200 Subject: First Step in My Tickets --- .../com/gitblit/tickets/FileTicketService.java | 116 +++++++++++-------- .../java/com/gitblit/tickets/ITicketService.java | 11 +- .../java/com/gitblit/wicket/GitBlitWebApp.java | 2 + .../com/gitblit/wicket/GitBlitWebApp.properties | 3 +- .../com/gitblit/wicket/GitBlitWebApp_fr.properties | 1 + .../com/gitblit/wicket/pages/MyTicketsPage.html | 50 ++++++++ .../com/gitblit/wicket/pages/MyTicketsPage.java | 128 +++++++++++++++++++++ .../java/com/gitblit/wicket/pages/RootPage.java | 1 + 8 files changed, 262 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html create mode 100644 src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index 4386020f..ea5d065f 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -207,62 +207,82 @@ public class FileTicketService extends ITicketService { @Override public List getTickets(RepositoryModel repository, TicketFilter filter) { List list = new ArrayList(); - - Repository db = repositoryManager.getRepository(repository.name); - try { - // Collect the set of all json files - File dir = new File(db.getDirectory(), TICKETS_PATH); - List journals = findAll(dir, JOURNAL); - - // Deserialize each ticket and optionally filter out unwanted tickets - for (File journal : journals) { - String json = null; - try { - json = new String(FileUtils.readContent(journal), Constants.ENCODING); - } catch (Exception e) { - log.error(null, e); - } - if (StringUtils.isEmpty(json)) { - // journal was touched but no changes were written - continue; - } - try { - // Reconstruct ticketId from the path - // id/26/326/journal.json - String path = FileUtils.getRelativePath(dir, journal); - String tid = path.split("/")[1]; - long ticketId = Long.parseLong(tid); - List changes = TicketSerializer.deserializeJournal(json); - if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", repository, journal); + List databases = new ArrayList(); + List models = new ArrayList(); + + if(repository == null) + { + List allRepo = repositoryManager.getRepositoryList(); + for(int i = 0; i < allRepo.size(); i++) + { + databases.add(repositoryManager.getRepository(allRepo.get(i))); + models.add(repositoryManager.getRepositoryModel(allRepo.get(i))); + } + } + else + { + databases.add(repositoryManager.getRepository(repository.name)); + models.add(repository); + } + + for(int i = 0; i < databases.size(); i++) + { + Repository db = databases.get(i); + try { + // Collect the set of all json files + File dir = new File(db.getDirectory(), TICKETS_PATH); + List journals = findAll(dir, JOURNAL); + + // Deserialize each ticket and optionally filter out unwanted tickets + for (File journal : journals) { + String json = null; + try { + json = new String(FileUtils.readContent(journal), Constants.ENCODING); + } catch (Exception e) { + log.error(null, e); + } + if (StringUtils.isEmpty(json)) { + // journal was touched but no changes were written continue; } - TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = repository.projectPath; - ticket.repository = repository.name; - ticket.number = ticketId; - - // add the ticket, conditionally, to the list - if (filter == null) { - list.add(ticket); - } else { - if (filter.accept(ticket)) { + try { + // Reconstruct ticketId from the path + // id/26/326/journal.json + String path = FileUtils.getRelativePath(dir, journal); + String tid = path.split("/")[1]; + long ticketId = Long.parseLong(tid); + List changes = TicketSerializer.deserializeJournal(json); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", models.get(i), journal); + continue; + } + TicketModel ticket = TicketModel.buildTicket(changes); + ticket.project = models.get(i).projectPath; + ticket.repository = models.get(i).name; + ticket.number = ticketId; + + // add the ticket, conditionally, to the list + if (filter == null) { list.add(ticket); + } else { + if (filter.accept(ticket)) { + list.add(ticket); + } } + } catch (Exception e) { + log.error("failed to deserialize {}/{}\n{}", + new Object [] { models.get(i), journal, e.getMessage()}); + log.error(null, e); } - } catch (Exception e) { - log.error("failed to deserialize {}/{}\n{}", - new Object [] { repository, journal, e.getMessage()}); - log.error(null, e); } + } finally { + db.close(); } - - // sort the tickets by creation - Collections.sort(list); - return list; - } finally { - db.close(); } + + // sort the tickets by creation + Collections.sort(list); + return list; } private List findAll(File dir, String filename) { diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java index 3261ca96..e7b4c71d 100644 --- a/src/main/java/com/gitblit/tickets/ITicketService.java +++ b/src/main/java/com/gitblit/tickets/ITicketService.java @@ -779,12 +779,21 @@ public abstract class ITicketService { * @since 1.4.0 */ public abstract boolean hasTicket(RepositoryModel repository, long ticketId); + + /** + * Returns all tickets. This is not a Lucene search! + * + * @return all tickets + */ + public List getTickets() { + return getTickets(null, null); + } /** * Returns all tickets. This is not a Lucene search! * * @param repository - * @return all tickets + * @return all tickets of a given repository * @since 1.4.0 */ public List getTickets(RepositoryModel repository) { diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index d4c1bc40..9f002d2b 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -81,6 +81,7 @@ import com.gitblit.wicket.pages.TicketsPage; import com.gitblit.wicket.pages.TreePage; import com.gitblit.wicket.pages.UserPage; import com.gitblit.wicket.pages.UsersPage; +import com.gitblit.wicket.pages.MyTicketsPage; public class GitBlitWebApp extends WebApplication { @@ -191,6 +192,7 @@ public class GitBlitWebApp extends WebApplication { mount("/tickets/export", ExportTicketPage.class, "r", "h"); mount("/milestones/new", NewMilestonePage.class, "r"); mount("/milestones/edit", EditMilestonePage.class, "r", "h"); + mount("/mytickets", MyTicketsPage.class, "r", "h"); // setup the markup document urls mount("/docs", DocsPage.class, "r"); diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 1394890f..030c5ebe 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -677,4 +677,5 @@ gb.editMilestone = edit milestone gb.notifyChangedOpenTickets = send notification for changed open tickets gb.overdue = overdue gb.openMilestones = open milestones -gb.closedMilestones = closed milestones \ No newline at end of file +gb.closedMilestones = closed milestones +gb.mytickets = my tickets \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties index 8a725cf4..75a3ab7a 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties @@ -670,3 +670,4 @@ gb.repositoryDoesNotAcceptPatchsets = Ce d gb.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets. gb.ticketIsClosed = Ce ticket est clos. gb.mergeToDescription = default integration branch for merging ticket patchsets +gb.mytickets = mes tickets diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html new file mode 100644 index 00000000..bbb2b96b --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -0,0 +1,50 @@ + + + + + +
+ Responsible Tickets + + + + + + +
+ + + Author Tickets + + + + + + +
+ + + Voted Tickets + + + + + + +
+ + + Watched Tickets + + + + + + +
+ + + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java new file mode 100644 index 00000000..509b00ca --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -0,0 +1,128 @@ +package com.gitblit.wicket.pages; + +import java.util.ArrayList; +import java.util.List; + +import com.gitblit.models.UserModel; +import com.gitblit.models.TicketModel; +import com.gitblit.tickets.ITicketService; +import com.gitblit.wicket.GitBlitWebApp; +import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.panels.LinkPanel; + +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.PageParameters; + +public class MyTicketsPage extends RootPage { + + public MyTicketsPage(PageParameters params) + { + this(); + } + + public MyTicketsPage() + { + super(); + setupPage("", ""); + + UserModel currentUser = GitBlitWebSession.get().getUser(); + if (currentUser == null) { + currentUser = UserModel.ANONYMOUS; + } + String username = currentUser.getName(); + + ITicketService tickets = GitBlitWebApp.get().tickets(); + List returnedTickets = tickets.getTickets(null); + + List responsibleTickets = new ArrayList(); + List authorTickets = new ArrayList(); + List votedTickets = new ArrayList(); + List watchedTickets = new ArrayList(); + for(int i = 0; i < returnedTickets.size(); i++) + { + TicketModel ticket = returnedTickets.get(i); + if(ticket.isOpen()) + { + if(ticket.isResponsible(username)) + { + responsibleTickets.add(ticket); + } + if(ticket.isAuthor(username)) + { + authorTickets.add(ticket); + } + if(ticket.isVoter(username)) + { + votedTickets.add(ticket); + } + if(ticket.isWatching(username)) + { + watchedTickets.add(ticket); + } + } + } + + ListView responsibleView = new ListView("responsibleTickets", responsibleTickets) + { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final ListItem item) + { + final TicketModel ticket = item.getModelObject(); + String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); + item.add(new Label("ticketDescription", ticket.body)); + } + }; + + ListView authorView = new ListView("authorTickets", authorTickets) + { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final ListItem item) + { + final TicketModel ticket = item.getModelObject(); + String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); + item.add(new Label("ticketDescription", ticket.body)); + } + }; + + ListView votedView = new ListView("votedTickets", votedTickets) + { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final ListItem item) + { + final TicketModel ticket = item.getModelObject(); + String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); + item.add(new Label("ticketDescription", ticket.body)); + } + }; + + ListView watchedView = new ListView("watchedTickets", watchedTickets) + { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final ListItem item) + { + final TicketModel ticket = item.getModelObject(); + String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); + item.add(new Label("ticketDescription", ticket.body)); + } + }; + + add(responsibleView); + add(authorView); + add(votedView); + add(watchedView); + } +} diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index 5ccc3a4c..ec413b19 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -173,6 +173,7 @@ public abstract class RootPage extends BasePage { pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class, getRootPageParameters())); pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters())); + pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); if (app().settings().getBoolean(Keys.web.allowLuceneIndexing, true)) { pages.add(new PageRegistration("gb.search", LuceneSearchPage.class)); } -- cgit v1.2.3 From 47bfbe3b1da6629655f49b32b917dccb21b83809 Mon Sep 17 00:00:00 2001 From: BUISSON Christian Date: Tue, 15 Apr 2014 15:45:34 +0200 Subject: Deactivate the navbar button for My Tickets (until it is finalized). --- src/main/java/com/gitblit/wicket/pages/RootPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index ec413b19..f43dc45e 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -173,7 +173,7 @@ public abstract class RootPage extends BasePage { pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class, getRootPageParameters())); pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters())); - pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); + //pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); if (app().settings().getBoolean(Keys.web.allowLuceneIndexing, true)) { pages.add(new PageRegistration("gb.search", LuceneSearchPage.class)); } -- cgit v1.2.3 From 556a5853fb7145adc20b2e718eca2e921f3d7399 Mon Sep 17 00:00:00 2001 From: BUISSON Christian Date: Wed, 16 Apr 2014 16:10:51 +0200 Subject: Ajout du nom du repository sur la page "MyTickets". --- .../com/gitblit/wicket/pages/MyTicketsPage.html | 86 ++++++++++++---------- .../com/gitblit/wicket/pages/MyTicketsPage.java | 8 ++ 2 files changed, 55 insertions(+), 39 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index bbb2b96b..5222c35c 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -6,45 +6,53 @@ - - Responsible Tickets - - - - - - -
- - - Author Tickets - - - - - - -
- - - Voted Tickets - - - - - - -
- - - Watched Tickets - - - - - - -
+
+
[my tickets message]
+ + + Responsible Tickets + + + + + + + +
+ + + Author Tickets + + + + + + + +
+ + + Voted Tickets + + + + + + + +
+ + + Watched Tickets + + + + + + + +
+
\ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 509b00ca..6e656ae4 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -3,6 +3,7 @@ package com.gitblit.wicket.pages; import java.util.ArrayList; import java.util.List; +import com.gitblit.Keys; import com.gitblit.models.UserModel; import com.gitblit.models.TicketModel; import com.gitblit.tickets.ITicketService; @@ -33,6 +34,9 @@ public class MyTicketsPage extends RootPage { } String username = currentUser.getName(); + String message = "Welcome on GitBlit"; + this.add(new Label("myTicketsMessage", message)); + ITicketService tickets = GitBlitWebApp.get().tickets(); List returnedTickets = tickets.getTickets(null); @@ -73,6 +77,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } @@ -87,6 +92,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } @@ -101,6 +107,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } @@ -115,6 +122,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } -- cgit v1.2.3 From 7d19224c99f118351ad15a77942762e74940536f Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Wed, 16 Apr 2014 16:42:18 +0200 Subject: Implementation of the getTickets capability of recovering all tickets from a nullable RepositoryModel --- .../com/gitblit/tickets/BranchTicketService.java | 114 ++++++++++++--------- .../com/gitblit/tickets/FileTicketService.java | 9 +- .../com/gitblit/tickets/RedisTicketService.java | 85 +++++++++------ 3 files changed, 124 insertions(+), 84 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/BranchTicketService.java b/src/main/java/com/gitblit/tickets/BranchTicketService.java index 284b1be1..7d6926df 100644 --- a/src/main/java/com/gitblit/tickets/BranchTicketService.java +++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java @@ -436,64 +436,84 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi @Override public List getTickets(RepositoryModel repository, TicketFilter filter) { List list = new ArrayList(); - - Repository db = repositoryManager.getRepository(repository.name); - try { - RefModel ticketsBranch = getTicketsBranch(db); - if (ticketsBranch == null) { - return list; + List databases = new ArrayList(); + List models = new ArrayList(); + + if(repository == null) + { + List allRepo = repositoryManager.getRepositoryList(); + for(int i = 0; i < allRepo.size(); i++) + { + databases.add(repositoryManager.getRepository(allRepo.get(i))); + models.add(repositoryManager.getRepositoryModel(allRepo.get(i))); } + } + else + { + databases.add(repositoryManager.getRepository(repository.name)); + models.add(repository); + } - // Collect the set of all json files - List paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH); - - // Deserialize each ticket and optionally filter out unwanted tickets - for (PathModel path : paths) { - String name = path.name.substring(path.name.lastIndexOf('/') + 1); - if (!JOURNAL.equals(name)) { - continue; - } - String json = readTicketsFile(db, path.path); - if (StringUtils.isEmpty(json)) { - // journal was touched but no changes were written - continue; + for(int i = 0; i < databases.size(); i++) + { + Repository db = databases.get(i); + try { + RefModel ticketsBranch = getTicketsBranch(db); + if (ticketsBranch == null) { + return list; } - try { - // Reconstruct ticketId from the path - // id/26/326/journal.json - String tid = path.path.split("/")[2]; - long ticketId = Long.parseLong(tid); - List changes = TicketSerializer.deserializeJournal(json); - if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", repository, path.path); + + // Collect the set of all json files + List paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH); + + // Deserialize each ticket and optionally filter out unwanted tickets + for (PathModel path : paths) { + String name = path.name.substring(path.name.lastIndexOf('/') + 1); + if (!JOURNAL.equals(name)) { + continue; + } + String json = readTicketsFile(db, path.path); + if (StringUtils.isEmpty(json)) { + // journal was touched but no changes were written continue; } - TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = repository.projectPath; - ticket.repository = repository.name; - ticket.number = ticketId; - - // add the ticket, conditionally, to the list - if (filter == null) { - list.add(ticket); - } else { - if (filter.accept(ticket)) { + try { + // Reconstruct ticketId from the path + // id/26/326/journal.json + String tid = path.path.split("/")[2]; + long ticketId = Long.parseLong(tid); + List changes = TicketSerializer.deserializeJournal(json); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", models.get(i), path.path); + continue; + } + TicketModel ticket = TicketModel.buildTicket(changes); + ticket.project = models.get(i).projectPath; + ticket.repository = models.get(i).name; + ticket.number = ticketId; + + // add the ticket, conditionally, to the list + if (filter == null) { list.add(ticket); + } else { + if (filter.accept(ticket)) { + list.add(ticket); + } } + } catch (Exception e) { + log.error("failed to deserialize {}/{}\n{}", + new Object [] { repository, path.path, e.getMessage()}); + log.error(null, e); } - } catch (Exception e) { - log.error("failed to deserialize {}/{}\n{}", - new Object [] { repository, path.path, e.getMessage()}); - log.error(null, e); } + } finally { + db.close(); } - - // sort the tickets by creation - Collections.sort(list); - return list; - } finally { - db.close(); } + + // sort the tickets by creation + Collections.sort(list); + return list; } /** diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index ea5d065f..7fd9675f 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -228,6 +228,7 @@ public class FileTicketService extends ITicketService { for(int i = 0; i < databases.size(); i++) { Repository db = databases.get(i); + RepositoryModel model = models.get(i); try { // Collect the set of all json files File dir = new File(db.getDirectory(), TICKETS_PATH); @@ -253,12 +254,12 @@ public class FileTicketService extends ITicketService { long ticketId = Long.parseLong(tid); List changes = TicketSerializer.deserializeJournal(json); if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", models.get(i), journal); + log.warn("Empty journal for {}:{}", model, journal); continue; } TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = models.get(i).projectPath; - ticket.repository = models.get(i).name; + ticket.project = model.projectPath; + ticket.repository = model.name; ticket.number = ticketId; // add the ticket, conditionally, to the list @@ -271,7 +272,7 @@ public class FileTicketService extends ITicketService { } } catch (Exception e) { log.error("failed to deserialize {}/{}\n{}", - new Object [] { models.get(i), journal, e.getMessage()}); + new Object [] { model, journal, e.getMessage()}); log.error(null, e); } } diff --git a/src/main/java/com/gitblit/tickets/RedisTicketService.java b/src/main/java/com/gitblit/tickets/RedisTicketService.java index 2c5b181f..48256b2b 100644 --- a/src/main/java/com/gitblit/tickets/RedisTicketService.java +++ b/src/main/java/com/gitblit/tickets/RedisTicketService.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Set; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.eclipse.jgit.lib.Repository; import redis.clients.jedis.Client; import redis.clients.jedis.Jedis; @@ -228,47 +229,65 @@ public class RedisTicketService extends ITicketService { public List getTickets(RepositoryModel repository, TicketFilter filter) { Jedis jedis = pool.getResource(); List list = new ArrayList(); + List models = new ArrayList(); + + if(repository == null) + { + List allRepo = repositoryManager.getRepositoryList(); + for(int i = 0; i < allRepo.size(); i++) + { + models.add(repositoryManager.getRepositoryModel(allRepo.get(i))); + } + } + else + { + models.add(repository); + } + if (jedis == null) { return list; } - try { - // Deserialize each journal, build the ticket, and optionally filter - Set keys = jedis.keys(key(repository, KeyType.journal, "*")); - for (String key : keys) { - // {repo}:journal:{id} - String id = key.split(":")[2]; - long ticketId = Long.parseLong(id); - List changes = getJournal(jedis, repository, ticketId); - if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", repository, ticketId); - continue; - } - TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = repository.projectPath; - ticket.repository = repository.name; - ticket.number = ticketId; - - // add the ticket, conditionally, to the list - if (filter == null) { - list.add(ticket); - } else { - if (filter.accept(ticket)) { + for(int i = 0; i < models.size(); i++) + { + RepositoryModel model = models.get(i); + try { + // Deserialize each journal, build the ticket, and optionally filter + Set keys = jedis.keys(key(model, KeyType.journal, "*")); + for (String key : keys) { + // {repo}:journal:{id} + String id = key.split(":")[2]; + long ticketId = Long.parseLong(id); + List changes = getJournal(jedis, model, ticketId); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", model, ticketId); + continue; + } + TicketModel ticket = TicketModel.buildTicket(changes); + ticket.project = model.projectPath; + ticket.repository = model.name; + ticket.number = ticketId; + + // add the ticket, conditionally, to the list + if (filter == null) { list.add(ticket); + } else { + if (filter.accept(ticket)) { + list.add(ticket); + } } } - } - - // sort the tickets by creation - Collections.sort(list); - } catch (JedisException e) { - log.error("failed to retrieve tickets from Redis @ " + getUrl(), e); - pool.returnBrokenResource(jedis); - jedis = null; - } finally { - if (jedis != null) { - pool.returnResource(jedis); + } catch (JedisException e) { + log.error("failed to retrieve tickets from Redis @ " + getUrl(), e); + pool.returnBrokenResource(jedis); + jedis = null; + } finally { + if (jedis != null) { + pool.returnResource(jedis); + } } } + // sort the tickets by creation + Collections.sort(list); return list; } -- cgit v1.2.3 From 75796a0e2798e256a94f725961c9676746fc107a Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Thu, 17 Apr 2014 15:44:16 +0200 Subject: Added git stylesheets to MyTickets. Added links to Repositories containing the tickets. --- .../com/gitblit/wicket/pages/MyTicketsPage.html | 69 +++++------ .../com/gitblit/wicket/pages/MyTicketsPage.java | 137 +++++++++------------ src/main/resources/gitblit.css | 48 ++++++++ 3 files changed, 135 insertions(+), 119 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 5222c35c..5d11fbbb 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -9,49 +9,36 @@
[my tickets message]
- - Responsible Tickets +
+ - - - - - - -
- - - Author Tickets - - - - - - - -
- - - Voted Tickets - - - - - - - -
- - - Watched Tickets - - - - - - - + + + +
+ + + + + + Repository + + Ticket + Description + Responsible + + + + + + + [repository name] + + [ticket name] + [ticket description] + [ticket responsible] +
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 6e656ae4..6cd80a3f 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -1,19 +1,28 @@ package com.gitblit.wicket.pages; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; -import com.gitblit.Keys; +import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.models.TicketModel; import com.gitblit.tickets.ITicketService; import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.LinkPanel; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; +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.Component; import org.apache.wicket.PageParameters; public class MyTicketsPage extends RootPage { @@ -34,103 +43,75 @@ public class MyTicketsPage extends RootPage { } String username = currentUser.getName(); + // TODO - Recover the Welcome message String message = "Welcome on GitBlit"; - this.add(new Label("myTicketsMessage", message)); + this.add(new Label("myTicketsMessage", message)); + + Fragment fragment = new Fragment("headerContent", "ticketsHeader", this); + add(fragment); ITicketService tickets = GitBlitWebApp.get().tickets(); List returnedTickets = tickets.getTickets(null); + List yourTickets = new ArrayList(); - List responsibleTickets = new ArrayList(); - List authorTickets = new ArrayList(); - List votedTickets = new ArrayList(); - List watchedTickets = new ArrayList(); for(int i = 0; i < returnedTickets.size(); i++) { TicketModel ticket = returnedTickets.get(i); if(ticket.isOpen()) { - if(ticket.isResponsible(username)) - { - responsibleTickets.add(ticket); - } - if(ticket.isAuthor(username)) - { - authorTickets.add(ticket); - } - if(ticket.isVoter(username)) + if(ticket.isResponsible(username) || ticket.isAuthor(username) + || ticket.isVoter(username) || ticket.isWatching(username)) { - votedTickets.add(ticket); - } - if(ticket.isWatching(username)) - { - watchedTickets.add(ticket); + yourTickets.add(ticket); } } } - ListView responsibleView = new ListView("responsibleTickets", responsibleTickets) - { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final ListItem item) - { - final TicketModel ticket = item.getModelObject(); - String ticketUrl = app().tickets().getTicketUrl(ticket); - item.add(new Label("repositoryName", ticket.repository)); - item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); - item.add(new Label("ticketDescription", ticket.body)); - } - }; + final ListDataProvider dp = new ListDataProvider(yourTickets); - ListView authorView = new ListView("authorTickets", authorTickets) - { + DataView dataView = new DataView("row", dp) { private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final ListItem item) - { - final TicketModel ticket = item.getModelObject(); - String ticketUrl = app().tickets().getTicketUrl(ticket); - item.add(new Label("repositoryName", ticket.repository)); - item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); - item.add(new Label("ticketDescription", ticket.body)); - } - }; - - ListView votedView = new ListView("votedTickets", votedTickets) - { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final ListItem item) - { - final TicketModel ticket = item.getModelObject(); - String ticketUrl = app().tickets().getTicketUrl(ticket); - item.add(new Label("repositoryName", ticket.repository)); - item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); - item.add(new Label("ticketDescription", ticket.body)); - } - }; - - ListView watchedView = new ListView("watchedTickets", watchedTickets) - { - private static final long serialVersionUID = 1L; - + @Override - public void populateItem(final ListItem item) - { - final TicketModel ticket = item.getModelObject(); - String ticketUrl = app().tickets().getTicketUrl(ticket); - item.add(new Label("repositoryName", ticket.repository)); - item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); - item.add(new Label("ticketDescription", ticket.body)); + protected void populateItem(Item item) { + TicketModel ticketModel = item.getModelObject(); + RepositoryModel repository = app().repositories().getRepositoryModel(ticketModel.repository); + + Fragment row = new Fragment("rowContent", "ticketRow", this); + item.add(row); + + Component swatch; + if(repository.isBare) + { + swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false); + } + else + { + swatch = new Label("repositorySwatch", "!"); + WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning")); + } + WicketUtils.setCssBackground(swatch, repository.toString()); + row.add(swatch); + + PageParameters pp = WicketUtils.newRepositoryParameter(repository.name); + Class linkPage; + if (repository.hasCommits) { + // repository has content + linkPage = SummaryPage.class; + } else { + // new/empty repository OR proposed repository + linkPage = EmptyRepositoryPage.class; + } + + String ticketUrl = app().tickets().getTicketUrl(ticketModel); + + row.add(new LinkPanel("repositoryName", "list", repository.name, linkPage, pp)); + row.add(new LinkPanel("ticketName", "list", ticketModel.title, ticketUrl)); + row.add(new LinkPanel("ticketDescription", "list", ticketModel.body, ticketUrl)); + row.add(new Label("ticketResponsible", ticketModel.responsible)); } }; - add(responsibleView); - add(authorView); - add(votedView); - add(watchedView); + add(dataView); } } diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 748a3198..ea663a66 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -1599,6 +1599,54 @@ table.repositories tr.group td a { color: black; } +table.tickets { + border:1px solid #ddd; + border-spacing: 0px; + width: 100%; +} + +table.tickets th { + padding: 4px; + border:0; +} + +table.tickets th.right { + border-right: 1px solid #ddd; +} + +table.tickets td { + padding: 2px; + border-left: 0; +} + +table.tickets td.rightAlign { + text-align: right; + border-right: 1px solid #ddd; +} + +table.tickets td.icon img { + vertical-align: top; +} + +table.tickets tr.group { + background-color: #ccc; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; +} + +table.tickets tr.group td { + font-weight: bold; + color: black; + background-color: #ddd; + padding-left: 5px; + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; +} + +table.tickets tr.group td a { + color: black; +} + table.palette { border:0; width: 0 !important; } table.palette td.header { font-weight: bold; -- cgit v1.2.3 From f3b1e099e6ae252f1f1296ce5415b85fef6361cf Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Fri, 18 Apr 2014 10:53:24 +0200 Subject: Added back the "my tickets" button in the navbar. --- src/main/java/com/gitblit/wicket/pages/RootPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index f43dc45e..ec413b19 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -173,7 +173,7 @@ public abstract class RootPage extends BasePage { pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class, getRootPageParameters())); pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters())); - //pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); + pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); if (app().settings().getBoolean(Keys.web.allowLuceneIndexing, true)) { pages.add(new PageRegistration("gb.search", LuceneSearchPage.class)); } -- cgit v1.2.3 From e1fa9b763cadcdc44943f805aba83698acafa613 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 21 Apr 2014 21:55:48 -0400 Subject: Revisions demonstrating the direction I'd like this to go --- .../com/gitblit/wicket/pages/MyTicketsPage.html | 55 +++-- .../com/gitblit/wicket/pages/MyTicketsPage.java | 227 ++++++++++++++------- 2 files changed, 180 insertions(+), 102 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 5d11fbbb..063e7511 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -7,38 +7,35 @@
-
[my tickets message]
- - + + + + + + + + - - - - + + + + + + + +
+ + Repository + TicketStatusResponsible
+ + [repository name] + + [ticket icon] + [ticket title] + (#[ticket number]) + [ticket responsible]
- - - - - - Repository - - Ticket - Description - Responsible - - - - - - - [repository name] - - [ticket name] - [ticket description] - [ticket responsible] -
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 6cd80a3f..2c57a051 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -1,41 +1,41 @@ package com.gitblit.wicket.pages; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import org.apache.wicket.Component; +import org.apache.wicket.PageParameters; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.repeater.Item; +import org.apache.wicket.markup.repeater.data.DataView; +import org.apache.wicket.markup.repeater.data.ListDataProvider; + import com.gitblit.models.RepositoryModel; -import com.gitblit.models.UserModel; import com.gitblit.models.TicketModel; +import com.gitblit.models.UserModel; +import com.gitblit.models.TicketModel.Status; +import com.gitblit.models.TicketModel.Type; import com.gitblit.tickets.ITicketService; +import com.gitblit.tickets.QueryBuilder; +import com.gitblit.tickets.QueryResult; +import com.gitblit.tickets.TicketIndexer.Lucene; +import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.panels.GravatarImage; import com.gitblit.wicket.panels.LinkPanel; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.list.ListItem; -import org.apache.wicket.markup.html.list.ListView; -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.Component; -import org.apache.wicket.PageParameters; - public class MyTicketsPage extends RootPage { - public MyTicketsPage(PageParameters params) + public MyTicketsPage() { - this(); + this(null); } - public MyTicketsPage() + public MyTicketsPage(PageParameters params) { super(); - setupPage("", ""); + setupPage("", getString("gb.mytickets")); UserModel currentUser = GitBlitWebSession.get().getUser(); if (currentUser == null) { @@ -43,75 +43,156 @@ public class MyTicketsPage extends RootPage { } String username = currentUser.getName(); - // TODO - Recover the Welcome message - String message = "Welcome on GitBlit"; - this.add(new Label("myTicketsMessage", message)); - - Fragment fragment = new Fragment("headerContent", "ticketsHeader", this); - add(fragment); + QueryBuilder qb = QueryBuilder + .q(Lucene.createdby.matches(username)) + .or(Lucene.responsible.matches(username)) + .or(Lucene.watchedby.matches(username)); ITicketService tickets = GitBlitWebApp.get().tickets(); - List returnedTickets = tickets.getTickets(null); - List yourTickets = new ArrayList(); - - for(int i = 0; i < returnedTickets.size(); i++) - { - TicketModel ticket = returnedTickets.get(i); - if(ticket.isOpen()) - { - if(ticket.isResponsible(username) || ticket.isAuthor(username) - || ticket.isVoter(username) || ticket.isWatching(username)) - { - yourTickets.add(ticket); - } - } - } + List results = tickets.queryFor(qb.build(), 0, 0, Lucene.updated.name(), true); - final ListDataProvider dp = new ListDataProvider(yourTickets); + final ListDataProvider dp = new ListDataProvider(results); - DataView dataView = new DataView("row", dp) { + DataView dataView = new DataView("row", dp) { private static final long serialVersionUID = 1L; @Override - protected void populateItem(Item item) { - TicketModel ticketModel = item.getModelObject(); - RepositoryModel repository = app().repositories().getRepositoryModel(ticketModel.repository); - - Fragment row = new Fragment("rowContent", "ticketRow", this); - item.add(row); + protected void populateItem(Item item) { + QueryResult ticket = item.getModelObject(); + RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); - Component swatch; - if(repository.isBare) - { - swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false); - } - else - { - swatch = new Label("repositorySwatch", "!"); - WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning")); - } + Component swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false); WicketUtils.setCssBackground(swatch, repository.toString()); - row.add(swatch); + item.add(swatch); - PageParameters pp = WicketUtils.newRepositoryParameter(repository.name); - Class linkPage; - if (repository.hasCommits) { - // repository has content - linkPage = SummaryPage.class; - } else { - // new/empty repository OR proposed repository - linkPage = EmptyRepositoryPage.class; - } + PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository); + PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number); + item.add(new LinkPanel("repositoryName", "list", StringUtils.stripDotGit(ticket.repository), SummaryPage.class, rp)); - String ticketUrl = app().tickets().getTicketUrl(ticketModel); + item.add(getStateIcon("ticketIcon", ticket.type, ticket.status)); + item.add(new Label("ticketNumber", "" + ticket.number)); + item.add(new LinkPanel("ticketTitle", "list", ticket.title, TicketsPage.class, tp)); + + // votes indicator + Label v = new Label("ticketVotes", "" + ticket.votesCount); + WicketUtils.setHtmlTooltip(v, getString("gb.votes")); + item.add(v.setVisible(ticket.votesCount > 0)); + + Label ticketStatus = new Label("ticketStatus", ticket.status.toString()); + String statusClass = getStatusClass(ticket.status); + WicketUtils.setCssClass(ticketStatus, statusClass); + item.add(ticketStatus); - row.add(new LinkPanel("repositoryName", "list", repository.name, linkPage, pp)); - row.add(new LinkPanel("ticketName", "list", ticketModel.title, ticketUrl)); - row.add(new LinkPanel("ticketDescription", "list", ticketModel.body, ticketUrl)); - row.add(new Label("ticketResponsible", ticketModel.responsible)); + UserModel responsible = app().users().getUserModel(ticket.responsible); + if (responsible == null) { + if (ticket.responsible == null) { + item.add(new Label("ticketResponsibleImg").setVisible(false)); + } else { + item.add(new GravatarImage("ticketResponsibleImg", ticket.responsible, ticket.responsible, null, 16, true)); + } + item.add(new Label("ticketResponsible", ticket.responsible)); + } else { + item.add(new GravatarImage("ticketResponsibleImg", responsible, null, 16, true)); + item.add(new LinkPanel("ticketResponsible", null, responsible.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(ticket.responsible))); + } } }; add(dataView); } + + protected Label getStateIcon(String wicketId, TicketModel ticket) { + return getStateIcon(wicketId, ticket.type, ticket.status); + } + + protected Label getStateIcon(String wicketId, Type type, Status state) { + Label label = new Label(wicketId); + if (type == null) { + type = Type.defaultType; + } + switch (type) { + case Proposal: + WicketUtils.setCssClass(label, "fa fa-code-fork"); + break; + case Bug: + WicketUtils.setCssClass(label, "fa fa-bug"); + break; + case Enhancement: + WicketUtils.setCssClass(label, "fa fa-magic"); + break; + case Question: + WicketUtils.setCssClass(label, "fa fa-question"); + break; + default: + // standard ticket + WicketUtils.setCssClass(label, "fa fa-ticket"); + } + WicketUtils.setHtmlTooltip(label, getTypeState(type, state)); + return label; + } + + protected String getTypeState(Type type, Status state) { + return state.toString() + " " + type.toString(); + } + + protected String getLozengeClass(Status status, boolean subtle) { + if (status == null) { + status = Status.New; + } + String css = ""; + switch (status) { + case Declined: + case Duplicate: + case Invalid: + case Wontfix: + case Abandoned: + css = "aui-lozenge-error"; + break; + case Fixed: + case Merged: + case Resolved: + css = "aui-lozenge-success"; + break; + case New: + css = "aui-lozenge-complete"; + break; + case On_Hold: + css = "aui-lozenge-current"; + break; + default: + css = ""; + break; + } + + return "aui-lozenge" + (subtle ? " aui-lozenge-subtle": "") + (css.isEmpty() ? "" : " ") + css; + } + + protected String getStatusClass(Status status) { + String css = ""; + switch (status) { + case Declined: + case Duplicate: + case Invalid: + case Wontfix: + case Abandoned: + css = "resolution-error"; + break; + case Fixed: + case Merged: + case Resolved: + css = "resolution-success"; + break; + case New: + css = "resolution-complete"; + break; + case On_Hold: + css = "resolution-current"; + break; + default: + css = ""; + break; + } + + return "resolution" + (css.isEmpty() ? "" : " ") + css; + } } -- cgit v1.2.3 From 4640f1b689684b805f08a5a937e91dfc65ae977f Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Tue, 22 Apr 2014 12:23:03 +0200 Subject: Now only shows the "my tickets" button in the navbar if you are connected. Redirects to the main page if you try going on "/mytickets" when not connected (or if you disconnect while being on "/mytickets"). --- .../java/com/gitblit/wicket/pages/MyTicketsPage.java | 6 ++++-- src/main/java/com/gitblit/wicket/pages/RootPage.java | 17 +++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 2c57a051..9be3b125 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -34,12 +34,14 @@ public class MyTicketsPage extends RootPage { public MyTicketsPage(PageParameters params) { - super(); + super(params); setupPage("", getString("gb.mytickets")); UserModel currentUser = GitBlitWebSession.get().getUser(); if (currentUser == null) { - currentUser = UserModel.ANONYMOUS; + setRedirect(true); + setResponsePage(getApplication().getHomePage()); + return; } String username = currentUser.getName(); diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index ec413b19..a4d2353d 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -134,6 +134,8 @@ public abstract class RootPage extends BasePage { boolean authenticateView = app().settings().getBoolean(Keys.web.authenticateViewPages, false); boolean authenticateAdmin = app().settings().getBoolean(Keys.web.authenticateAdminPages, true); boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, true); + boolean allowLucene = app().settings().getBoolean(Keys.web.allowLuceneIndexing, true); + boolean isLoggedIn = GitBlitWebSession.get().isLoggedIn(); if (authenticateAdmin) { showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin(); @@ -151,7 +153,7 @@ public abstract class RootPage extends BasePage { } if (authenticateView || authenticateAdmin) { - if (GitBlitWebSession.get().isLoggedIn()) { + if (isLoggedIn) { UserMenu userFragment = new UserMenu("userPanel", "userMenuFragment", RootPage.this); add(userFragment); } else { @@ -167,14 +169,17 @@ public abstract class RootPage extends BasePage { // navigation links List pages = new ArrayList(); - if (!authenticateView || (authenticateView && GitBlitWebSession.get().isLoggedIn())) { - pages.add(new PageRegistration(GitBlitWebSession.get().isLoggedIn() ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class, + if (!authenticateView || (authenticateView && isLoggedIn)) { + pages.add(new PageRegistration(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class, getRootPageParameters())); pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class, getRootPageParameters())); pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters())); - pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); - if (app().settings().getBoolean(Keys.web.allowLuceneIndexing, true)) { + if(isLoggedIn) + { + pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); + } + if (allowLucene) { pages.add(new PageRegistration("gb.search", LuceneSearchPage.class)); } if (showAdmin) { @@ -184,7 +189,7 @@ public abstract class RootPage extends BasePage { pages.add(new PageRegistration("gb.federation", FederationPage.class)); } - if (!authenticateView || (authenticateView && GitBlitWebSession.get().isLoggedIn())) { + if (!authenticateView || (authenticateView && isLoggedIn)) { addDropDownMenus(pages); } } -- cgit v1.2.3 From e7f65dfe56b5b6325a7d7b42f877ae8d63fa4f71 Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Tue, 22 Apr 2014 16:21:35 +0200 Subject: Advanced "my tickets" page. Using filters and search. --- .../com/gitblit/wicket/pages/MyTicketsPage.html | 117 +++++-- .../com/gitblit/wicket/pages/MyTicketsPage.java | 370 ++++++++++++++++++++- 2 files changed, 452 insertions(+), 35 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 063e7511..459d2551 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -7,35 +7,94 @@
- - - - - - - - - - - - - - - - - - -
- - Repository - TicketStatusResponsible
- - [repository name] - - [ticket icon] - [ticket title] - (#[ticket number]) - [ticket responsible]
+ + +
+
+
+ + +
+
+
+
    + +
    +
    +
    + +
    +
    + +
    +
    + + +
    +
    +
    + : +
      +
      • +
      • +
      • +
    • +
      • +
    +
    + +
    + : +
      +
      • +
    +
    + +
    + +
    +
    + + + + + + + + + + +
    + + [repository name] + + [ticket icon] + [ticket title] + (#[ticket number]) + [ticket responsible]
    +
    +
    +
    +
    diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 9be3b125..01a30181 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -1,14 +1,24 @@ package com.gitblit.wicket.pages; +import java.io.Serializable; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.request.target.basic.RedirectRequestTarget; +import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; import com.gitblit.models.UserModel; @@ -18,14 +28,20 @@ import com.gitblit.tickets.ITicketService; import com.gitblit.tickets.QueryBuilder; import com.gitblit.tickets.QueryResult; import com.gitblit.tickets.TicketIndexer.Lucene; +import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.SessionlessForm; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.GravatarImage; import com.gitblit.wicket.panels.LinkPanel; public class MyTicketsPage extends RootPage { + + public static final String [] openStatii = new String [] { Status.New.name().toLowerCase(), Status.Open.name().toLowerCase() }; + + public static final String [] closedStatii = new String [] { "!" + Status.New.name().toLowerCase(), "!" + Status.Open.name().toLowerCase() }; public MyTicketsPage() { @@ -43,15 +59,205 @@ public class MyTicketsPage extends RootPage { setResponsePage(getApplication().getHomePage()); return; } - String username = currentUser.getName(); - QueryBuilder qb = QueryBuilder - .q(Lucene.createdby.matches(username)) - .or(Lucene.responsible.matches(username)) - .or(Lucene.watchedby.matches(username)); + final String username = currentUser.getName(); + final String[] statiiParam = (params == null) ? new String[0] : params.getStringArray(Lucene.status.name()); + final String assignedToParam = (params == null) ? "" : params.getString(Lucene.responsible.name(), null); + final String milestoneParam = (params == null) ? "" : params.getString(Lucene.milestone.name(), null); + final String queryParam = (params == null || StringUtils.isEmpty(params.getString("q", null))) ? "watchedby:" + username : params.getString("q", null); + final String searchParam = (params == null) ? "" : params.getString("s", null); + final String sortBy = (params == null) ? "" : Lucene.fromString(params.getString("sort", Lucene.created.name())).name(); + final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); + + // add search form + TicketSearchForm searchForm = new TicketSearchForm("ticketSearchForm", searchParam); + add(searchForm); + searchForm.setTranslatedAttributes(); + + // standard queries + add(new BookmarkablePageLink("changesQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Proposal.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + add(new BookmarkablePageLink("bugsQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Bug.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + add(new BookmarkablePageLink("enhancementsQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Enhancement.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + add(new BookmarkablePageLink("tasksQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Task.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + add(new BookmarkablePageLink("questionsQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Question.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + add(new BookmarkablePageLink("resetQuery", MyTicketsPage.class, + queryParameters( + null, + milestoneParam, + openStatii, + null, + null, + true, + 1))); + + add(new Label("userDivider")); + add(new BookmarkablePageLink("createdQuery", MyTicketsPage.class, + queryParameters( + Lucene.createdby.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + add(new BookmarkablePageLink("watchedQuery", MyTicketsPage.class, + queryParameters( + Lucene.watchedby.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + add(new BookmarkablePageLink("mentionsQuery", MyTicketsPage.class, + queryParameters( + Lucene.mentions.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); + + // states + if (ArrayUtils.isEmpty(statiiParam)) { + add(new Label("selectedStatii", getString("gb.all"))); + } else { + add(new Label("selectedStatii", StringUtils.flattenStrings(Arrays.asList(statiiParam), ","))); + } + add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, openStatii, assignedToParam, sortBy, desc, 1))); + add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, closedStatii, assignedToParam, sortBy, desc, 1))); + add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1))); + + // by status + List statii = new ArrayList(Arrays.asList(Status.values())); + statii.remove(Status.Closed); + ListDataProvider resolutionsDp = new ListDataProvider(statii); + DataView statiiLinks = new DataView("statii", resolutionsDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final Status status = item.getModelObject(); + PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, 1); + String css = getStatusClass(status); + item.add(new LinkPanel("statusLink", css, status.toString(), MyTicketsPage.class, p).setRenderBodyOnly(true)); + } + }; + add(statiiLinks); + + List sortChoices = new ArrayList(); + sortChoices.add(new TicketSort(getString("gb.sortNewest"), Lucene.created.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortOldest"), Lucene.created.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostRecentlyUpdated"), Lucene.updated.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortLeastRecentlyUpdated"), Lucene.updated.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostComments"), Lucene.comments.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortLeastComments"), Lucene.comments.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostPatchsetRevisions"), Lucene.patchsets.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortLeastPatchsetRevisions"), Lucene.patchsets.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostVotes"), Lucene.votes.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortLeastVotes"), Lucene.votes.name(), false)); + + TicketSort currentSort = sortChoices.get(0); + for (TicketSort ts : sortChoices) { + if (ts.sortBy.equals(sortBy) && desc == ts.desc) { + currentSort = ts; + break; + } + } + add(new Label("currentSort", currentSort.name)); + + ListDataProvider sortChoicesDp = new ListDataProvider(sortChoices); + DataView sortMenu = new DataView("sort", sortChoicesDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final TicketSort ts = item.getModelObject(); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, 1); + item.add(new LinkPanel("sortLink", null, ts.name, MyTicketsPage.class, params).setRenderBodyOnly(true)); + } + }; + add(sortMenu); + + // Build Query here + QueryBuilder qb = new QueryBuilder(queryParam); + if (!qb.containsField(Lucene.responsible.name())) { + // specify the responsible + qb.and(Lucene.responsible.matches(assignedToParam)); + } + if (!qb.containsField(Lucene.milestone.name())) { + // specify the milestone + qb.and(Lucene.milestone.matches(milestoneParam)); + } + if (!qb.containsField(Lucene.status.name()) && !ArrayUtils.isEmpty(statiiParam)) { + // specify the states + boolean not = false; + QueryBuilder q = new QueryBuilder(); + for (String state : statiiParam) { + if (state.charAt(0) == '!') { + not = true; + q.and(Lucene.status.doesNotMatch(state.substring(1))); + } else { + q.or(Lucene.status.matches(state)); + } + } + if (not) { + qb.and(q.toString()); + } else { + qb.and(q.toSubquery().toString()); + } + } + final String luceneQuery = qb.build(); ITicketService tickets = GitBlitWebApp.get().tickets(); - List results = tickets.queryFor(qb.build(), 0, 0, Lucene.updated.name(), true); + List results = tickets.queryFor(luceneQuery, 0, 0, Lucene.updated.name(), true); final ListDataProvider dp = new ListDataProvider(results); @@ -100,6 +306,12 @@ public class MyTicketsPage extends RootPage { } }; + // paging links + int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; + int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); + int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; + buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); + add(dataView); } @@ -197,4 +409,150 @@ public class MyTicketsPage extends RootPage { return "resolution" + (css.isEmpty() ? "" : " ") + css; } + + private class TicketSort implements Serializable { + + private static final long serialVersionUID = 1L; + + final String name; + final String sortBy; + final boolean desc; + + TicketSort(String name, String sortBy, boolean desc) { + this.name = name; + this.sortBy = sortBy; + this.desc = desc; + } + } + + private class TicketSearchForm extends SessionlessForm implements Serializable { + private static final long serialVersionUID = 1L; + + private final IModel searchBoxModel;; + + public TicketSearchForm(String id, String text) { + super(id, MyTicketsPage.this.getClass(), MyTicketsPage.this.getPageParameters()); + + this.searchBoxModel = new Model(text == null ? "" : text); + + TextField searchBox = new TextField("ticketSearchBox", searchBoxModel); + add(searchBox); + } + + void setTranslatedAttributes() { + WicketUtils.setHtmlTooltip(get("ticketSearchBox"), + MessageFormat.format(getString("gb.searchTicketsTooltip"), "")); + WicketUtils.setInputPlaceholder(get("ticketSearchBox"), getString("gb.searchTickets")); + } + + @Override + public void onSubmit() { + String searchString = searchBoxModel.getObject(); + if (StringUtils.isEmpty(searchString)) { + // redirect to self to avoid wicket page update bug + String absoluteUrl = getCanonicalUrl(); + getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); + return; + } + + // use an absolute url to workaround Wicket-Tomcat problems with + // mounted url parameters (issue-111) + PageParameters params = WicketUtils.newRepositoryParameter(""); + params.add("s", searchString); + String absoluteUrl = getCanonicalUrl(MyTicketsPage.class, params); + getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); + } + } + + protected PageParameters queryParameters( + String query, + String milestone, + String[] states, + String assignedTo, + String sort, + boolean descending, + int page) { + + PageParameters params = WicketUtils.newRepositoryParameter(""); + if (!StringUtils.isEmpty(query)) { + params.add("q", query); + } + if (!StringUtils.isEmpty(milestone)) { + params.add(Lucene.milestone.name(), milestone); + } + if (!ArrayUtils.isEmpty(states)) { + for (String state : states) { + params.add(Lucene.status.name(), state); + } + } + if (!StringUtils.isEmpty(assignedTo)) { + params.add(Lucene.responsible.name(), assignedTo); + } + if (!StringUtils.isEmpty(sort)) { + params.add("sort", sort); + } + if (!descending) { + params.add("direction", "asc"); + } + if (page > 1) { + params.add("pg", "" + page); + } + return params; + } + + protected void buildPager( + final String query, + final String milestone, + final String [] states, + final String assignedTo, + final String sort, + final boolean desc, + final int page, + int pageSize, + int count, + int total) { + + boolean showNav = total > (2 * pageSize); + boolean allowPrev = page > 1; + boolean allowNext = (pageSize * (page - 1) + count) < total; + add(new BookmarkablePageLink("prevLink", TicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page - 1)).setEnabled(allowPrev).setVisible(showNav)); + add(new BookmarkablePageLink("nextLink", TicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page + 1)).setEnabled(allowNext).setVisible(showNav)); + + if (total <= pageSize) { + add(new Label("pageLink").setVisible(false)); + return; + } + + // determine page numbers to display + int pages = count == 0 ? 0 : ((total / pageSize) + (total % pageSize == 0 ? 0 : 1)); + // preferred number of pagelinks + int segments = 5; + if (pages < segments) { + // not enough data for preferred number of page links + segments = pages; + } + int minpage = Math.min(Math.max(1, page - 2), pages - (segments - 1)); + int maxpage = Math.min(pages, minpage + (segments - 1)); + List sequence = new ArrayList(); + for (int i = minpage; i <= maxpage; i++) { + sequence.add(i); + } + + ListDataProvider pagesDp = new ListDataProvider(sequence); + DataView pagesView = new DataView("pageLink", pagesDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final Integer i = item.getModelObject(); + LinkPanel link = new LinkPanel("page", null, "" + i, TicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, i)); + link.setRenderBodyOnly(true); + if (i == page) { + WicketUtils.setCssClass(item, "active"); + } + item.add(link); + } + }; + add(pagesView); + } } -- cgit v1.2.3 From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Tue, 22 Apr 2014 17:10:33 +0200 Subject: Fixes sort, page building and search functions on "my tickets" page. --- .../com/gitblit/wicket/pages/MyTicketsPage.java | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 01a30181..32cdaec3 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -61,7 +61,7 @@ public class MyTicketsPage extends RootPage { } final String username = currentUser.getName(); - final String[] statiiParam = (params == null) ? new String[0] : params.getStringArray(Lucene.status.name()); + final String[] statiiParam = (params == null) ? openStatii : params.getStringArray(Lucene.status.name()); final String assignedToParam = (params == null) ? "" : params.getString(Lucene.responsible.name(), null); final String milestoneParam = (params == null) ? "" : params.getString(Lucene.milestone.name(), null); final String queryParam = (params == null || StringUtils.isEmpty(params.getString("q", null))) ? "watchedby:" + username : params.getString("q", null); @@ -256,8 +256,22 @@ public class MyTicketsPage extends RootPage { } final String luceneQuery = qb.build(); + // paging links + int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; + int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); + ITicketService tickets = GitBlitWebApp.get().tickets(); - List results = tickets.queryFor(luceneQuery, 0, 0, Lucene.updated.name(), true); + List results; + if(StringUtils.isEmpty(searchParam)) + { + results = tickets.queryFor(luceneQuery, page, pageSize, sortBy, desc); + } + else + { + results = tickets.searchFor(null, searchParam, page, pageSize); + } + int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; + buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); final ListDataProvider dp = new ListDataProvider(results); @@ -306,12 +320,6 @@ public class MyTicketsPage extends RootPage { } }; - // paging links - int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; - int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); - int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; - buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); - add(dataView); } @@ -515,8 +523,8 @@ public class MyTicketsPage extends RootPage { boolean showNav = total > (2 * pageSize); boolean allowPrev = page > 1; boolean allowNext = (pageSize * (page - 1) + count) < total; - add(new BookmarkablePageLink("prevLink", TicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page - 1)).setEnabled(allowPrev).setVisible(showNav)); - add(new BookmarkablePageLink("nextLink", TicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page + 1)).setEnabled(allowNext).setVisible(showNav)); + add(new BookmarkablePageLink("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page - 1)).setEnabled(allowPrev).setVisible(showNav)); + add(new BookmarkablePageLink("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page + 1)).setEnabled(allowNext).setVisible(showNav)); if (total <= pageSize) { add(new Label("pageLink").setVisible(false)); @@ -545,7 +553,7 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item item) { final Integer i = item.getModelObject(); - LinkPanel link = new LinkPanel("page", null, "" + i, TicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, i)); + LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, i)); link.setRenderBodyOnly(true); if (i == page) { WicketUtils.setCssClass(item, "active"); -- cgit v1.2.3 From 6f9908aa9ebcdfbb32e8305b157be177071abe56 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 24 Apr 2014 14:05:36 -0400 Subject: Do not display My Tickets link if ticket service is not ready --- src/main/java/com/gitblit/wicket/pages/RootPage.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index a4d2353d..fb68208f 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -172,13 +172,12 @@ public abstract class RootPage extends BasePage { if (!authenticateView || (authenticateView && isLoggedIn)) { pages.add(new PageRegistration(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class, getRootPageParameters())); + if (isLoggedIn && app().tickets().isReady()) { + pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class)); + } pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class, getRootPageParameters())); pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters())); - if(isLoggedIn) - { - pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters())); - } if (allowLucene) { pages.add(new PageRegistration("gb.search", LuceneSearchPage.class)); } -- cgit v1.2.3 From b3f70e7ed4b4c59fc578f529411f41e3fd6b192f Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 24 Apr 2014 14:06:36 -0400 Subject: Improve generated Lucene query to only show relevant My Tickets results --- .../com/gitblit/wicket/pages/MyTicketsPage.java | 67 ++++++++++++---------- 1 file changed, 37 insertions(+), 30 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 32cdaec3..083526b6 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -21,9 +21,9 @@ import org.apache.wicket.request.target.basic.RedirectRequestTarget; import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; -import com.gitblit.models.UserModel; import com.gitblit.models.TicketModel.Status; import com.gitblit.models.TicketModel.Type; +import com.gitblit.models.UserModel; import com.gitblit.tickets.ITicketService; import com.gitblit.tickets.QueryBuilder; import com.gitblit.tickets.QueryResult; @@ -42,24 +42,24 @@ public class MyTicketsPage extends RootPage { public static final String [] openStatii = new String [] { Status.New.name().toLowerCase(), Status.Open.name().toLowerCase() }; public static final String [] closedStatii = new String [] { "!" + Status.New.name().toLowerCase(), "!" + Status.Open.name().toLowerCase() }; - + public MyTicketsPage() { - this(null); + this(null); } - + public MyTicketsPage(PageParameters params) { super(params); setupPage("", getString("gb.mytickets")); - + UserModel currentUser = GitBlitWebSession.get().getUser(); if (currentUser == null) { setRedirect(true); setResponsePage(getApplication().getHomePage()); return; } - + final String username = currentUser.getName(); final String[] statiiParam = (params == null) ? openStatii : params.getStringArray(Lucene.status.name()); final String assignedToParam = (params == null) ? "" : params.getString(Lucene.responsible.name(), null); @@ -68,12 +68,12 @@ public class MyTicketsPage extends RootPage { final String searchParam = (params == null) ? "" : params.getString("s", null); final String sortBy = (params == null) ? "" : Lucene.fromString(params.getString("sort", Lucene.created.name())).name(); final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); - + // add search form TicketSearchForm searchForm = new TicketSearchForm("ticketSearchForm", searchParam); add(searchForm); searchForm.setTranslatedAttributes(); - + // standard queries add(new BookmarkablePageLink("changesQuery", MyTicketsPage.class, queryParameters( @@ -164,7 +164,7 @@ public class MyTicketsPage extends RootPage { sortBy, desc, 1))); - + // states if (ArrayUtils.isEmpty(statiiParam)) { add(new Label("selectedStatii", getString("gb.all"))); @@ -174,7 +174,7 @@ public class MyTicketsPage extends RootPage { add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, openStatii, assignedToParam, sortBy, desc, 1))); add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, closedStatii, assignedToParam, sortBy, desc, 1))); add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1))); - + // by status List statii = new ArrayList(Arrays.asList(Status.values())); statii.remove(Status.Closed); @@ -225,17 +225,9 @@ public class MyTicketsPage extends RootPage { } }; add(sortMenu); - + // Build Query here QueryBuilder qb = new QueryBuilder(queryParam); - if (!qb.containsField(Lucene.responsible.name())) { - // specify the responsible - qb.and(Lucene.responsible.matches(assignedToParam)); - } - if (!qb.containsField(Lucene.milestone.name())) { - // specify the milestone - qb.and(Lucene.milestone.matches(milestoneParam)); - } if (!qb.containsField(Lucene.status.name()) && !ArrayUtils.isEmpty(statiiParam)) { // specify the states boolean not = false; @@ -254,12 +246,27 @@ public class MyTicketsPage extends RootPage { qb.and(q.toSubquery().toString()); } } - final String luceneQuery = qb.build(); - + + final String luceneQuery; + if (qb.containsField(Lucene.createdby.name()) + || qb.containsField(Lucene.responsible.name()) + || qb.containsField(Lucene.watchedby.name())) { + // focused "my tickets" query + luceneQuery = qb.build(); + } else { + // general "my tickets" query + QueryBuilder myQuery = new QueryBuilder(); + myQuery.or(Lucene.createdby.matches(username)); + myQuery.or(Lucene.responsible.matches(username)); + myQuery.or(Lucene.watchedby.matches(username)); + myQuery.and(qb.toSubquery().toString()); + luceneQuery = myQuery.build(); + } + // paging links int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); - + ITicketService tickets = GitBlitWebApp.get().tickets(); List results; if(StringUtils.isEmpty(searchParam)) @@ -272,9 +279,9 @@ public class MyTicketsPage extends RootPage { } int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); - + final ListDataProvider dp = new ListDataProvider(results); - + DataView dataView = new DataView("row", dp) { private static final long serialVersionUID = 1L; @@ -282,15 +289,15 @@ public class MyTicketsPage extends RootPage { protected void populateItem(Item item) { QueryResult ticket = item.getModelObject(); RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); - + Component swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false); WicketUtils.setCssBackground(swatch, repository.toString()); item.add(swatch); - + PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository); PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number); item.add(new LinkPanel("repositoryName", "list", StringUtils.stripDotGit(ticket.repository), SummaryPage.class, rp)); - + item.add(getStateIcon("ticketIcon", ticket.type, ticket.status)); item.add(new Label("ticketNumber", "" + ticket.number)); item.add(new LinkPanel("ticketTitle", "list", ticket.title, TicketsPage.class, tp)); @@ -304,7 +311,7 @@ public class MyTicketsPage extends RootPage { String statusClass = getStatusClass(ticket.status); WicketUtils.setCssClass(ticketStatus, statusClass); item.add(ticketStatus); - + UserModel responsible = app().users().getUserModel(ticket.responsible); if (responsible == null) { if (ticket.responsible == null) { @@ -319,10 +326,10 @@ public class MyTicketsPage extends RootPage { } } }; - + add(dataView); } - + protected Label getStateIcon(String wicketId, TicketModel ticket) { return getStateIcon(wicketId, ticket.type, ticket.status); } -- cgit v1.2.3 From 4062e46eb07c4202d8872ecc02eb246304dda01e Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 24 Apr 2014 15:16:51 -0400 Subject: Revise My Tickets layout and styling --- .../com/gitblit/wicket/pages/MyTicketsPage.html | 183 ++++++++++-------- .../com/gitblit/wicket/pages/MyTicketsPage.java | 209 ++++++++++++++++++--- src/main/resources/gitblit.css | 48 ----- 3 files changed, 290 insertions(+), 150 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 459d2551..9ecc4b6e 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -8,94 +8,123 @@
    - -
    -
    -
    - - +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + +
    + + +
    + +
    - -
    -
      - -
      -
      -
      - -
      -
      -
        -
        • -
        • -
        • -
        • -
        • -
        • -
      • -
        • -
        • -
        • + + +
        +
        +
        + : +
          +
          • +
          • +
        • -
          • +
          • +
        +
        +
        + : +
          +
        -
        - - -
        -
        -
        - : -
          -
          • -
          • -
          • -
        • -
          • -
        -
        - -
        - : -
          -
          • -
        -
        -
        - +
        +
        - - - - - - - - - - -
        - - [repository name] - - [ticket icon] - [ticket title] - (#[ticket number]) - [ticket responsible]
        + + + + + + + + + + + +
        + + + [title] +
        + + + [createdBy] [create date] + + +
        +
        +
        [repository link]
        +         		+ + + + +
        +         		+
        + #[id] +
        +
        +
      - + + +
      + + [updatedBy] [update date] +
      +       + + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 083526b6..7e988a22 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -6,18 +6,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.wicket.Component; import org.apache.wicket.PageParameters; +import org.apache.wicket.behavior.SimpleAttributeModifier; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextField; 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.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.target.basic.RedirectRequestTarget; +import org.eclipse.jgit.lib.Repository; +import com.gitblit.Constants; import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; @@ -28,7 +31,9 @@ import com.gitblit.tickets.ITicketService; import com.gitblit.tickets.QueryBuilder; import com.gitblit.tickets.QueryResult; import com.gitblit.tickets.TicketIndexer.Lucene; +import com.gitblit.tickets.TicketLabel; import com.gitblit.utils.ArrayUtils; +import com.gitblit.utils.BugtraqProcessor; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; @@ -69,6 +74,9 @@ public class MyTicketsPage extends RootPage { final String sortBy = (params == null) ? "" : Lucene.fromString(params.getString("sort", Lucene.created.name())).name(); final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); + add(new GravatarImage("userGravatar", currentUser, "gravatar", 36, false)); + add(new Label("userDisplayName", currentUser.getDisplayName())); + // add search form TicketSearchForm searchForm = new TicketSearchForm("ticketSearchForm", searchParam); add(searchForm); @@ -280,6 +288,7 @@ public class MyTicketsPage extends RootPage { int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); + final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true); final ListDataProvider dp = new ListDataProvider(results); DataView dataView = new DataView("row", dp) { @@ -287,43 +296,168 @@ public class MyTicketsPage extends RootPage { @Override protected void populateItem(Item item) { - QueryResult ticket = item.getModelObject(); - RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); + final QueryResult ticket = item.getModelObject(); + final RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); - Component swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false); - WicketUtils.setCssBackground(swatch, repository.toString()); - item.add(swatch); + if (showSwatch) { + // set repository color + String color = StringUtils.getColor(StringUtils.stripDotGit(repository.name)); + WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color)); + } PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository); PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number); - item.add(new LinkPanel("repositoryName", "list", StringUtils.stripDotGit(ticket.repository), SummaryPage.class, rp)); + item.add(new LinkPanel("repositoryLink", null, StringUtils.stripDotGit(ticket.repository), SummaryPage.class, rp)); + + item.add(getStateIcon("state", ticket.type, ticket.status)); + item.add(new Label("id", "" + ticket.number)); + UserModel creator = app().users().getUserModel(ticket.createdBy); + if (creator != null) { + item.add(new LinkPanel("createdBy", null, creator.getDisplayName(), + UserPage.class, WicketUtils.newUsernameParameter(ticket.createdBy))); + } else { + item.add(new Label("createdBy", ticket.createdBy)); + } + item.add(WicketUtils.createDateLabel("createDate", ticket.createdAt, GitBlitWebSession + .get().getTimezone(), getTimeUtils(), false)); + + if (ticket.updatedAt == null) { + item.add(new Label("updated").setVisible(false)); + } else { + Fragment updated = new Fragment("updated", "updatedFragment", this); + UserModel updater = app().users().getUserModel(ticket.updatedBy); + if (updater != null) { + updated.add(new LinkPanel("updatedBy", null, updater.getDisplayName(), + UserPage.class, WicketUtils.newUsernameParameter(ticket.updatedBy))); + } else { + updated.add(new Label("updatedBy", ticket.updatedBy)); + } + updated.add(WicketUtils.createDateLabel("updateDate", ticket.updatedAt, GitBlitWebSession + .get().getTimezone(), getTimeUtils(), false)); + item.add(updated); + } - item.add(getStateIcon("ticketIcon", ticket.type, ticket.status)); - item.add(new Label("ticketNumber", "" + ticket.number)); - item.add(new LinkPanel("ticketTitle", "list", ticket.title, TicketsPage.class, tp)); + item.add(new LinkPanel("title", "list subject", StringUtils.trimString( + ticket.title, Constants.LEN_SHORTLOG), TicketsPage.class, tp)); + + ListDataProvider labelsProvider = new ListDataProvider(ticket.getLabels()); + DataView labelsView = new DataView("labels", labelsProvider) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item labelItem) { + BugtraqProcessor btp = new BugtraqProcessor(app().settings()); + Repository db = app().repositories().getRepository(repository.name); + String content = btp.processPlainCommitMessage(db, repository.name, labelItem.getModelObject()); + db.close(); + Label label = new Label("label", content); + label.setEscapeModelStrings(false); + TicketLabel tLabel = app().tickets().getLabel(repository, labelItem.getModelObject()); + String background = MessageFormat.format("background-color:{0};", tLabel.color); + label.add(new SimpleAttributeModifier("style", background)); + labelItem.add(label); + } + }; + item.add(labelsView); + + if (StringUtils.isEmpty(ticket.responsible)) { + item.add(new Label("responsible").setVisible(false)); + } else { + UserModel responsible = app().users().getUserModel(ticket.responsible); + if (responsible == null) { + responsible = new UserModel(ticket.responsible); + } + GravatarImage avatar = new GravatarImage("responsible", responsible.getDisplayName(), + responsible.emailAddress, null, 16, true); + avatar.setTooltip(getString("gb.responsible") + ": " + responsible.getDisplayName()); + item.add(avatar); + } // votes indicator - Label v = new Label("ticketVotes", "" + ticket.votesCount); + Label v = new Label("votes", "" + ticket.votesCount); WicketUtils.setHtmlTooltip(v, getString("gb.votes")); item.add(v.setVisible(ticket.votesCount > 0)); - Label ticketStatus = new Label("ticketStatus", ticket.status.toString()); - String statusClass = getStatusClass(ticket.status); - WicketUtils.setCssClass(ticketStatus, statusClass); - item.add(ticketStatus); + // watching indicator + item.add(new Label("watching").setVisible(ticket.isWatching(GitBlitWebSession.get().getUsername()))); - UserModel responsible = app().users().getUserModel(ticket.responsible); - if (responsible == null) { - if (ticket.responsible == null) { - item.add(new Label("ticketResponsibleImg").setVisible(false)); - } else { - item.add(new GravatarImage("ticketResponsibleImg", ticket.responsible, ticket.responsible, null, 16, true)); + // status indicator + String css = getLozengeClass(ticket.status, true); + Label l = new Label("status", ticket.status.toString()); + WicketUtils.setCssClass(l, css); + item.add(l); + + // add the ticket indicators/icons + List indicators = new ArrayList(); + + // comments + if (ticket.commentsCount > 0) { + int count = ticket.commentsCount; + String pattern = "gb.nComments"; + if (count == 1) { + pattern = "gb.oneComment"; } - item.add(new Label("ticketResponsible", ticket.responsible)); - } else { - item.add(new GravatarImage("ticketResponsibleImg", responsible, null, 16, true)); - item.add(new LinkPanel("ticketResponsible", null, responsible.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(ticket.responsible))); + indicators.add(new Indicator("fa fa-comment", count, pattern)); + } + + // participants + if (!ArrayUtils.isEmpty(ticket.participants)) { + int count = ticket.participants.size(); + if (count > 1) { + String pattern = "gb.nParticipants"; + indicators.add(new Indicator("fa fa-user", count, pattern)); + } + } + + // attachments + if (!ArrayUtils.isEmpty(ticket.attachments)) { + int count = ticket.attachments.size(); + String pattern = "gb.nAttachments"; + if (count == 1) { + pattern = "gb.oneAttachment"; + } + indicators.add(new Indicator("fa fa-file", count, pattern)); + } + + // patchset revisions + if (ticket.patchset != null) { + int count = ticket.patchset.commits; + String pattern = "gb.nCommits"; + if (count == 1) { + pattern = "gb.oneCommit"; + } + indicators.add(new Indicator("fa fa-code", count, pattern)); + } + + // milestone + if (!StringUtils.isEmpty(ticket.milestone)) { + indicators.add(new Indicator("fa fa-bullseye", ticket.milestone)); } + + ListDataProvider indicatorsDp = new ListDataProvider(indicators); + DataView indicatorsView = new DataView("indicators", indicatorsDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + Indicator indicator = item.getModelObject(); + String tooltip = indicator.getTooltip(); + + Label icon = new Label("icon"); + WicketUtils.setCssClass(icon, indicator.css); + item.add(icon); + + if (indicator.count > 0) { + Label count = new Label("count", "" + indicator.count); + item.add(count.setVisible(!StringUtils.isEmpty(tooltip))); + } else { + item.add(new Label("count").setVisible(false)); + } + + WicketUtils.setHtmlTooltip(item, tooltip); + } + }; + item.add(indicatorsView); } }; @@ -570,4 +704,29 @@ public class MyTicketsPage extends RootPage { }; add(pagesView); } + + private class Indicator implements Serializable { + + private static final long serialVersionUID = 1L; + + final String css; + final int count; + final String tooltip; + + Indicator(String css, String tooltip) { + this.css = css; + this.tooltip = tooltip; + this.count = 0; + } + + Indicator(String css, int count, String pattern) { + this.css = css; + this.count = count; + this.tooltip = StringUtils.isEmpty(pattern) ? "" : MessageFormat.format(getString(pattern), count); + } + + String getTooltip() { + return tooltip; + } + } } diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index ea663a66..748a3198 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -1599,54 +1599,6 @@ table.repositories tr.group td a { color: black; } -table.tickets { - border:1px solid #ddd; - border-spacing: 0px; - width: 100%; -} - -table.tickets th { - padding: 4px; - border:0; -} - -table.tickets th.right { - border-right: 1px solid #ddd; -} - -table.tickets td { - padding: 2px; - border-left: 0; -} - -table.tickets td.rightAlign { - text-align: right; - border-right: 1px solid #ddd; -} - -table.tickets td.icon img { - vertical-align: top; -} - -table.tickets tr.group { - background-color: #ccc; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; -} - -table.tickets tr.group td { - font-weight: bold; - color: black; - background-color: #ddd; - padding-left: 5px; - border-top: 1px solid #aaa; - border-bottom: 1px solid #aaa; -} - -table.tickets tr.group td a { - color: black; -} - table.palette { border:0; width: 0 !important; } table.palette td.header { font-weight: bold; -- cgit v1.2.3 From 4cbddead33232b82a6d35ebfa333e46c74c9bcf8 Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Fri, 25 Apr 2014 14:55:40 +0200 Subject: Added the "you are responsible of" filter in "my tickets" page. --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++- src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties | 1 + src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 1 + src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 9 +++++++++ 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 030c5ebe..89ccaa3d 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -678,4 +678,5 @@ gb.notifyChangedOpenTickets = send notification for changed open tickets gb.overdue = overdue gb.openMilestones = open milestones gb.closedMilestones = closed milestones -gb.mytickets = my tickets \ No newline at end of file +gb.mytickets = my tickets +gb.responsibleMeTickets = you are responsible of \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties index 75a3ab7a..fc766ce2 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties @@ -671,3 +671,4 @@ gb.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets. gb.ticketIsClosed = Ce ticket est clos. gb.mergeToDescription = default integration branch for merging ticket patchsets gb.mytickets = mes tickets +gb.responsibleMeTickets = dont vous tes responsable diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 9ecc4b6e..68b4f045 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -33,6 +33,7 @@
      • +
      • diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 7e988a22..00b9e190 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -172,6 +172,15 @@ public class MyTicketsPage extends RootPage { sortBy, desc, 1))); + add(new BookmarkablePageLink("responsibleQuery", MyTicketsPage.class, + queryParameters( + Lucene.responsible.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); // states if (ArrayUtils.isEmpty(statiiParam)) { -- cgit v1.2.3 From 0514f28dc561e030af42f6df00ff785594f72646 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 25 Apr 2014 09:14:27 -0400 Subject: Refine localized strings --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 4 ++-- src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties | 4 ++-- src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 4 ++-- src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 2 +- src/main/java/com/gitblit/wicket/pages/RootPage.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 89ccaa3d..0c56df54 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -678,5 +678,5 @@ gb.notifyChangedOpenTickets = send notification for changed open tickets gb.overdue = overdue gb.openMilestones = open milestones gb.closedMilestones = closed milestones -gb.mytickets = my tickets -gb.responsibleMeTickets = you are responsible of \ No newline at end of file +gb.myTickets = my tickets +gb.yourAssignedTickets = assigned to you \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties index fc766ce2..a6d61842 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties @@ -670,5 +670,5 @@ gb.repositoryDoesNotAcceptPatchsets = Ce d gb.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets. gb.ticketIsClosed = Ce ticket est clos. gb.mergeToDescription = default integration branch for merging ticket patchsets -gb.mytickets = mes tickets -gb.responsibleMeTickets = dont vous tes responsable +gb.myTickets = mes tickets +gb.yourAssignedTickets = dont vous tes responsable diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 68b4f045..b7172db5 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -17,7 +17,7 @@
      -
      +
      @@ -31,9 +31,9 @@
      • +
      • -
      • diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 00b9e190..e2688580 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -56,7 +56,7 @@ public class MyTicketsPage extends RootPage { public MyTicketsPage(PageParameters params) { super(params); - setupPage("", getString("gb.mytickets")); + setupPage("", getString("gb.myTickets")); UserModel currentUser = GitBlitWebSession.get().getUser(); if (currentUser == null) { diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index fb68208f..c59c1892 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -173,7 +173,7 @@ public abstract class RootPage extends BasePage { pages.add(new PageRegistration(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class, getRootPageParameters())); if (isLoggedIn && app().tickets().isReady()) { - pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class)); + pages.add(new PageRegistration("gb.myTickets", MyTicketsPage.class)); } pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class, getRootPageParameters())); -- cgit v1.2.3 From 92a33bc2ef40a7252ca8800cc48657afe66db2ef Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 1 May 2014 15:48:21 -0400 Subject: Revert "Implementation of the getTickets capability of recovering all tickets from a nullable RepositoryModel" This reverts commit 1e6158bbc38a9012053c3bf8bfd16e113d8f5d29. --- .../com/gitblit/tickets/BranchTicketService.java | 114 +++++++++------------ .../com/gitblit/tickets/FileTicketService.java | 9 +- .../com/gitblit/tickets/RedisTicketService.java | 85 ++++++--------- 3 files changed, 84 insertions(+), 124 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/BranchTicketService.java b/src/main/java/com/gitblit/tickets/BranchTicketService.java index 7d6926df..284b1be1 100644 --- a/src/main/java/com/gitblit/tickets/BranchTicketService.java +++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java @@ -436,84 +436,64 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi @Override public List getTickets(RepositoryModel repository, TicketFilter filter) { List list = new ArrayList(); - List databases = new ArrayList(); - List models = new ArrayList(); - - if(repository == null) - { - List allRepo = repositoryManager.getRepositoryList(); - for(int i = 0; i < allRepo.size(); i++) - { - databases.add(repositoryManager.getRepository(allRepo.get(i))); - models.add(repositoryManager.getRepositoryModel(allRepo.get(i))); + + Repository db = repositoryManager.getRepository(repository.name); + try { + RefModel ticketsBranch = getTicketsBranch(db); + if (ticketsBranch == null) { + return list; } - } - else - { - databases.add(repositoryManager.getRepository(repository.name)); - models.add(repository); - } - for(int i = 0; i < databases.size(); i++) - { - Repository db = databases.get(i); - try { - RefModel ticketsBranch = getTicketsBranch(db); - if (ticketsBranch == null) { - return list; + // Collect the set of all json files + List paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH); + + // Deserialize each ticket and optionally filter out unwanted tickets + for (PathModel path : paths) { + String name = path.name.substring(path.name.lastIndexOf('/') + 1); + if (!JOURNAL.equals(name)) { + continue; } - - // Collect the set of all json files - List paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH); - - // Deserialize each ticket and optionally filter out unwanted tickets - for (PathModel path : paths) { - String name = path.name.substring(path.name.lastIndexOf('/') + 1); - if (!JOURNAL.equals(name)) { - continue; - } - String json = readTicketsFile(db, path.path); - if (StringUtils.isEmpty(json)) { - // journal was touched but no changes were written + String json = readTicketsFile(db, path.path); + if (StringUtils.isEmpty(json)) { + // journal was touched but no changes were written + continue; + } + try { + // Reconstruct ticketId from the path + // id/26/326/journal.json + String tid = path.path.split("/")[2]; + long ticketId = Long.parseLong(tid); + List changes = TicketSerializer.deserializeJournal(json); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", repository, path.path); continue; } - try { - // Reconstruct ticketId from the path - // id/26/326/journal.json - String tid = path.path.split("/")[2]; - long ticketId = Long.parseLong(tid); - List changes = TicketSerializer.deserializeJournal(json); - if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", models.get(i), path.path); - continue; - } - TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = models.get(i).projectPath; - ticket.repository = models.get(i).name; - ticket.number = ticketId; - - // add the ticket, conditionally, to the list - if (filter == null) { + TicketModel ticket = TicketModel.buildTicket(changes); + ticket.project = repository.projectPath; + ticket.repository = repository.name; + ticket.number = ticketId; + + // add the ticket, conditionally, to the list + if (filter == null) { + list.add(ticket); + } else { + if (filter.accept(ticket)) { list.add(ticket); - } else { - if (filter.accept(ticket)) { - list.add(ticket); - } } - } catch (Exception e) { - log.error("failed to deserialize {}/{}\n{}", - new Object [] { repository, path.path, e.getMessage()}); - log.error(null, e); } + } catch (Exception e) { + log.error("failed to deserialize {}/{}\n{}", + new Object [] { repository, path.path, e.getMessage()}); + log.error(null, e); } - } finally { - db.close(); } - } - // sort the tickets by creation - Collections.sort(list); - return list; + // sort the tickets by creation + Collections.sort(list); + return list; + } finally { + db.close(); + } } /** diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index 7fd9675f..ea5d065f 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -228,7 +228,6 @@ public class FileTicketService extends ITicketService { for(int i = 0; i < databases.size(); i++) { Repository db = databases.get(i); - RepositoryModel model = models.get(i); try { // Collect the set of all json files File dir = new File(db.getDirectory(), TICKETS_PATH); @@ -254,12 +253,12 @@ public class FileTicketService extends ITicketService { long ticketId = Long.parseLong(tid); List changes = TicketSerializer.deserializeJournal(json); if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", model, journal); + log.warn("Empty journal for {}:{}", models.get(i), journal); continue; } TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = model.projectPath; - ticket.repository = model.name; + ticket.project = models.get(i).projectPath; + ticket.repository = models.get(i).name; ticket.number = ticketId; // add the ticket, conditionally, to the list @@ -272,7 +271,7 @@ public class FileTicketService extends ITicketService { } } catch (Exception e) { log.error("failed to deserialize {}/{}\n{}", - new Object [] { model, journal, e.getMessage()}); + new Object [] { models.get(i), journal, e.getMessage()}); log.error(null, e); } } diff --git a/src/main/java/com/gitblit/tickets/RedisTicketService.java b/src/main/java/com/gitblit/tickets/RedisTicketService.java index 48256b2b..2c5b181f 100644 --- a/src/main/java/com/gitblit/tickets/RedisTicketService.java +++ b/src/main/java/com/gitblit/tickets/RedisTicketService.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.eclipse.jgit.lib.Repository; import redis.clients.jedis.Client; import redis.clients.jedis.Jedis; @@ -229,65 +228,47 @@ public class RedisTicketService extends ITicketService { public List getTickets(RepositoryModel repository, TicketFilter filter) { Jedis jedis = pool.getResource(); List list = new ArrayList(); - List models = new ArrayList(); - - if(repository == null) - { - List allRepo = repositoryManager.getRepositoryList(); - for(int i = 0; i < allRepo.size(); i++) - { - models.add(repositoryManager.getRepositoryModel(allRepo.get(i))); - } - } - else - { - models.add(repository); - } - if (jedis == null) { return list; } - for(int i = 0; i < models.size(); i++) - { - RepositoryModel model = models.get(i); - try { - // Deserialize each journal, build the ticket, and optionally filter - Set keys = jedis.keys(key(model, KeyType.journal, "*")); - for (String key : keys) { - // {repo}:journal:{id} - String id = key.split(":")[2]; - long ticketId = Long.parseLong(id); - List changes = getJournal(jedis, model, ticketId); - if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", model, ticketId); - continue; - } - TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = model.projectPath; - ticket.repository = model.name; - ticket.number = ticketId; - - // add the ticket, conditionally, to the list - if (filter == null) { + try { + // Deserialize each journal, build the ticket, and optionally filter + Set keys = jedis.keys(key(repository, KeyType.journal, "*")); + for (String key : keys) { + // {repo}:journal:{id} + String id = key.split(":")[2]; + long ticketId = Long.parseLong(id); + List changes = getJournal(jedis, repository, ticketId); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", repository, ticketId); + continue; + } + TicketModel ticket = TicketModel.buildTicket(changes); + ticket.project = repository.projectPath; + ticket.repository = repository.name; + ticket.number = ticketId; + + // add the ticket, conditionally, to the list + if (filter == null) { + list.add(ticket); + } else { + if (filter.accept(ticket)) { list.add(ticket); - } else { - if (filter.accept(ticket)) { - list.add(ticket); - } } } - } catch (JedisException e) { - log.error("failed to retrieve tickets from Redis @ " + getUrl(), e); - pool.returnBrokenResource(jedis); - jedis = null; - } finally { - if (jedis != null) { - pool.returnResource(jedis); - } + } + + // sort the tickets by creation + Collections.sort(list); + } catch (JedisException e) { + log.error("failed to retrieve tickets from Redis @ " + getUrl(), e); + pool.returnBrokenResource(jedis); + jedis = null; + } finally { + if (jedis != null) { + pool.returnResource(jedis); } } - // sort the tickets by creation - Collections.sort(list); return list; } -- cgit v1.2.3 From 3490ef1a69af4bc72be03188fd9961ef2183dc2b Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 1 May 2014 15:55:20 -0400 Subject: Reverted changes to ticket services --- .../com/gitblit/tickets/FileTicketService.java | 116 +++++++++------------ .../java/com/gitblit/tickets/ITicketService.java | 11 +- 2 files changed, 49 insertions(+), 78 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index ea5d065f..4386020f 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -207,82 +207,62 @@ public class FileTicketService extends ITicketService { @Override public List getTickets(RepositoryModel repository, TicketFilter filter) { List list = new ArrayList(); - List databases = new ArrayList(); - List models = new ArrayList(); - - if(repository == null) - { - List allRepo = repositoryManager.getRepositoryList(); - for(int i = 0; i < allRepo.size(); i++) - { - databases.add(repositoryManager.getRepository(allRepo.get(i))); - models.add(repositoryManager.getRepositoryModel(allRepo.get(i))); - } - } - else - { - databases.add(repositoryManager.getRepository(repository.name)); - models.add(repository); - } - - for(int i = 0; i < databases.size(); i++) - { - Repository db = databases.get(i); - try { - // Collect the set of all json files - File dir = new File(db.getDirectory(), TICKETS_PATH); - List journals = findAll(dir, JOURNAL); - - // Deserialize each ticket and optionally filter out unwanted tickets - for (File journal : journals) { - String json = null; - try { - json = new String(FileUtils.readContent(journal), Constants.ENCODING); - } catch (Exception e) { - log.error(null, e); - } - if (StringUtils.isEmpty(json)) { - // journal was touched but no changes were written + + Repository db = repositoryManager.getRepository(repository.name); + try { + // Collect the set of all json files + File dir = new File(db.getDirectory(), TICKETS_PATH); + List journals = findAll(dir, JOURNAL); + + // Deserialize each ticket and optionally filter out unwanted tickets + for (File journal : journals) { + String json = null; + try { + json = new String(FileUtils.readContent(journal), Constants.ENCODING); + } catch (Exception e) { + log.error(null, e); + } + if (StringUtils.isEmpty(json)) { + // journal was touched but no changes were written + continue; + } + try { + // Reconstruct ticketId from the path + // id/26/326/journal.json + String path = FileUtils.getRelativePath(dir, journal); + String tid = path.split("/")[1]; + long ticketId = Long.parseLong(tid); + List changes = TicketSerializer.deserializeJournal(json); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", repository, journal); continue; } - try { - // Reconstruct ticketId from the path - // id/26/326/journal.json - String path = FileUtils.getRelativePath(dir, journal); - String tid = path.split("/")[1]; - long ticketId = Long.parseLong(tid); - List changes = TicketSerializer.deserializeJournal(json); - if (ArrayUtils.isEmpty(changes)) { - log.warn("Empty journal for {}:{}", models.get(i), journal); - continue; - } - TicketModel ticket = TicketModel.buildTicket(changes); - ticket.project = models.get(i).projectPath; - ticket.repository = models.get(i).name; - ticket.number = ticketId; - - // add the ticket, conditionally, to the list - if (filter == null) { + TicketModel ticket = TicketModel.buildTicket(changes); + ticket.project = repository.projectPath; + ticket.repository = repository.name; + ticket.number = ticketId; + + // add the ticket, conditionally, to the list + if (filter == null) { + list.add(ticket); + } else { + if (filter.accept(ticket)) { list.add(ticket); - } else { - if (filter.accept(ticket)) { - list.add(ticket); - } } - } catch (Exception e) { - log.error("failed to deserialize {}/{}\n{}", - new Object [] { models.get(i), journal, e.getMessage()}); - log.error(null, e); } + } catch (Exception e) { + log.error("failed to deserialize {}/{}\n{}", + new Object [] { repository, journal, e.getMessage()}); + log.error(null, e); } - } finally { - db.close(); } + + // sort the tickets by creation + Collections.sort(list); + return list; + } finally { + db.close(); } - - // sort the tickets by creation - Collections.sort(list); - return list; } private List findAll(File dir, String filename) { diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java index e7b4c71d..3261ca96 100644 --- a/src/main/java/com/gitblit/tickets/ITicketService.java +++ b/src/main/java/com/gitblit/tickets/ITicketService.java @@ -779,21 +779,12 @@ public abstract class ITicketService { * @since 1.4.0 */ public abstract boolean hasTicket(RepositoryModel repository, long ticketId); - - /** - * Returns all tickets. This is not a Lucene search! - * - * @return all tickets - */ - public List getTickets() { - return getTickets(null, null); - } /** * Returns all tickets. This is not a Lucene search! * * @param repository - * @return all tickets of a given repository + * @return all tickets * @since 1.4.0 */ public List getTickets(RepositoryModel repository) { -- cgit v1.2.3 From 5506507a3d164b942a03eb7d439332b8fcda6713 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 1 May 2014 15:47:56 -0400 Subject: Layout adjustments for responsive scaling --- .../java/com/gitblit/wicket/pages/MyTicketsPage.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index b7172db5..f4e62b4e 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -14,13 +14,21 @@
      -
      +
      -
      +
      + +
      +
      + + +
      +
      +
        • @@ -38,13 +46,6 @@
      - -
      -
      - - -
      -
      -- cgit v1.2.3 From fdd82f02dddd2d4211e9df4239f3be6c8595b2dd Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 1 May 2014 19:53:53 -0400 Subject: Refactored common code out of My Tickets and Tickets --- .../com/gitblit/wicket/GitBlitWebApp.properties | 4 +- .../java/com/gitblit/wicket/SessionlessForm.java | 15 +- src/main/java/com/gitblit/wicket/TicketsUI.java | 211 ++++++++++ src/main/java/com/gitblit/wicket/WicketUtils.java | 4 +- .../com/gitblit/wicket/pages/MyTicketsPage.html | 56 +-- .../com/gitblit/wicket/pages/MyTicketsPage.java | 437 +++------------------ .../com/gitblit/wicket/pages/RepositoryPage.html | 2 +- .../com/gitblit/wicket/pages/RepositoryPage.java | 3 +- .../com/gitblit/wicket/pages/TicketBasePage.java | 126 ------ .../java/com/gitblit/wicket/pages/TicketPage.java | 21 +- .../java/com/gitblit/wicket/pages/TicketsPage.html | 46 +-- .../java/com/gitblit/wicket/pages/TicketsPage.java | 316 +-------------- .../com/gitblit/wicket/panels/TicketListPanel.html | 55 +++ .../com/gitblit/wicket/panels/TicketListPanel.java | 243 ++++++++++++ .../gitblit/wicket/panels/TicketSearchForm.java | 78 ++++ .../com/gitblit/wicket/panels/UserTitlePanel.html | 16 + .../com/gitblit/wicket/panels/UserTitlePanel.java | 32 ++ 17 files changed, 733 insertions(+), 932 deletions(-) create mode 100644 src/main/java/com/gitblit/wicket/TicketsUI.java delete mode 100644 src/main/java/com/gitblit/wicket/pages/TicketBasePage.java create mode 100644 src/main/java/com/gitblit/wicket/panels/TicketListPanel.html create mode 100644 src/main/java/com/gitblit/wicket/panels/TicketListPanel.java create mode 100644 src/main/java/com/gitblit/wicket/panels/TicketSearchForm.java create mode 100644 src/main/java/com/gitblit/wicket/panels/UserTitlePanel.html create mode 100644 src/main/java/com/gitblit/wicket/panels/UserTitlePanel.java (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 0c56df54..0ed2ed59 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -672,11 +672,11 @@ gb.ticketIsClosed = This ticket is closed. gb.mergeToDescription = default integration branch for merging ticket patchsets gb.anonymousCanNotPropose = Anonymous users can not propose patchsets. gb.youDoNotHaveClonePermission = You are not permitted to clone this repository. +gb.myTickets = my tickets +gb.yourAssignedTickets = assigned to you gb.newMilestone = new milestone gb.editMilestone = edit milestone gb.notifyChangedOpenTickets = send notification for changed open tickets gb.overdue = overdue gb.openMilestones = open milestones gb.closedMilestones = closed milestones -gb.myTickets = my tickets -gb.yourAssignedTickets = assigned to you \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/SessionlessForm.java b/src/main/java/com/gitblit/wicket/SessionlessForm.java index d228a2e1..6f790717 100644 --- a/src/main/java/com/gitblit/wicket/SessionlessForm.java +++ b/src/main/java/com/gitblit/wicket/SessionlessForm.java @@ -22,6 +22,7 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.html.form.StatelessForm; +import org.apache.wicket.protocol.http.RequestUtils; import org.apache.wicket.protocol.http.WicketURLDecoder; import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy; import org.apache.wicket.util.string.AppendingStringBuffer; @@ -53,9 +54,9 @@ public class SessionlessForm extends StatelessForm { private static final String HIDDEN_DIV_START = "
      "; - private final Class pageClass; + protected final Class pageClass; - private final PageParameters pageParameters; + protected final PageParameters pageParameters; private final Logger log = LoggerFactory.getLogger(SessionlessForm.class); @@ -145,4 +146,14 @@ public class SessionlessForm extends StatelessForm { String un = WicketURLDecoder.QUERY_INSTANCE.decode(s); return Strings.escapeMarkup(un).toString(); } + + protected String getAbsoluteUrl() { + return getAbsoluteUrl(pageClass, pageParameters); + } + + protected String getAbsoluteUrl(Class pageClass, PageParameters pageParameters) { + String relativeUrl = urlFor(pageClass, pageParameters).toString(); + String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl); + return absoluteUrl; + } } diff --git a/src/main/java/com/gitblit/wicket/TicketsUI.java b/src/main/java/com/gitblit/wicket/TicketsUI.java new file mode 100644 index 00000000..a243a7b3 --- /dev/null +++ b/src/main/java/com/gitblit/wicket/TicketsUI.java @@ -0,0 +1,211 @@ +/* + * Copyright 2014 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; + +import java.io.Serializable; +import java.text.MessageFormat; + +import org.apache.wicket.markup.html.basic.Label; + +import com.gitblit.models.TicketModel; +import com.gitblit.models.TicketModel.Status; +import com.gitblit.models.TicketModel.Type; +import com.gitblit.utils.StringUtils; + +/** + * Common tickets ui methods and classes. + * + * @author James Moger + * + */ +public class TicketsUI { + + public static final String [] openStatii = new String [] { Status.New.name().toLowerCase(), Status.Open.name().toLowerCase() }; + + public static final String [] closedStatii = new String [] { "!" + Status.New.name().toLowerCase(), "!" + Status.Open.name().toLowerCase() }; + + public static Label getStateIcon(String wicketId, TicketModel ticket) { + return getStateIcon(wicketId, ticket.type, ticket.status); + } + + public static Label getStateIcon(String wicketId, Type type, Status state) { + Label label = new Label(wicketId); + if (type == null) { + type = Type.defaultType; + } + switch (type) { + case Proposal: + WicketUtils.setCssClass(label, "fa fa-code-fork"); + break; + case Bug: + WicketUtils.setCssClass(label, "fa fa-bug"); + break; + case Enhancement: + WicketUtils.setCssClass(label, "fa fa-magic"); + break; + case Question: + WicketUtils.setCssClass(label, "fa fa-question"); + break; + default: + // standard ticket + WicketUtils.setCssClass(label, "fa fa-ticket"); + } + WicketUtils.setHtmlTooltip(label, getTypeState(type, state)); + return label; + } + + public static String getTypeState(Type type, Status state) { + return state.toString() + " " + type.toString(); + } + + public static String getLozengeClass(Status status, boolean subtle) { + if (status == null) { + status = Status.New; + } + String css = ""; + switch (status) { + case Declined: + case Duplicate: + case Invalid: + case Wontfix: + case Abandoned: + css = "aui-lozenge-error"; + break; + case Fixed: + case Merged: + case Resolved: + css = "aui-lozenge-success"; + break; + case New: + css = "aui-lozenge-complete"; + break; + case On_Hold: + css = "aui-lozenge-current"; + break; + default: + css = ""; + break; + } + + return "aui-lozenge" + (subtle ? " aui-lozenge-subtle": "") + (css.isEmpty() ? "" : " ") + css; + } + + public static String getStatusClass(Status status) { + String css = ""; + switch (status) { + case Declined: + case Duplicate: + case Invalid: + case Wontfix: + case Abandoned: + css = "resolution-error"; + break; + case Fixed: + case Merged: + case Resolved: + css = "resolution-success"; + break; + case New: + css = "resolution-complete"; + break; + case On_Hold: + css = "resolution-current"; + break; + default: + css = ""; + break; + } + + return "resolution" + (css.isEmpty() ? "" : " ") + css; + } + + public static class TicketSort implements Serializable { + + private static final long serialVersionUID = 1L; + + public final String name; + public final String sortBy; + public final boolean desc; + + public TicketSort(String name, String sortBy, boolean desc) { + this.name = name; + this.sortBy = sortBy; + this.desc = desc; + } + } + + public static class Indicator implements Serializable { + + private static final long serialVersionUID = 1L; + + public final String css; + public final int count; + public final String tooltip; + + public Indicator(String css, String tooltip) { + this.css = css; + this.tooltip = tooltip; + this.count = 0; + } + + public Indicator(String css, int count, String pattern) { + this.css = css; + this.count = count; + this.tooltip = StringUtils.isEmpty(pattern) ? "" : MessageFormat.format(pattern, count); + } + + public String getTooltip() { + return tooltip; + } + } + + public static class TicketQuery implements Serializable, Comparable { + + private static final long serialVersionUID = 1L; + + public final String name; + public final String query; + public String color; + + public TicketQuery(String name, String query) { + this.name = name; + this.query = query; + } + + public TicketQuery color(String value) { + this.color = value; + return this; + } + + @Override + public boolean equals(Object o) { + if (o instanceof TicketQuery) { + return ((TicketQuery) o).query.equals(query); + } + return false; + } + + @Override + public int hashCode() { + return query.hashCode(); + } + + @Override + public int compareTo(TicketQuery o) { + return query.compareTo(o.query); + } + } +} diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index 2a34ca80..10b21468 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -300,7 +300,9 @@ public class WicketUtils { public static PageParameters newRepositoryParameter(String repositoryName) { Map parameterMap = new HashMap(); - parameterMap.put("r", repositoryName); + if (!StringUtils.isEmpty(repositoryName)) { + parameterMap.put("r", repositoryName); + } return new PageParameters(parameterMap); } diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index f4e62b4e..b0bc1949 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -7,19 +7,12 @@
      -
      -
      -
      -
      -
      -
      -
      -
      +
      @@ -79,54 +72,13 @@
      - - - - - - - - - - - -
      - - - [title] -
      - - - [createdBy] [create date] - - -
      -
      -
      [repository link]
      -       		- - - - -
      -       		-
      - #[id] -
      -
      -
      + +
      - - -
      - - [updatedBy] [update date] -
      -       - + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index e2688580..c207d561 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -1,72 +1,74 @@ +/* + * Copyright 2014 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.Serializable; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.apache.wicket.PageParameters; -import org.apache.wicket.behavior.SimpleAttributeModifier; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.TextField; 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.ListDataProvider; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.request.target.basic.RedirectRequestTarget; -import org.eclipse.jgit.lib.Repository; -import com.gitblit.Constants; import com.gitblit.Keys; -import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; import com.gitblit.models.TicketModel.Status; -import com.gitblit.models.TicketModel.Type; import com.gitblit.models.UserModel; -import com.gitblit.tickets.ITicketService; import com.gitblit.tickets.QueryBuilder; import com.gitblit.tickets.QueryResult; import com.gitblit.tickets.TicketIndexer.Lucene; -import com.gitblit.tickets.TicketLabel; import com.gitblit.utils.ArrayUtils; -import com.gitblit.utils.BugtraqProcessor; import com.gitblit.utils.StringUtils; -import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; -import com.gitblit.wicket.SessionlessForm; +import com.gitblit.wicket.TicketsUI; +import com.gitblit.wicket.TicketsUI.TicketSort; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.panels.GravatarImage; import com.gitblit.wicket.panels.LinkPanel; - +import com.gitblit.wicket.panels.TicketListPanel; +import com.gitblit.wicket.panels.TicketSearchForm; +import com.gitblit.wicket.panels.UserTitlePanel; + +/** + * My Tickets page + * + * @author Christian Buisson + * @author James Moger + */ public class MyTicketsPage extends RootPage { - public static final String [] openStatii = new String [] { Status.New.name().toLowerCase(), Status.Open.name().toLowerCase() }; - - public static final String [] closedStatii = new String [] { "!" + Status.New.name().toLowerCase(), "!" + Status.Open.name().toLowerCase() }; - - public MyTicketsPage() - { + public MyTicketsPage() { this(null); } - public MyTicketsPage(PageParameters params) - { + public MyTicketsPage(PageParameters params) { super(params); setupPage("", getString("gb.myTickets")); UserModel currentUser = GitBlitWebSession.get().getUser(); - if (currentUser == null) { + if (currentUser == null || UserModel.ANONYMOUS.equals(currentUser)) { setRedirect(true); setResponsePage(getApplication().getHomePage()); return; } final String username = currentUser.getName(); - final String[] statiiParam = (params == null) ? openStatii : params.getStringArray(Lucene.status.name()); + final String[] statiiParam = (params == null) ? TicketsUI.openStatii : params.getStringArray(Lucene.status.name()); final String assignedToParam = (params == null) ? "" : params.getString(Lucene.responsible.name(), null); final String milestoneParam = (params == null) ? "" : params.getString(Lucene.milestone.name(), null); final String queryParam = (params == null || StringUtils.isEmpty(params.getString("q", null))) ? "watchedby:" + username : params.getString("q", null); @@ -74,13 +76,11 @@ public class MyTicketsPage extends RootPage { final String sortBy = (params == null) ? "" : Lucene.fromString(params.getString("sort", Lucene.created.name())).name(); final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); - add(new GravatarImage("userGravatar", currentUser, "gravatar", 36, false)); - add(new Label("userDisplayName", currentUser.getDisplayName())); + // add the user title panel + add(new UserTitlePanel("userTitlePanel", currentUser, getString("gb.myTickets"))); // add search form - TicketSearchForm searchForm = new TicketSearchForm("ticketSearchForm", searchParam); - add(searchForm); - searchForm.setTranslatedAttributes(); + add(new TicketSearchForm("ticketSearchForm", null, searchParam, getClass(), params)); // standard queries add(new BookmarkablePageLink("changesQuery", MyTicketsPage.class, @@ -137,7 +137,7 @@ public class MyTicketsPage extends RootPage { queryParameters( null, milestoneParam, - openStatii, + TicketsUI.openStatii, null, null, true, @@ -188,8 +188,8 @@ public class MyTicketsPage extends RootPage { } else { add(new Label("selectedStatii", StringUtils.flattenStrings(Arrays.asList(statiiParam), ","))); } - add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, openStatii, assignedToParam, sortBy, desc, 1))); - add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, closedStatii, assignedToParam, sortBy, desc, 1))); + add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.openStatii, assignedToParam, sortBy, desc, 1))); + add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.closedStatii, assignedToParam, sortBy, desc, 1))); add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1))); // by status @@ -203,7 +203,7 @@ public class MyTicketsPage extends RootPage { public void populateItem(final Item item) { final Status status = item.getModelObject(); PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, 1); - String css = getStatusClass(status); + String css = TicketsUI.getStatusClass(status); item.add(new LinkPanel("statusLink", css, status.toString(), MyTicketsPage.class, p).setRenderBodyOnly(true)); } }; @@ -284,342 +284,18 @@ public class MyTicketsPage extends RootPage { int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); - ITicketService tickets = GitBlitWebApp.get().tickets(); List results; - if(StringUtils.isEmpty(searchParam)) - { - results = tickets.queryFor(luceneQuery, page, pageSize, sortBy, desc); - } - else - { - results = tickets.searchFor(null, searchParam, page, pageSize); + if(StringUtils.isEmpty(searchParam)) { + results = app().tickets().queryFor(luceneQuery, page, pageSize, sortBy, desc); + } else { + results = app().tickets().searchFor(null, searchParam, page, pageSize); } + int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true); - final ListDataProvider dp = new ListDataProvider(results); - - DataView dataView = new DataView("row", dp) { - private static final long serialVersionUID = 1L; - - @Override - protected void populateItem(Item item) { - final QueryResult ticket = item.getModelObject(); - final RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); - - if (showSwatch) { - // set repository color - String color = StringUtils.getColor(StringUtils.stripDotGit(repository.name)); - WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color)); - } - - PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository); - PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number); - item.add(new LinkPanel("repositoryLink", null, StringUtils.stripDotGit(ticket.repository), SummaryPage.class, rp)); - - item.add(getStateIcon("state", ticket.type, ticket.status)); - item.add(new Label("id", "" + ticket.number)); - UserModel creator = app().users().getUserModel(ticket.createdBy); - if (creator != null) { - item.add(new LinkPanel("createdBy", null, creator.getDisplayName(), - UserPage.class, WicketUtils.newUsernameParameter(ticket.createdBy))); - } else { - item.add(new Label("createdBy", ticket.createdBy)); - } - item.add(WicketUtils.createDateLabel("createDate", ticket.createdAt, GitBlitWebSession - .get().getTimezone(), getTimeUtils(), false)); - - if (ticket.updatedAt == null) { - item.add(new Label("updated").setVisible(false)); - } else { - Fragment updated = new Fragment("updated", "updatedFragment", this); - UserModel updater = app().users().getUserModel(ticket.updatedBy); - if (updater != null) { - updated.add(new LinkPanel("updatedBy", null, updater.getDisplayName(), - UserPage.class, WicketUtils.newUsernameParameter(ticket.updatedBy))); - } else { - updated.add(new Label("updatedBy", ticket.updatedBy)); - } - updated.add(WicketUtils.createDateLabel("updateDate", ticket.updatedAt, GitBlitWebSession - .get().getTimezone(), getTimeUtils(), false)); - item.add(updated); - } - - item.add(new LinkPanel("title", "list subject", StringUtils.trimString( - ticket.title, Constants.LEN_SHORTLOG), TicketsPage.class, tp)); - - ListDataProvider labelsProvider = new ListDataProvider(ticket.getLabels()); - DataView labelsView = new DataView("labels", labelsProvider) { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final Item labelItem) { - BugtraqProcessor btp = new BugtraqProcessor(app().settings()); - Repository db = app().repositories().getRepository(repository.name); - String content = btp.processPlainCommitMessage(db, repository.name, labelItem.getModelObject()); - db.close(); - Label label = new Label("label", content); - label.setEscapeModelStrings(false); - TicketLabel tLabel = app().tickets().getLabel(repository, labelItem.getModelObject()); - String background = MessageFormat.format("background-color:{0};", tLabel.color); - label.add(new SimpleAttributeModifier("style", background)); - labelItem.add(label); - } - }; - item.add(labelsView); - - if (StringUtils.isEmpty(ticket.responsible)) { - item.add(new Label("responsible").setVisible(false)); - } else { - UserModel responsible = app().users().getUserModel(ticket.responsible); - if (responsible == null) { - responsible = new UserModel(ticket.responsible); - } - GravatarImage avatar = new GravatarImage("responsible", responsible.getDisplayName(), - responsible.emailAddress, null, 16, true); - avatar.setTooltip(getString("gb.responsible") + ": " + responsible.getDisplayName()); - item.add(avatar); - } - - // votes indicator - Label v = new Label("votes", "" + ticket.votesCount); - WicketUtils.setHtmlTooltip(v, getString("gb.votes")); - item.add(v.setVisible(ticket.votesCount > 0)); - - // watching indicator - item.add(new Label("watching").setVisible(ticket.isWatching(GitBlitWebSession.get().getUsername()))); - - // status indicator - String css = getLozengeClass(ticket.status, true); - Label l = new Label("status", ticket.status.toString()); - WicketUtils.setCssClass(l, css); - item.add(l); - - // add the ticket indicators/icons - List indicators = new ArrayList(); - - // comments - if (ticket.commentsCount > 0) { - int count = ticket.commentsCount; - String pattern = "gb.nComments"; - if (count == 1) { - pattern = "gb.oneComment"; - } - indicators.add(new Indicator("fa fa-comment", count, pattern)); - } - - // participants - if (!ArrayUtils.isEmpty(ticket.participants)) { - int count = ticket.participants.size(); - if (count > 1) { - String pattern = "gb.nParticipants"; - indicators.add(new Indicator("fa fa-user", count, pattern)); - } - } - - // attachments - if (!ArrayUtils.isEmpty(ticket.attachments)) { - int count = ticket.attachments.size(); - String pattern = "gb.nAttachments"; - if (count == 1) { - pattern = "gb.oneAttachment"; - } - indicators.add(new Indicator("fa fa-file", count, pattern)); - } - - // patchset revisions - if (ticket.patchset != null) { - int count = ticket.patchset.commits; - String pattern = "gb.nCommits"; - if (count == 1) { - pattern = "gb.oneCommit"; - } - indicators.add(new Indicator("fa fa-code", count, pattern)); - } - - // milestone - if (!StringUtils.isEmpty(ticket.milestone)) { - indicators.add(new Indicator("fa fa-bullseye", ticket.milestone)); - } - - ListDataProvider indicatorsDp = new ListDataProvider(indicators); - DataView indicatorsView = new DataView("indicators", indicatorsDp) { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final Item item) { - Indicator indicator = item.getModelObject(); - String tooltip = indicator.getTooltip(); - - Label icon = new Label("icon"); - WicketUtils.setCssClass(icon, indicator.css); - item.add(icon); - - if (indicator.count > 0) { - Label count = new Label("count", "" + indicator.count); - item.add(count.setVisible(!StringUtils.isEmpty(tooltip))); - } else { - item.add(new Label("count").setVisible(false)); - } - - WicketUtils.setHtmlTooltip(item, tooltip); - } - }; - item.add(indicatorsView); - } - }; - - add(dataView); - } - - protected Label getStateIcon(String wicketId, TicketModel ticket) { - return getStateIcon(wicketId, ticket.type, ticket.status); - } - - protected Label getStateIcon(String wicketId, Type type, Status state) { - Label label = new Label(wicketId); - if (type == null) { - type = Type.defaultType; - } - switch (type) { - case Proposal: - WicketUtils.setCssClass(label, "fa fa-code-fork"); - break; - case Bug: - WicketUtils.setCssClass(label, "fa fa-bug"); - break; - case Enhancement: - WicketUtils.setCssClass(label, "fa fa-magic"); - break; - case Question: - WicketUtils.setCssClass(label, "fa fa-question"); - break; - default: - // standard ticket - WicketUtils.setCssClass(label, "fa fa-ticket"); - } - WicketUtils.setHtmlTooltip(label, getTypeState(type, state)); - return label; - } - - protected String getTypeState(Type type, Status state) { - return state.toString() + " " + type.toString(); - } - - protected String getLozengeClass(Status status, boolean subtle) { - if (status == null) { - status = Status.New; - } - String css = ""; - switch (status) { - case Declined: - case Duplicate: - case Invalid: - case Wontfix: - case Abandoned: - css = "aui-lozenge-error"; - break; - case Fixed: - case Merged: - case Resolved: - css = "aui-lozenge-success"; - break; - case New: - css = "aui-lozenge-complete"; - break; - case On_Hold: - css = "aui-lozenge-current"; - break; - default: - css = ""; - break; - } - - return "aui-lozenge" + (subtle ? " aui-lozenge-subtle": "") + (css.isEmpty() ? "" : " ") + css; - } - - protected String getStatusClass(Status status) { - String css = ""; - switch (status) { - case Declined: - case Duplicate: - case Invalid: - case Wontfix: - case Abandoned: - css = "resolution-error"; - break; - case Fixed: - case Merged: - case Resolved: - css = "resolution-success"; - break; - case New: - css = "resolution-complete"; - break; - case On_Hold: - css = "resolution-current"; - break; - default: - css = ""; - break; - } - - return "resolution" + (css.isEmpty() ? "" : " ") + css; - } - - private class TicketSort implements Serializable { - - private static final long serialVersionUID = 1L; - - final String name; - final String sortBy; - final boolean desc; - - TicketSort(String name, String sortBy, boolean desc) { - this.name = name; - this.sortBy = sortBy; - this.desc = desc; - } - } - - private class TicketSearchForm extends SessionlessForm implements Serializable { - private static final long serialVersionUID = 1L; - - private final IModel searchBoxModel;; - - public TicketSearchForm(String id, String text) { - super(id, MyTicketsPage.this.getClass(), MyTicketsPage.this.getPageParameters()); - - this.searchBoxModel = new Model(text == null ? "" : text); - - TextField searchBox = new TextField("ticketSearchBox", searchBoxModel); - add(searchBox); - } - - void setTranslatedAttributes() { - WicketUtils.setHtmlTooltip(get("ticketSearchBox"), - MessageFormat.format(getString("gb.searchTicketsTooltip"), "")); - WicketUtils.setInputPlaceholder(get("ticketSearchBox"), getString("gb.searchTickets")); - } - - @Override - public void onSubmit() { - String searchString = searchBoxModel.getObject(); - if (StringUtils.isEmpty(searchString)) { - // redirect to self to avoid wicket page update bug - String absoluteUrl = getCanonicalUrl(); - getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); - return; - } - - // use an absolute url to workaround Wicket-Tomcat problems with - // mounted url parameters (issue-111) - PageParameters params = WicketUtils.newRepositoryParameter(""); - params.add("s", searchString); - String absoluteUrl = getCanonicalUrl(MyTicketsPage.class, params); - getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); - } + add(new TicketListPanel("ticketList", results, showSwatch, true)); } protected PageParameters queryParameters( @@ -713,29 +389,4 @@ public class MyTicketsPage extends RootPage { }; add(pagesView); } - - private class Indicator implements Serializable { - - private static final long serialVersionUID = 1L; - - final String css; - final int count; - final String tooltip; - - Indicator(String css, String tooltip) { - this.css = css; - this.tooltip = tooltip; - this.count = 0; - } - - Indicator(String css, int count, String pattern) { - this.css = css; - this.count = count; - this.tooltip = StringUtils.isEmpty(pattern) ? "" : MessageFormat.format(getString(pattern), count); - } - - String getTooltip() { - return tooltip; - } - } } diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html index cb4f1b67..22544bc8 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html @@ -17,7 +17,7 @@
      +
      diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java index 2b97bc16..5ea99fd8 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java @@ -69,6 +69,7 @@ import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.PageRegistration; import com.gitblit.wicket.PageRegistration.OtherPageLink; import com.gitblit.wicket.SessionlessForm; +import com.gitblit.wicket.TicketsUI; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.NavigationPanel; @@ -204,7 +205,7 @@ public abstract class RepositoryPage extends RootPage { pages.put("tree", new PageRegistration("gb.tree", TreePage.class, params)); if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(getRepositoryModel()) || app().tickets().hasTickets(getRepositoryModel()))) { PageParameters tParams = new PageParameters(params); - for (String state : TicketsPage.openStatii) { + for (String state : TicketsUI.openStatii) { tParams.add(Lucene.status.name(), state); } pages.put("tickets", new PageRegistration("gb.tickets", TicketsPage.class, tParams)); diff --git a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java b/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java deleted file mode 100644 index 60fa6381..00000000 --- a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2013 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 org.apache.wicket.PageParameters; -import org.apache.wicket.markup.html.basic.Label; - -import com.gitblit.models.TicketModel; -import com.gitblit.models.TicketModel.Status; -import com.gitblit.models.TicketModel.Type; -import com.gitblit.wicket.WicketUtils; - -public abstract class TicketBasePage extends RepositoryPage { - - public TicketBasePage(PageParameters params) { - super(params); - } - - protected Label getStateIcon(String wicketId, TicketModel ticket) { - return getStateIcon(wicketId, ticket.type, ticket.status); - } - - protected Label getStateIcon(String wicketId, Type type, Status state) { - Label label = new Label(wicketId); - if (type == null) { - type = Type.defaultType; - } - switch (type) { - case Proposal: - WicketUtils.setCssClass(label, "fa fa-code-fork"); - break; - case Bug: - WicketUtils.setCssClass(label, "fa fa-bug"); - break; - case Enhancement: - WicketUtils.setCssClass(label, "fa fa-magic"); - break; - case Question: - WicketUtils.setCssClass(label, "fa fa-question"); - break; - default: - // standard ticket - WicketUtils.setCssClass(label, "fa fa-ticket"); - } - WicketUtils.setHtmlTooltip(label, getTypeState(type, state)); - return label; - } - - protected String getTypeState(Type type, Status state) { - return state.toString() + " " + type.toString(); - } - - protected String getLozengeClass(Status status, boolean subtle) { - if (status == null) { - status = Status.New; - } - String css = ""; - switch (status) { - case Declined: - case Duplicate: - case Invalid: - case Wontfix: - case Abandoned: - css = "aui-lozenge-error"; - break; - case Fixed: - case Merged: - case Resolved: - css = "aui-lozenge-success"; - break; - case New: - css = "aui-lozenge-complete"; - break; - case On_Hold: - css = "aui-lozenge-current"; - break; - default: - css = ""; - break; - } - - return "aui-lozenge" + (subtle ? " aui-lozenge-subtle": "") + (css.isEmpty() ? "" : " ") + css; - } - - protected String getStatusClass(Status status) { - String css = ""; - switch (status) { - case Declined: - case Duplicate: - case Invalid: - case Wontfix: - case Abandoned: - css = "resolution-error"; - break; - case Fixed: - case Merged: - case Resolved: - css = "resolution-success"; - break; - case New: - css = "resolution-complete"; - break; - case On_Hold: - css = "resolution-current"; - break; - default: - css = ""; - break; - } - - return "resolution" + (css.isEmpty() ? "" : " ") + css; - } -} diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java index 659acad0..c066f24d 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java @@ -86,6 +86,7 @@ import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; import com.gitblit.utils.TimeUtils; import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.TicketsUI; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.BasePanel.JavascriptTextPrompt; import com.gitblit.wicket.panels.CommentPanel; @@ -102,7 +103,7 @@ import com.gitblit.wicket.panels.SimpleAjaxLink; * @author James Moger * */ -public class TicketPage extends TicketBasePage { +public class TicketPage extends RepositoryPage { static final String NIL = ""; @@ -154,7 +155,7 @@ public class TicketPage extends TicketBasePage { String href = urlFor(TicketsPage.class, params).toString(); add(new ExternalLink("ticketNumber", href, "#" + ticket.number)); Label headerStatus = new Label("headerStatus", ticket.status.toString()); - WicketUtils.setCssClass(headerStatus, getLozengeClass(ticket.status, false)); + WicketUtils.setCssClass(headerStatus, TicketsUI.getLozengeClass(ticket.status, false)); add(headerStatus); add(new Label("ticketTitle", ticket.title)); if (currentPatchset == null) { @@ -317,10 +318,10 @@ public class TicketPage extends TicketBasePage { * LARGE STATUS INDICATOR WITH ICON (DISCUSSION TAB->SIDE BAR) */ Fragment ticketStatus = new Fragment("ticketStatus", "ticketStatusFragment", this); - Label ticketIcon = getStateIcon("ticketIcon", ticket); + Label ticketIcon = TicketsUI.getStateIcon("ticketIcon", ticket); ticketStatus.add(ticketIcon); ticketStatus.add(new Label("ticketStatus", ticket.status.toString())); - WicketUtils.setCssClass(ticketStatus, getLozengeClass(ticket.status, false)); + WicketUtils.setCssClass(ticketStatus, TicketsUI.getLozengeClass(ticket.status, false)); add(ticketStatus); @@ -370,7 +371,7 @@ public class TicketPage extends TicketBasePage { setResponsePage(TicketsPage.class, getPageParameters()); } }; - String css = getStatusClass(item.getModel().getObject()); + String css = TicketsUI.getStatusClass(item.getModel().getObject()); WicketUtils.setCssClass(link, css); item.add(link); } @@ -665,7 +666,7 @@ public class TicketPage extends TicketBasePage { */ Fragment frag = new Fragment("entry", "statusFragment", this); Label status = new Label("statusChange", entry.getStatus().toString()); - String css = getLozengeClass(entry.getStatus(), false); + String css = TicketsUI.getLozengeClass(entry.getStatus(), false); WicketUtils.setCssClass(status, css); for (IBehavior b : status.getBehaviors()) { if (b instanceof SimpleAttributeModifier) { @@ -936,7 +937,7 @@ public class TicketPage extends TicketBasePage { case status: // special handling for status Status status = event.getStatus(); - String css = getLozengeClass(status, true); + String css = TicketsUI.getLozengeClass(status, true); value = String.format("%2$s", css, status.toString()); break; default: @@ -1525,14 +1526,14 @@ public class TicketPage extends TicketBasePage { switch (type) { case Rebase: case Rebase_Squash: - typeCss = getLozengeClass(Status.Declined, false); + typeCss = TicketsUI.getLozengeClass(Status.Declined, false); break; case Squash: case Amend: - typeCss = getLozengeClass(Status.On_Hold, false); + typeCss = TicketsUI.getLozengeClass(Status.On_Hold, false); break; case Proposal: - typeCss = getLozengeClass(Status.New, false); + typeCss = TicketsUI.getLozengeClass(Status.New, false); break; case FastForward: default: diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html index a40d3126..40060f36 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html @@ -11,7 +11,7 @@
      - +
      @@ -88,42 +88,7 @@
      - - - - - - - - - - - - -
      - - - [title] -
      - - - [createdBy] [create date] - - -
      -
      -       		- - - - -
      -       		-
      - #[id] -
      -
      -
      +
      -
      +
      diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java index d88ccb6b..dfa7b021 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java @@ -576,7 +576,7 @@ public class TicketsPage extends RepositoryPage { Fragment milestonePanel = new Fragment("milestonePanel", "openMilestoneFragment", this); Label label = new Label("progress"); - WicketUtils.setCssStyle(label, "width:" + tm.getProgress() + "%;"); + WicketUtils.setCssStyle(label, "width:" + m.getProgress() + "%;"); milestonePanel.add(label); milestonePanel.add(new LinkPanel("openTickets", null, -- cgit v1.2.3 From 4d81c92b668bce79d7db7bc278f0d399fe693e65 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 28 Apr 2014 14:56:15 -0400 Subject: Implementation of a ticket mgration tool --- src/main/distrib/linux/migrate-tickets.sh | 21 ++ src/main/distrib/linux/reindex-tickets.sh | 2 +- src/main/distrib/win/migrate-tickets.cmd | 21 ++ src/main/java/com/gitblit/MigrateTickets.java | 256 +++++++++++++++++++++ .../com/gitblit/tickets/BranchTicketService.java | 67 +++++- .../com/gitblit/tickets/FileTicketService.java | 68 ++++-- .../java/com/gitblit/tickets/ITicketService.java | 44 +++- .../com/gitblit/tickets/NullTicketService.java | 11 + .../com/gitblit/tickets/RedisTicketService.java | 70 +++++- src/site/tickets_replication.mkd | 24 ++ .../java/com/gitblit/tests/TicketServiceTest.java | 5 +- 11 files changed, 559 insertions(+), 30 deletions(-) create mode 100644 src/main/distrib/linux/migrate-tickets.sh create mode 100644 src/main/distrib/win/migrate-tickets.cmd create mode 100644 src/main/java/com/gitblit/MigrateTickets.java (limited to 'src/main/java') diff --git a/src/main/distrib/linux/migrate-tickets.sh b/src/main/distrib/linux/migrate-tickets.sh new file mode 100644 index 00000000..f521528e --- /dev/null +++ b/src/main/distrib/linux/migrate-tickets.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# -------------------------------------------------------------------------- +# This is for migrating Tickets from one service to another. +# +# usage: +# +# migrate-tickets.sh +# +# -------------------------------------------------------------------------- + +if [[ -z $1 || -z $2 ]]; then + echo "Please specify the output ticket service and your baseFolder!"; + echo ""; + echo "usage:"; + echo " migrate-tickets "; + echo ""; + exit 1; +fi + +java -cp gitblit.jar:./ext/* com.gitblit.MigrateTickets $1 --baseFolder $2 + diff --git a/src/main/distrib/linux/reindex-tickets.sh b/src/main/distrib/linux/reindex-tickets.sh index 5a4fc34f..8261b819 100644 --- a/src/main/distrib/linux/reindex-tickets.sh +++ b/src/main/distrib/linux/reindex-tickets.sh @@ -11,7 +11,7 @@ # # -------------------------------------------------------------------------- -if [ -z $1 ]; then +if [[ -z $1 ]]; then echo "Please specify your baseFolder!"; echo ""; echo "usage:"; diff --git a/src/main/distrib/win/migrate-tickets.cmd b/src/main/distrib/win/migrate-tickets.cmd new file mode 100644 index 00000000..5a26c8ed --- /dev/null +++ b/src/main/distrib/win/migrate-tickets.cmd @@ -0,0 +1,21 @@ +@REM -------------------------------------------------------------------------- +@REM This is for migrating Tickets from one service to another. +@REM +@REM usage: +@REM migrate-tickets +@REM +@REM -------------------------------------------------------------------------- +@if [%1]==[] goto help + +@if [%2]==[] goto help + +@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.MigrateTickets %1 --baseFolder %2 +@goto end + +:help +@echo "Please specify the output ticket service and your baseFolder!" +@echo +@echo " migrate-tickets com.gitblit.tickets.RedisTicketService c:/gitblit-data" +@echo + +:end \ No newline at end of file diff --git a/src/main/java/com/gitblit/MigrateTickets.java b/src/main/java/com/gitblit/MigrateTickets.java new file mode 100644 index 00000000..b6d72376 --- /dev/null +++ b/src/main/java/com/gitblit/MigrateTickets.java @@ -0,0 +1,256 @@ +/* + * Copyright 2014 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; + +import java.io.File; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.CmdLineException; +import org.kohsuke.args4j.CmdLineParser; +import org.kohsuke.args4j.Option; + +import com.gitblit.manager.IRepositoryManager; +import com.gitblit.manager.IRuntimeManager; +import com.gitblit.manager.RepositoryManager; +import com.gitblit.manager.RuntimeManager; +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.TicketModel; +import com.gitblit.models.TicketModel.Change; +import com.gitblit.tickets.BranchTicketService; +import com.gitblit.tickets.FileTicketService; +import com.gitblit.tickets.ITicketService; +import com.gitblit.tickets.RedisTicketService; +import com.gitblit.utils.StringUtils; + +/** + * A command-line tool to move all tickets from one ticket service to another. + * + * @author James Moger + * + */ +public class MigrateTickets { + + public static void main(String... args) { + MigrateTickets migrate = new MigrateTickets(); + + // filter out the baseFolder parameter + List filtered = new ArrayList(); + String folder = "data"; + for (int i = 0; i < args.length; i++) { + String arg = args[i]; + if (arg.equals("--baseFolder")) { + if (i + 1 == args.length) { + System.out.println("Invalid --baseFolder parameter!"); + System.exit(-1); + } else if (!".".equals(args[i + 1])) { + folder = args[i + 1]; + } + i = i + 1; + } else { + filtered.add(arg); + } + } + + Params.baseFolder = folder; + Params params = new Params(); + CmdLineParser parser = new CmdLineParser(params); + try { + parser.parseArgument(filtered); + if (params.help) { + migrate.usage(parser, null); + return; + } + } catch (CmdLineException t) { + migrate.usage(parser, t); + return; + } + + // load the settings + FileSettings settings = params.FILESETTINGS; + if (!StringUtils.isEmpty(params.settingsfile)) { + if (new File(params.settingsfile).exists()) { + settings = new FileSettings(params.settingsfile); + } + } + + // migrate tickets + migrate.migrate(new File(Params.baseFolder), settings, params.outputServiceName); + System.exit(0); + } + + /** + * Display the command line usage of MigrateTickets. + * + * @param parser + * @param t + */ + protected final void usage(CmdLineParser parser, CmdLineException t) { + System.out.println(Constants.BORDER); + System.out.println(Constants.getGitBlitVersion()); + System.out.println(Constants.BORDER); + System.out.println(); + if (t != null) { + System.out.println(t.getMessage()); + System.out.println(); + } + if (parser != null) { + parser.printUsage(System.out); + System.out + .println("\nExample:\n java -gitblit.jar com.gitblit.MigrateTickets com.gitblit.tickets.RedisTicketService --baseFolder c:\\gitblit-data"); + } + System.exit(0); + } + + /** + * Migrate all tickets + * + * @param baseFolder + * @param settings + * @param outputServiceName + */ + protected void migrate(File baseFolder, IStoredSettings settings, String outputServiceName) { + // disable some services + settings.overrideSetting(Keys.web.allowLuceneIndexing, false); + settings.overrideSetting(Keys.git.enableGarbageCollection, false); + settings.overrideSetting(Keys.git.enableMirroring, false); + settings.overrideSetting(Keys.web.activityCacheDays, 0); + settings.overrideSetting(ITicketService.SETTING_UPDATE_DIFFSTATS, false); + + IRuntimeManager runtimeManager = new RuntimeManager(settings, baseFolder).start(); + IRepositoryManager repositoryManager = new RepositoryManager(runtimeManager, null).start(); + + String inputServiceName = settings.getString(Keys.tickets.service, BranchTicketService.class.getSimpleName()); + if (StringUtils.isEmpty(inputServiceName)) { + System.err.println(MessageFormat.format("Please define a ticket service in \"{0}\"", Keys.tickets.service)); + System.exit(1); + } + + ITicketService inputService = null; + ITicketService outputService = null; + try { + inputService = getService(inputServiceName, runtimeManager, repositoryManager); + outputService = getService(outputServiceName, runtimeManager, repositoryManager); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + + if (!inputService.isReady()) { + System.err.println(String.format("%s INPUT service is not ready, check config.", inputService.getClass().getSimpleName())); + System.exit(1); + } + + if (!outputService.isReady()) { + System.err.println(String.format("%s OUTPUT service is not ready, check config.", outputService.getClass().getSimpleName())); + System.exit(1); + } + + // migrate tickets + long start = System.nanoTime(); + long totalTickets = 0; + long totalChanges = 0; + for (RepositoryModel repository : repositoryManager.getRepositoryModels(null)) { + Set ids = inputService.getIds(repository); + if (ids == null || ids.isEmpty()) { + // nothing to migrate + continue; + } + + // delete any tickets we may have in the output ticket service + outputService.deleteAll(repository); + + for (long id : ids) { + List journal = inputService.getJournal(repository, id); + if (journal == null || journal.size() == 0) { + continue; + } + TicketModel ticket = outputService.createTicket(repository, id, journal.get(0)); + if (ticket == null) { + System.err.println(String.format("Failed to migrate %s #%s", repository.name, id)); + System.exit(1); + } + totalTickets++; + System.out.println(String.format("%s #%s: %s", repository.name, ticket.number, ticket.title)); + for (int i = 1; i < journal.size(); i++) { + TicketModel updated = outputService.updateTicket(repository, ticket.number, journal.get(i)); + if (updated != null) { + System.out.println(String.format(" applied change %d", i)); + totalChanges++; + } else { + System.err.println(String.format("Failed to apply change %d:\n%s", i, journal.get(i))); + System.exit(1); + } + } + } + } + + inputService.stop(); + outputService.stop(); + + repositoryManager.stop(); + runtimeManager.stop(); + + long end = System.nanoTime(); + + System.out.println(String.format("Migrated %d tickets composed of %d journal entries in %d seconds", + totalTickets, totalTickets + totalChanges, TimeUnit.NANOSECONDS.toSeconds(end - start))); + } + + protected ITicketService getService(String serviceName, IRuntimeManager runtimeManager, IRepositoryManager repositoryManager) throws Exception { + ITicketService service = null; + Class serviceClass = Class.forName(serviceName); + if (RedisTicketService.class.isAssignableFrom(serviceClass)) { + // Redis ticket service + service = new RedisTicketService(runtimeManager, null, null, null, repositoryManager).start(); + } else if (BranchTicketService.class.isAssignableFrom(serviceClass)) { + // Branch ticket service + service = new BranchTicketService(runtimeManager, null, null, null, repositoryManager).start(); + } else if (FileTicketService.class.isAssignableFrom(serviceClass)) { + // File ticket service + service = new FileTicketService(runtimeManager, null, null, null, repositoryManager).start(); + } else { + System.err.println("Unknown ticket service " + serviceName); + } + return service; + } + + /** + * Parameters. + */ + public static class Params { + + public static String baseFolder; + + @Option(name = "--help", aliases = { "-h"}, usage = "Show this help") + public Boolean help = false; + + private final FileSettings FILESETTINGS = new FileSettings(new File(baseFolder, Constants.PROPERTIES_FILE).getAbsolutePath()); + + @Option(name = "--repositoriesFolder", usage = "Git Repositories Folder", metaVar = "PATH") + public String repositoriesFolder = FILESETTINGS.getString(Keys.git.repositoriesFolder, "git"); + + @Option(name = "--settings", usage = "Path to alternative settings", metaVar = "FILE") + public String settingsfile; + + @Argument(index = 0, required = true, metaVar = "OUTPUTSERVICE", usage = "The destination/output ticket service") + public String outputServiceName; + } +} diff --git a/src/main/java/com/gitblit/tickets/BranchTicketService.java b/src/main/java/com/gitblit/tickets/BranchTicketService.java index 284b1be1..8c000550 100644 --- a/src/main/java/com/gitblit/tickets/BranchTicketService.java +++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java @@ -377,6 +377,37 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi return hasTicket; } + /** + * Returns the assigned ticket ids. + * + * @return the assigned ticket ids + */ + @Override + public synchronized Set getIds(RepositoryModel repository) { + Repository db = repositoryManager.getRepository(repository.name); + try { + if (getTicketsBranch(db) == null) { + return Collections.emptySet(); + } + Set ids = new TreeSet(); + List paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH); + for (PathModel path : paths) { + String name = path.name.substring(path.name.lastIndexOf('/') + 1); + if (!JOURNAL.equals(name)) { + continue; + } + String tid = path.path.split("/")[2]; + long ticketId = Long.parseLong(tid); + ids.add(ticketId); + } + return ids; + } finally { + if (db != null) { + db.close(); + } + } + } + /** * Assigns a new ticket id. * @@ -398,16 +429,10 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi } AtomicLong lastId = lastAssignedId.get(repository.name); if (lastId.get() <= 0) { - List paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH); - for (PathModel path : paths) { - String name = path.name.substring(path.name.lastIndexOf('/') + 1); - if (!JOURNAL.equals(name)) { - continue; - } - String tid = path.path.split("/")[2]; - long ticketId = Long.parseLong(tid); - if (ticketId > lastId.get()) { - lastId.set(ticketId); + Set ids = getIds(repository); + for (long id : ids) { + if (id > lastId.get()) { + lastId.set(id); } } } @@ -525,6 +550,28 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi } } + /** + * Retrieves the journal for the ticket. + * + * @param repository + * @param ticketId + * @return a journal, if it exists, otherwise null + */ + @Override + protected List getJournalImpl(RepositoryModel repository, long ticketId) { + Repository db = repositoryManager.getRepository(repository.name); + try { + List changes = getJournal(db, ticketId); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", repository, ticketId); + return null; + } + return changes; + } finally { + db.close(); + } + } + /** * Returns the journal for the specified ticket. * diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index 4386020f..b3d8838e 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; @@ -146,6 +148,31 @@ public class FileTicketService extends ITicketService { return hasTicket; } + @Override + public synchronized Set getIds(RepositoryModel repository) { + Set ids = new TreeSet(); + Repository db = repositoryManager.getRepository(repository.name); + try { + // identify current highest ticket id by scanning the paths in the tip tree + File dir = new File(db.getDirectory(), TICKETS_PATH); + dir.mkdirs(); + List journals = findAll(dir, JOURNAL); + for (File journal : journals) { + // Reconstruct ticketId from the path + // id/26/326/journal.json + String path = FileUtils.getRelativePath(dir, journal); + String tid = path.split("/")[1]; + long ticketId = Long.parseLong(tid); + ids.add(ticketId); + } + } finally { + if (db != null) { + db.close(); + } + } + return ids; + } + /** * Assigns a new ticket id. * @@ -162,18 +189,10 @@ public class FileTicketService extends ITicketService { } AtomicLong lastId = lastAssignedId.get(repository.name); if (lastId.get() <= 0) { - // identify current highest ticket id by scanning the paths in the tip tree - File dir = new File(db.getDirectory(), TICKETS_PATH); - dir.mkdirs(); - List journals = findAll(dir, JOURNAL); - for (File journal : journals) { - // Reconstruct ticketId from the path - // id/26/326/journal.json - String path = FileUtils.getRelativePath(dir, journal); - String tid = path.split("/")[1]; - long ticketId = Long.parseLong(tid); - if (ticketId > lastId.get()) { - lastId.set(ticketId); + Set ids = getIds(repository); + for (long id : ids) { + if (id > lastId.get()) { + lastId.set(id); } } } @@ -284,8 +303,7 @@ public class FileTicketService extends ITicketService { } /** - * Retrieves the ticket from the repository by first looking-up the changeId - * associated with the ticketId. + * Retrieves the ticket from the repository. * * @param repository * @param ticketId @@ -312,6 +330,28 @@ public class FileTicketService extends ITicketService { } } + /** + * Retrieves the journal for the ticket. + * + * @param repository + * @param ticketId + * @return a journal, if it exists, otherwise null + */ + @Override + protected List getJournalImpl(RepositoryModel repository, long ticketId) { + Repository db = repositoryManager.getRepository(repository.name); + try { + List changes = getJournal(db, ticketId); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", repository, ticketId); + return null; + } + return changes; + } finally { + db.close(); + } + } + /** * Returns the journal for the specified ticket. * diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java index 3261ca96..a6a7a75a 100644 --- a/src/main/java/com/gitblit/tickets/ITicketService.java +++ b/src/main/java/com/gitblit/tickets/ITicketService.java @@ -65,6 +65,8 @@ import com.google.common.cache.CacheBuilder; */ public abstract class ITicketService { + public static final String SETTING_UPDATE_DIFFSTATS = "migration.updateDiffstats"; + private static final String LABEL = "label"; private static final String MILESTONE = "milestone"; @@ -107,6 +109,8 @@ public abstract class ITicketService { private final Map> milestonesCache; + private final boolean updateDiffstats; + private static class TicketKey { final String repository; final long ticketId; @@ -164,6 +168,8 @@ public abstract class ITicketService { this.labelsCache = new ConcurrentHashMap>(); this.milestonesCache = new ConcurrentHashMap>(); + + this.updateDiffstats = settings.getBoolean(SETTING_UPDATE_DIFFSTATS, true); } /** @@ -761,6 +767,15 @@ public abstract class ITicketService { return false; } + /** + * Returns the set of assigned ticket ids in the repository. + * + * @param repository + * @return a set of assigned ticket ids in the repository + * @since 1.6.0 + */ + public abstract Set getIds(RepositoryModel repository); + /** * Assigns a new ticket id. * @@ -823,7 +838,7 @@ public abstract class ITicketService { ticket = getTicketImpl(repository, ticketId); // if ticket exists if (ticket != null) { - if (ticket.hasPatchsets()) { + if (ticket.hasPatchsets() && updateDiffstats) { Repository r = repositoryManager.getRepository(repository.name); try { Patchset patchset = ticket.getCurrentPatchset(); @@ -856,6 +871,33 @@ public abstract class ITicketService { */ protected abstract TicketModel getTicketImpl(RepositoryModel repository, long ticketId); + + /** + * Returns the journal used to build a ticket. + * + * @param repository + * @param ticketId + * @return the journal for the ticket, if it exists, otherwise null + * @since 1.6.0 + */ + public final List getJournal(RepositoryModel repository, long ticketId) { + if (hasTicket(repository, ticketId)) { + List journal = getJournalImpl(repository, ticketId); + return journal; + } + return null; + } + + /** + * Retrieves the ticket journal. + * + * @param repository + * @param ticketId + * @return a ticket, if it exists, otherwise null + * @since 1.6.0 + */ + protected abstract List getJournalImpl(RepositoryModel repository, long ticketId); + /** * Get the ticket url * diff --git a/src/main/java/com/gitblit/tickets/NullTicketService.java b/src/main/java/com/gitblit/tickets/NullTicketService.java index 749d8018..d410cdd0 100644 --- a/src/main/java/com/gitblit/tickets/NullTicketService.java +++ b/src/main/java/com/gitblit/tickets/NullTicketService.java @@ -17,6 +17,7 @@ package com.gitblit.tickets; import java.util.Collections; import java.util.List; +import java.util.Set; import com.gitblit.manager.INotificationManager; import com.gitblit.manager.IPluginManager; @@ -77,6 +78,11 @@ public class NullTicketService extends ITicketService { return false; } + @Override + public synchronized Set getIds(RepositoryModel repository) { + return Collections.emptySet(); + } + @Override public synchronized long assignNewId(RepositoryModel repository) { return 0L; @@ -92,6 +98,11 @@ public class NullTicketService extends ITicketService { return null; } + @Override + protected List getJournalImpl(RepositoryModel repository, long ticketId) { + return null; + } + @Override public boolean supportsAttachments() { return false; diff --git a/src/main/java/com/gitblit/tickets/RedisTicketService.java b/src/main/java/com/gitblit/tickets/RedisTicketService.java index 2c5b181f..d773b0bd 100644 --- a/src/main/java/com/gitblit/tickets/RedisTicketService.java +++ b/src/main/java/com/gitblit/tickets/RedisTicketService.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.TreeSet; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; @@ -184,6 +185,30 @@ public class RedisTicketService extends ITicketService { return false; } + @Override + public Set getIds(RepositoryModel repository) { + Set ids = new TreeSet(); + Jedis jedis = pool.getResource(); + try {// account for migrated tickets + Set keys = jedis.keys(key(repository, KeyType.journal, "*")); + for (String tkey : keys) { + // {repo}:journal:{id} + String id = tkey.split(":")[2]; + long ticketId = Long.parseLong(id); + ids.add(ticketId); + } + } catch (JedisException e) { + log.error("failed to assign new ticket id in Redis @ " + getUrl(), e); + pool.returnBrokenResource(jedis); + jedis = null; + } finally { + if (jedis != null) { + pool.returnResource(jedis); + } + } + return ids; + } + /** * Assigns a new ticket id. * @@ -197,7 +222,14 @@ public class RedisTicketService extends ITicketService { String key = key(repository, KeyType.counter, null); String val = jedis.get(key); if (isNull(val)) { - jedis.set(key, "0"); + long lastId = 0; + Set ids = getIds(repository); + for (long id : ids) { + if (id > lastId) { + lastId = id; + } + } + jedis.set(key, "" + lastId); } long ticketNumber = jedis.incr(key); return ticketNumber; @@ -273,8 +305,7 @@ public class RedisTicketService extends ITicketService { } /** - * Retrieves the ticket from the repository by first looking-up the changeId - * associated with the ticketId. + * Retrieves the ticket from the repository. * * @param repository * @param ticketId @@ -311,6 +342,39 @@ public class RedisTicketService extends ITicketService { return null; } + /** + * Retrieves the journal for the ticket. + * + * @param repository + * @param ticketId + * @return a journal, if it exists, otherwise null + */ + @Override + protected List getJournalImpl(RepositoryModel repository, long ticketId) { + Jedis jedis = pool.getResource(); + if (jedis == null) { + return null; + } + + try { + List changes = getJournal(jedis, repository, ticketId); + if (ArrayUtils.isEmpty(changes)) { + log.warn("Empty journal for {}:{}", repository, ticketId); + return null; + } + return changes; + } catch (JedisException e) { + log.error("failed to retrieve journal from Redis @ " + getUrl(), e); + pool.returnBrokenResource(jedis); + jedis = null; + } finally { + if (jedis != null) { + pool.returnResource(jedis); + } + } + return null; + } + /** * Returns the journal for the specified ticket. * diff --git a/src/site/tickets_replication.mkd b/src/site/tickets_replication.mkd index 472c7270..a72df27f 100644 --- a/src/site/tickets_replication.mkd +++ b/src/site/tickets_replication.mkd @@ -133,3 +133,27 @@ You can trigger a live reindex of tickets for any backend using Gitblit's RPC in curl --insecure --user admin:admin "https://localhost:8443/rpc?req=reindex_tickets" curl --insecure --user admin:admin "https://localhost:8443/rpc?req=reindex_tickets&name=gitblit.git" +#### Migrating Tickets between Ticket Services + +##### Gitblit GO + +Gitblit GO ships with a script that executes the *com.gitblit.MigrateTickets* tool included in the Gitblit jar file. This tool will migrate *all* tickets in *all* repositories **AND** must be run when Gitblit is offline. + + migrate-tickets + +For example, this would migrate tickets from the current ticket service configured in `c:\gitblit-data\gitblit.properties` to a Redis ticket service. The Redis service is configured in the same config file so you must be sure to properly setup all appropriate Redis settings. + + migrate-tickets com.gitblit.tickets.RedisTicketService c:\gitblit-data + +##### Gitblit WAR/Express + +Gitblit WAR/Express does not ship with anything other than the WAR, but you can still migrate tickets offline with a little extra effort. + +*Windows* + + java -cp "C:/path/to/WEB-INF/lib/*" com.gitblit.MigrateTickets --baseFolder + +*Linux/Unix/Mac OSX* + + java -cp /path/to/WEB-INF/lib/* com.gitblit.MigrateTickets --baseFolder + diff --git a/src/test/java/com/gitblit/tests/TicketServiceTest.java b/src/test/java/com/gitblit/tests/TicketServiceTest.java index d91ce533..1676e341 100644 --- a/src/test/java/com/gitblit/tests/TicketServiceTest.java +++ b/src/test/java/com/gitblit/tests/TicketServiceTest.java @@ -95,7 +95,7 @@ public abstract class TicketServiceTest extends GitblitUnitTest { // query non-existent ticket TicketModel nonExistent = service.getTicket(getRepository(), 0); assertNull(nonExistent); - + // create and insert a ticket Change c1 = newChange("testCreation() " + Long.toHexString(System.currentTimeMillis())); TicketModel ticket = service.createTicket(getRepository(), c1); @@ -205,6 +205,9 @@ public abstract class TicketServiceTest extends GitblitUnitTest { assertEquals(1, results.size()); assertTrue(results.get(0).title.startsWith("testUpdates")); + // check the ids + assertEquals("[1, 2]", service.getIds(getRepository()).toString()); + // delete all tickets for (TicketModel aTicket : allTickets) { assertTrue(service.deleteTicket(getRepository(), aTicket.number, "D")); -- cgit v1.2.3 From b41754563a8318ae8840574261c503bbf4e7e413 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 2 May 2014 16:09:55 -0400 Subject: Change My Tickets repository link to the repository tickets page --- src/main/java/com/gitblit/wicket/panels/TicketListPanel.html | 2 +- src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html index 6e6d2091..30f50367 100644 --- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html @@ -22,7 +22,7 @@
      -
      [repository link]
      +
      [tickets link]
      diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java index fc0431fb..395200c1 100644 --- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java @@ -32,6 +32,7 @@ import com.gitblit.Constants; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.tickets.QueryResult; +import com.gitblit.tickets.TicketIndexer.Lucene; import com.gitblit.tickets.TicketLabel; import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.BugtraqProcessor; @@ -40,7 +41,6 @@ import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.TicketsUI; import com.gitblit.wicket.TicketsUI.Indicator; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.pages.SummaryPage; import com.gitblit.wicket.pages.TicketsPage; import com.gitblit.wicket.pages.UserPage; @@ -73,16 +73,19 @@ public class TicketListPanel extends BasePanel { WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color)); } - PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository); PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number); if (showRepository) { String name = StringUtils.stripDotGit(ticket.repository); - LinkPanel link = new LinkPanel("repositoryLink", null, name, SummaryPage.class, rp); + PageParameters rp = new PageParameters(WicketUtils.newRepositoryParameter(ticket.repository)); + for (String state : TicketsUI.openStatii) { + rp.add(Lucene.status.name(), state); + } + LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp); WicketUtils.setCssBackground(link, name); item.add(link); } else { - item.add(new Label("repositoryLink").setVisible(false)); + item.add(new Label("ticketsLink").setVisible(false)); } item.add(TicketsUI.getStateIcon("state", ticket.type, ticket.status)); -- cgit v1.2.3 From ca31f51855b39a179bdad9bb912da6aeadad866d Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 23 Apr 2014 15:41:14 -0400 Subject: Split pages servlet into a raw branch servlet and a gh-pages servlet --- .classpath | 1 + build.moxie | 1 + gitblit.iml | 11 + releases.moxie | 4 +- src/main/java/WEB-INF/web.xml | 36 +- src/main/java/com/gitblit/Constants.java | 2 + .../java/com/gitblit/servlet/BranchFilter.java | 126 +++++++ .../java/com/gitblit/servlet/BranchServlet.java | 404 +++++++++++++++++++++ src/main/java/com/gitblit/servlet/PagesFilter.java | 99 +---- .../java/com/gitblit/servlet/PagesServlet.java | 298 +-------------- 10 files changed, 599 insertions(+), 383 deletions(-) create mode 100644 src/main/java/com/gitblit/servlet/BranchFilter.java create mode 100644 src/main/java/com/gitblit/servlet/BranchServlet.java (limited to 'src/main/java') diff --git a/.classpath b/.classpath index b2e98b1a..e577b7ca 100644 --- a/.classpath +++ b/.classpath @@ -76,6 +76,7 @@ + diff --git a/build.moxie b/build.moxie index 6d80c50f..5f560532 100644 --- a/build.moxie +++ b/build.moxie @@ -174,6 +174,7 @@ dependencies: - compile 'commons-codec:commons-codec:1.7' :war - compile 'redis.clients:jedis:2.3.1' :war - compile 'ro.fortsoft.pf4j:pf4j:0.8.0' :war +- compile 'org.apache.tika:tika-core:1.5' :war - test 'junit' # Dependencies for Selenium web page testing - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar diff --git a/gitblit.iml b/gitblit.iml index 582127d1..7e25249e 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -790,6 +790,17 @@ + + + + + + + + + + + diff --git a/releases.moxie b/releases.moxie index 48f430e2..62a71c6e 100644 --- a/releases.moxie +++ b/releases.moxie @@ -18,10 +18,12 @@ r23: { - Prevent submission from New|Edit ticket page with empty titles (ticket-53) changes: - improve French translation (pr-176) - - simplify current plugin release detection and ignore the currentRelease registry field + - simplify current plugin release detection and ignore the currentRelease registry field + - split pages servlet into two servlets (issue-413) additions: ~ dependencyChanges: - update to Apache MINA/SSHD 0.11.0 (issue-410) + - added Apache Tiki 1.5 (issue-413) contributors: - James Moger - Julien Kirch diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml index 77456d47..d60992dd 100644 --- a/src/main/java/WEB-INF/web.xml +++ b/src/main/java/WEB-INF/web.xml @@ -134,6 +134,21 @@ + + + BranchServlet + com.gitblit.servlet.BranchServlet + + + BranchServlet + /branch/* + + + + + BranchFilter + com.gitblit.servlet.BranchFilter + + + BranchFilter + /branch/* + + + + - r/,git/,pt,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/ + r/,git/,pt,feed/,zip/,federation/,rpc/,branch/,pages/,robots.txt,logo.png,graph/,sparkleshare/ diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index af533996..96f13c89 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -68,6 +68,8 @@ public class Constants { public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/"; + public static final String BRANCH = "/branch/"; + public static final String BRANCH_GRAPH_PATH = "/graph/"; public static final String BORDER = "*****************************************************************"; diff --git a/src/main/java/com/gitblit/servlet/BranchFilter.java b/src/main/java/com/gitblit/servlet/BranchFilter.java new file mode 100644 index 00000000..58b8f433 --- /dev/null +++ b/src/main/java/com/gitblit/servlet/BranchFilter.java @@ -0,0 +1,126 @@ +/* + * Copyright 2012 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.servlet; + +import org.eclipse.jgit.lib.Repository; + +import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.UserModel; + +/** + * The BranchFilter is an AccessRestrictionFilter which ensures http branch + * requests for a view-restricted repository are authenticated and authorized. + * + * @author James Moger + * + */ +public class BranchFilter extends AccessRestrictionFilter { + + /** + * Extract the repository name from the url. + * + * @param url + * @return repository name + */ + @Override + protected String extractRepositoryName(String url) { + // get the repository name from the url by finding a known url suffix + String repository = ""; + Repository r = null; + int offset = 0; + while (r == null) { + int slash = url.indexOf('/', offset); + if (slash == -1) { + repository = url; + } else { + repository = url.substring(0, slash); + } + r = repositoryManager.getRepository(repository, false); + if (r == null) { + // try again + offset = slash + 1; + } else { + // close the repo + r.close(); + } + if (repository.equals(url)) { + // either only repository in url or no repository found + break; + } + } + return repository; + } + + /** + * Analyze the url and returns the action of the request. + * + * @param cloneUrl + * @return action of the request + */ + @Override + protected String getUrlRequestAction(String suffix) { + return "VIEW"; + } + + /** + * Determine if a non-existing repository can be created using this filter. + * + * @return true if the filter allows repository creation + */ + @Override + protected boolean isCreationAllowed() { + return false; + } + + /** + * Determine if the action may be executed on the repository. + * + * @param repository + * @param action + * @return true if the action may be performed + */ + @Override + protected boolean isActionAllowed(RepositoryModel repository, String action) { + return true; + } + + /** + * Determine if the repository requires authentication. + * + * @param repository + * @param action + * @return true if authentication required + */ + @Override + protected boolean requiresAuthentication(RepositoryModel repository, String action) { + return repository.accessRestriction.atLeast(AccessRestrictionType.VIEW); + } + + /** + * Determine if the user can access the repository and perform the specified + * action. + * + * @param repository + * @param user + * @param action + * @return true if user may execute the action on the repository + */ + @Override + protected boolean canAccess(RepositoryModel repository, UserModel user, String action) { + return user.canView(repository); + } +} diff --git a/src/main/java/com/gitblit/servlet/BranchServlet.java b/src/main/java/com/gitblit/servlet/BranchServlet.java new file mode 100644 index 00000000..d6fbfe5b --- /dev/null +++ b/src/main/java/com/gitblit/servlet/BranchServlet.java @@ -0,0 +1,404 @@ +/* + * Copyright 2014 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.servlet; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.text.MessageFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.tika.Tika; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.gitblit.Constants; +import com.gitblit.dagger.DaggerServlet; +import com.gitblit.manager.IRepositoryManager; +import com.gitblit.models.PathModel; +import com.gitblit.utils.ByteFormat; +import com.gitblit.utils.JGitUtils; +import com.gitblit.utils.MarkdownUtils; +import com.gitblit.utils.StringUtils; + +import dagger.ObjectGraph; + +/** + * Serves the content of a branch. + * + * @author James Moger + * + */ +public class BranchServlet extends DaggerServlet { + + private static final long serialVersionUID = 1L; + + private transient Logger logger = LoggerFactory.getLogger(BranchServlet.class); + + private IRepositoryManager repositoryManager; + + @Override + protected void inject(ObjectGraph dagger) { + this.repositoryManager = dagger.get(IRepositoryManager.class); + } + + /** + * Returns an url to this servlet for the specified parameters. + * + * @param baseURL + * @param repository + * @param branch + * @param path + * @return an url + */ + public static String asLink(String baseURL, String repository, String branch, String path) { + if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') { + baseURL = baseURL.substring(0, baseURL.length() - 1); + } + return baseURL + Constants.BRANCH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : (path + "/")))); + } + + protected String getBranch(String repository, HttpServletRequest request) { + String pi = request.getPathInfo(); + String branch = pi.substring(pi.indexOf(repository) + repository.length() + 1); + int fs = branch.indexOf('/'); + if (fs > -1) { + branch = branch.substring(0, fs); + } + return branch; + } + + protected String getPath(String repository, String branch, HttpServletRequest request) { + String base = repository + "/" + branch; + String pi = request.getPathInfo().substring(1); + if (pi.equals(base)) { + return ""; + } + String path = pi.substring(pi.indexOf(base) + base.length() + 1); + if (path.endsWith("/")) { + path = path.substring(0, path.length() - 1); + } + return path; + } + + protected boolean renderIndex() { + return false; + } + + /** + * Retrieves the specified resource from the specified branch of the + * repository. + * + * @param request + * @param response + * @throws javax.servlet.ServletException + * @throws java.io.IOException + */ + private void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String path = request.getPathInfo(); + if (path.toLowerCase().endsWith(".git")) { + // forward to url with trailing / + // this is important for relative pages links + response.sendRedirect(request.getServletPath() + path + "/"); + return; + } + if (path.charAt(0) == '/') { + // strip leading / + path = path.substring(1); + } + + // determine repository and resource from url + String repository = ""; + Repository r = null; + int offset = 0; + while (r == null) { + int slash = path.indexOf('/', offset); + if (slash == -1) { + repository = path; + } else { + repository = path.substring(0, slash); + } + offset += slash; + r = repositoryManager.getRepository(repository, false); + if (repository.equals(path)) { + // either only repository in url or no repository found + break; + } + } + + ServletContext context = request.getSession().getServletContext(); + + try { + if (r == null) { + // repository not found! + String mkd = MessageFormat.format( + "# Error\nSorry, no valid **repository** specified in this url: {0}!", + path); + error(response, mkd); + return; + } + + // identify the branch + String branch = getBranch(repository, request); + if (StringUtils.isEmpty(branch)) { + branch = r.getBranch(); + if (branch == null) { + // no branches found! empty? + String mkd = MessageFormat.format( + "# Error\nSorry, no valid **branch** specified in this url: {0}!", + path); + error(response, mkd); + } else { + // redirect to default branch + String base = request.getRequestURI(); + String url = base + branch + "/"; + response.sendRedirect(url); + } + return; + } + + // identify the requested path + String requestedPath = getPath(repository, branch, request); + + // identify the commit + RevCommit commit = JGitUtils.getCommit(r, branch); + if (commit == null) { + // branch not found! + String mkd = MessageFormat.format( + "# Error\nSorry, the repository {0} does not have a **{1}** branch!", + repository, branch); + error(response, mkd); + return; + } + + + List pathEntries = JGitUtils.getFilesInPath(r, requestedPath, commit); + if (pathEntries.isEmpty()) { + // requested a specific resource + try { + String file = StringUtils.getLastPathElement(requestedPath); + + // query Tika for the content type + Tika tika = new Tika(); + String contentType = tika.detect(file); + + if (contentType == null) { + // ask the container for the content type + contentType = context.getMimeType(requestedPath); + + if (contentType == null) { + // still unknown content type, assume binary + contentType = "application/octet-stream"; + } + } + response.setContentType(contentType); + + + if (contentType.startsWith("text/") + || "application/json".equals(contentType) + || "application/xml".equals(contentType)) { + + // serve text content + String encoding = commit.getEncoding().name(); + response.setCharacterEncoding(encoding); + } else { + // serve binary content + String filename = StringUtils.getLastPathElement(requestedPath); + try { + String userAgent = request.getHeader("User-Agent"); + if (userAgent != null && userAgent.indexOf("MSIE 5.5") > -1) { + response.setHeader("Content-Disposition", "filename=\"" + + URLEncoder.encode(filename, Constants.ENCODING) + "\""); + } else if (userAgent != null && userAgent.indexOf("MSIE") > -1) { + response.setHeader("Content-Disposition", "attachment; filename=\"" + + URLEncoder.encode(filename, Constants.ENCODING) + "\""); + } else { + response.setHeader("Content-Disposition", "attachment; filename=\"" + + new String(filename.getBytes(Constants.ENCODING), "latin1") + "\""); + } + } + catch (UnsupportedEncodingException e) { + response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\""); + } + } + + // send content + byte [] content = JGitUtils.getByteContent(r, commit.getTree(), requestedPath, false); + InputStream is = new ByteArrayInputStream(content); + sendContent(response, JGitUtils.getCommitDate(commit), is); + + return; + } catch (Exception e) { + logger.error(null, e); + } + } else { + // path request + if (!request.getPathInfo().endsWith("/")) { + // redirect to trailing '/' url + response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/"); + return; + } + + if (renderIndex()) { + // locate and render an index file + Map names = new TreeMap(); + for (PathModel entry : pathEntries) { + names.put(entry.name.toLowerCase(), entry.name); + } + + List extensions = new ArrayList(); + extensions.add("html"); + extensions.add("htm"); + + String content = null; + for (String ext : extensions) { + String key = "index." + ext; + + if (names.containsKey(key)) { + String fileName = names.get(key); + String fullPath = fileName; + if (!requestedPath.isEmpty()) { + fullPath = requestedPath + "/" + fileName; + } + + String encoding = commit.getEncoding().name(); + String stringContent = JGitUtils.getStringContent(r, commit.getTree(), fullPath, encoding); + if (stringContent == null) { + continue; + } + content = stringContent; + requestedPath = fullPath; + break; + } + } + + response.setContentType("text/html; charset=" + Constants.ENCODING); + byte [] bytes = content.getBytes(Constants.ENCODING); + + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + sendContent(response, JGitUtils.getCommitDate(commit), is); + return; + } + } + + // no content, document list or 404 page + if (pathEntries.isEmpty()) { + // default 404 page + String str = MessageFormat.format( + "# Error\nSorry, the requested resource **{0}** was not found.", + requestedPath); + String content = MarkdownUtils.transformMarkdown(str); + + try { + response.setStatus(HttpServletResponse.SC_NOT_FOUND); + + byte [] bytes = content.getBytes(Constants.ENCODING); + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + sendContent(response, new Date(), is); + return; + } catch (Throwable t) { + logger.error("Failed to write page to client", t); + } + } else { + // + // directory list + // + response.setContentType("text/html"); + response.getWriter().append(""); + response.getWriter().append(""); + response.getWriter().append(""); + response.getWriter().append(""); + response.getWriter().append(""); + String pattern = ""; + final ByteFormat byteFormat = new ByteFormat(); + if (!pathEntries.isEmpty()) { + if (pathEntries.get(0).path.indexOf('/') > -1) { + // we are in a subdirectory, add parent directory link + String pp = URLEncoder.encode(requestedPath, Constants.ENCODING); + pathEntries.add(0, new PathModel("..", pp + "/..", 0, FileMode.TREE.getBits(), null, null)); + } + } + + String basePath = request.getServletPath() + request.getPathInfo(); + if (basePath.charAt(basePath.length() - 1) == '/') { + // strip trailing slash + basePath = basePath.substring(0, basePath.length() - 1); + } + for (PathModel entry : pathEntries) { + String pp = URLEncoder.encode(entry.name, Constants.ENCODING); + response.getWriter().append(MessageFormat.format(pattern, basePath, pp, + JGitUtils.getPermissionsFromMode(entry.mode), byteFormat.format(entry.size))); + } + response.getWriter().append(""); + response.getWriter().append("
      pathmodesize
      {1}{2}{3}
      "); + } + } catch (Throwable t) { + logger.error("Failed to write page to client", t); + } finally { + r.close(); + } + } + + private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException { + response.setDateHeader("Last-Modified", date.getTime()); + response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); + try { + byte[] tmp = new byte[8192]; + int len = 0; + while ((len = is.read(tmp)) > -1) { + response.getOutputStream().write(tmp, 0, len); + } + } finally { + is.close(); + } + response.flushBuffer(); + } + + private void error(HttpServletResponse response, String mkd) throws ServletException, + IOException, ParseException { + String content = MarkdownUtils.transformMarkdown(mkd); + response.setContentType("text/html; charset=" + Constants.ENCODING); + response.getWriter().write(content); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } +} diff --git a/src/main/java/com/gitblit/servlet/PagesFilter.java b/src/main/java/com/gitblit/servlet/PagesFilter.java index 9e009163..0535ea06 100644 --- a/src/main/java/com/gitblit/servlet/PagesFilter.java +++ b/src/main/java/com/gitblit/servlet/PagesFilter.java @@ -15,11 +15,6 @@ */ package com.gitblit.servlet; -import org.eclipse.jgit.lib.Repository; - -import com.gitblit.Constants.AccessRestrictionType; -import com.gitblit.models.RepositoryModel; -import com.gitblit.models.UserModel; /** * The PagesFilter is an AccessRestrictionFilter which ensures the gh-pages @@ -28,99 +23,7 @@ import com.gitblit.models.UserModel; * @author James Moger * */ -public class PagesFilter extends AccessRestrictionFilter { - - /** - * Extract the repository name from the url. - * - * @param url - * @return repository name - */ - @Override - protected String extractRepositoryName(String url) { - // get the repository name from the url by finding a known url suffix - String repository = ""; - Repository r = null; - int offset = 0; - while (r == null) { - int slash = url.indexOf('/', offset); - if (slash == -1) { - repository = url; - } else { - repository = url.substring(0, slash); - } - r = repositoryManager.getRepository(repository, false); - if (r == null) { - // try again - offset = slash + 1; - } else { - // close the repo - r.close(); - } - if (repository.equals(url)) { - // either only repository in url or no repository found - break; - } - } - return repository; - } - - /** - * Analyze the url and returns the action of the request. - * - * @param cloneUrl - * @return action of the request - */ - @Override - protected String getUrlRequestAction(String suffix) { - return "VIEW"; - } - - /** - * Determine if a non-existing repository can be created using this filter. - * - * @return true if the filter allows repository creation - */ - @Override - protected boolean isCreationAllowed() { - return false; - } - - /** - * Determine if the action may be executed on the repository. - * - * @param repository - * @param action - * @return true if the action may be performed - */ - @Override - protected boolean isActionAllowed(RepositoryModel repository, String action) { - return true; - } +public class PagesFilter extends BranchFilter { - /** - * Determine if the repository requires authentication. - * - * @param repository - * @param action - * @return true if authentication required - */ - @Override - protected boolean requiresAuthentication(RepositoryModel repository, String action) { - return repository.accessRestriction.atLeast(AccessRestrictionType.VIEW); - } - /** - * Determine if the user can access the repository and perform the specified - * action. - * - * @param repository - * @param user - * @param action - * @return true if user may execute the action on the repository - */ - @Override - protected boolean canAccess(RepositoryModel repository, UserModel user, String action) { - return user.canView(repository); - } } diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java index 7e48f8e2..777d3a87 100644 --- a/src/main/java/com/gitblit/servlet/PagesServlet.java +++ b/src/main/java/com/gitblit/servlet/PagesServlet.java @@ -15,42 +15,9 @@ */ package com.gitblit.servlet; -import java.io.IOException; -import java.text.MessageFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.eclipse.jgit.lib.FileMode; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevTree; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.gitblit.Constants; -import com.gitblit.IStoredSettings; -import com.gitblit.Keys; -import com.gitblit.dagger.DaggerServlet; -import com.gitblit.manager.IRepositoryManager; -import com.gitblit.models.PathModel; -import com.gitblit.models.RefModel; -import com.gitblit.utils.ArrayUtils; -import com.gitblit.utils.ByteFormat; -import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.MarkdownUtils; -import com.gitblit.utils.StringUtils; -import com.gitblit.wicket.MarkupProcessor; -import com.gitblit.wicket.MarkupProcessor.MarkupDocument; - -import dagger.ObjectGraph; /** * Serves the content of a gh-pages branch. @@ -58,21 +25,10 @@ import dagger.ObjectGraph; * @author James Moger * */ -public class PagesServlet extends DaggerServlet { +public class PagesServlet extends BranchServlet { private static final long serialVersionUID = 1L; - private transient Logger logger = LoggerFactory.getLogger(PagesServlet.class); - - private IStoredSettings settings; - - private IRepositoryManager repositoryManager; - - @Override - protected void inject(ObjectGraph dagger) { - this.settings = dagger.get(IStoredSettings.class); - this.repositoryManager = dagger.get(IRepositoryManager.class); - } /** * Returns an url to this servlet for the specified parameters. @@ -89,248 +45,26 @@ public class PagesServlet extends DaggerServlet { return baseURL + Constants.PAGES + repository + "/" + (path == null ? "" : ("/" + path)); } - /** - * Retrieves the specified resource from the gh-pages branch of the - * repository. - * - * @param request - * @param response - * @throws javax.servlet.ServletException - * @throws java.io.IOException - */ - private void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String path = request.getPathInfo(); - if (path.toLowerCase().endsWith(".git")) { - // forward to url with trailing / - // this is important for relative pages links - response.sendRedirect(request.getServletPath() + path + "/"); - return; - } - if (path.charAt(0) == '/') { - // strip leading / - path = path.substring(1); - } - - // determine repository and resource from url - String repository = ""; - String resource = ""; - Repository r = null; - int offset = 0; - while (r == null) { - int slash = path.indexOf('/', offset); - if (slash == -1) { - repository = path; - } else { - repository = path.substring(0, slash); - } - r = repositoryManager.getRepository(repository, false); - offset = slash + 1; - if (offset > 0) { - resource = path.substring(offset); - } - if (repository.equals(path)) { - // either only repository in url or no repository found - break; - } - } - - ServletContext context = request.getSession().getServletContext(); - - try { - if (r == null) { - // repository not found! - String mkd = MessageFormat.format( - "# Error\nSorry, no valid **repository** specified in this url: {0}!", - repository); - error(response, mkd); - return; - } - - // retrieve the content from the repository - RefModel pages = JGitUtils.getPagesBranch(r); - RevCommit commit = JGitUtils.getCommit(r, pages.getObjectId().getName()); - - if (commit == null) { - // branch not found! - String mkd = MessageFormat.format( - "# Error\nSorry, the repository {0} does not have a **gh-pages** branch!", - repository); - error(response, mkd); - return; - } - - MarkupProcessor processor = new MarkupProcessor(settings); - String [] encodings = settings.getStrings(Keys.web.blobEncodings).toArray(new String[0]); - - RevTree tree = commit.getTree(); - - String res = resource; - if (res.endsWith("/")) { - res = res.substring(0, res.length() - 1); - } - - List pathEntries = JGitUtils.getFilesInPath(r, res, commit); - - byte[] content = null; - if (pathEntries.isEmpty()) { - // not a path, a specific resource - try { - String contentType = context.getMimeType(res); - if (contentType == null) { - contentType = "text/plain"; - } - if (contentType.startsWith("text")) { - content = JGitUtils.getStringContent(r, tree, res, encodings).getBytes( - Constants.ENCODING); - } else { - content = JGitUtils.getByteContent(r, tree, res, false); - } - response.setContentType(contentType); - } catch (Exception e) { - } - } else { - // path request - if (!request.getPathInfo().endsWith("/")) { - // redirect to trailing '/' url - response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/"); - return; - } - - Map names = new TreeMap(); - for (PathModel entry : pathEntries) { - names.put(entry.name.toLowerCase(), entry.name); - } - - List extensions = new ArrayList(); - extensions.add("html"); - extensions.add("htm"); - extensions.addAll(processor.getMarkupExtensions()); - for (String ext : extensions) { - String key = "index." + ext; - - if (names.containsKey(key)) { - String fileName = names.get(key); - String fullPath = fileName; - if (!res.isEmpty()) { - fullPath = res + "/" + fileName; - } - String stringContent = JGitUtils.getStringContent(r, tree, fullPath, encodings); - if (stringContent == null) { - continue; - } - content = stringContent.getBytes(Constants.ENCODING); - if (content != null) { - res = fullPath; - // assume text/html unless the servlet container - // overrides - response.setContentType("text/html; charset=" + Constants.ENCODING); - break; - } - } - } - } - - // no content, document list or custom 404 page - if (ArrayUtils.isEmpty(content)) { - if (pathEntries.isEmpty()) { - // 404 - String custom404 = JGitUtils.getStringContent(r, tree, "404.html", encodings); - if (!StringUtils.isEmpty(custom404)) { - content = custom404.getBytes(Constants.ENCODING); - } - - // still no content - if (ArrayUtils.isEmpty(content)) { - String str = MessageFormat.format( - "# Error\nSorry, the requested resource **{0}** was not found.", - resource); - content = MarkdownUtils.transformMarkdown(str).getBytes(Constants.ENCODING); - } - - try { - // output the content - logger.warn("Pages 404: " + resource); - response.setStatus(HttpServletResponse.SC_NOT_FOUND); - response.getOutputStream().write(content); - response.flushBuffer(); - } catch (Throwable t) { - logger.error("Failed to write page to client", t); - } - } else { - // document list - response.setContentType("text/html"); - response.getWriter().append(""); - response.getWriter().append(""); - response.getWriter().append(""); - response.getWriter().append(""); - response.getWriter().append(""); - String pattern = ""; - final ByteFormat byteFormat = new ByteFormat(); - if (!pathEntries.isEmpty()) { - if (pathEntries.get(0).path.indexOf('/') > -1) { - // we are in a subdirectory, add parent directory link - pathEntries.add(0, new PathModel("..", resource + "/..", 0, FileMode.TREE.getBits(), null, null)); - } - } - - String basePath = request.getServletPath() + request.getPathInfo(); - if (basePath.charAt(basePath.length() - 1) == '/') { - // strip trailing slash - basePath = basePath.substring(0, basePath.length() - 1); - } - for (PathModel entry : pathEntries) { - response.getWriter().append(MessageFormat.format(pattern, basePath, entry.name, - JGitUtils.getPermissionsFromMode(entry.mode), byteFormat.format(entry.size))); - } - response.getWriter().append(""); - response.getWriter().append("
      pathmodesize
      {1}{2}{3}
      "); - } - return; - } - - // check to see if we should transform markup files - String ext = StringUtils.getFileExtension(resource); - if (processor.getMarkupExtensions().contains(ext)) { - String markup = new String(content, Constants.ENCODING); - MarkupDocument markupDoc = processor.parse(repository, commit.getName(), resource, markup); - content = markupDoc.html.getBytes("UTF-8"); - response.setContentType("text/html; charset=" + Constants.ENCODING); - } - - try { - // output the content - response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); - response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime()); - response.getOutputStream().write(content); - response.flushBuffer(); - } catch (Throwable t) { - logger.error("Failed to write page to client", t); - } - - } catch (Throwable t) { - logger.error("Failed to write page to client", t); - } finally { - r.close(); - } - } - - private void error(HttpServletResponse response, String mkd) throws ServletException, - IOException, ParseException { - String content = MarkdownUtils.transformMarkdown(mkd); - response.setContentType("text/html; charset=" + Constants.ENCODING); - response.getWriter().write(content); + @Override + protected String getBranch(String repository, HttpServletRequest request) { + return "gh-pages"; } @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); + protected String getPath(String repository, String branch, HttpServletRequest request) { + String pi = request.getPathInfo().substring(1); + if (pi.equals(repository)) { + return ""; + } + String path = pi.substring(pi.indexOf(repository) + repository.length() + 1); + if (path.endsWith("/")) { + path = path.substring(0, path.length() - 1); + } + return path; } @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); + protected boolean renderIndex() { + return true; } } -- cgit v1.2.3 From 553e0f79c99e3c3b6e7fb5364c10cfc1bd3b9c80 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 23 Apr 2014 16:09:03 -0400 Subject: Stream directly from repo instead of loading into ram and streaming --- .../java/com/gitblit/servlet/BranchServlet.java | 47 ++++++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/servlet/BranchServlet.java b/src/main/java/com/gitblit/servlet/BranchServlet.java index d6fbfe5b..7d0a5c12 100644 --- a/src/main/java/com/gitblit/servlet/BranchServlet.java +++ b/src/main/java/com/gitblit/servlet/BranchServlet.java @@ -35,8 +35,14 @@ import javax.servlet.http.HttpServletResponse; import org.apache.tika.Tika; import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.MutableObjectId; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.treewalk.filter.PathFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -252,10 +258,7 @@ public class BranchServlet extends DaggerServlet { } // send content - byte [] content = JGitUtils.getByteContent(r, commit.getTree(), requestedPath, false); - InputStream is = new ByteArrayInputStream(content); - sendContent(response, JGitUtils.getCommitDate(commit), is); - + streamFromRepo(response, r, commit, requestedPath); return; } catch (Exception e) { logger.error(null, e); @@ -368,6 +371,42 @@ public class BranchServlet extends DaggerServlet { } } + private void streamFromRepo(HttpServletResponse response, Repository repository, + RevCommit commit, String requestedPath) throws IOException { + + response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime()); + response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); + + RevWalk rw = new RevWalk(repository); + TreeWalk tw = new TreeWalk(repository); + try { + tw.reset(); + tw.addTree(commit.getTree()); + PathFilter f = PathFilter.create(requestedPath); + tw.setFilter(f); + tw.setRecursive(true); + MutableObjectId id = new MutableObjectId(); + ObjectReader reader = tw.getObjectReader(); + while (tw.next()) { + FileMode mode = tw.getFileMode(0); + if (mode == FileMode.GITLINK || mode == FileMode.TREE) { + continue; + } + tw.getObjectId(id, 0); + + long len = reader.getObjectSize(id, org.eclipse.jgit.lib.Constants.OBJ_BLOB); + response.setIntHeader("Content-Length", (int) len); + ObjectLoader ldr = repository.open(id); + ldr.copyTo(response.getOutputStream()); + } + } finally { + tw.release(); + rw.dispose(); + } + + response.flushBuffer(); + } + private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException { response.setDateHeader("Last-Modified", date.getTime()); response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); -- cgit v1.2.3 From 1946fe76331b37c5a3be97268f0e3b0e58f3bb00 Mon Sep 17 00:00:00 2001 From: James Moger Date: Sun, 4 May 2014 17:51:26 -0400 Subject: Refine branch and pages servlets --- .../java/com/gitblit/servlet/BranchServlet.java | 67 +++++++++++++++++----- .../java/com/gitblit/servlet/PagesServlet.java | 6 ++ 2 files changed, 58 insertions(+), 15 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/servlet/BranchServlet.java b/src/main/java/com/gitblit/servlet/BranchServlet.java index 7d0a5c12..33808961 100644 --- a/src/main/java/com/gitblit/servlet/BranchServlet.java +++ b/src/main/java/com/gitblit/servlet/BranchServlet.java @@ -47,8 +47,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.gitblit.Constants; +import com.gitblit.Keys; import com.gitblit.dagger.DaggerServlet; import com.gitblit.manager.IRepositoryManager; +import com.gitblit.manager.IRuntimeManager; import com.gitblit.models.PathModel; import com.gitblit.utils.ByteFormat; import com.gitblit.utils.JGitUtils; @@ -69,10 +71,13 @@ public class BranchServlet extends DaggerServlet { private transient Logger logger = LoggerFactory.getLogger(BranchServlet.class); + private IRuntimeManager runtimeManager; + private IRepositoryManager repositoryManager; @Override protected void inject(ObjectGraph dagger) { + this.runtimeManager = dagger.get(IRuntimeManager.class); this.repositoryManager = dagger.get(IRepositoryManager.class); } @@ -89,7 +94,12 @@ public class BranchServlet extends DaggerServlet { if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') { baseURL = baseURL.substring(0, baseURL.length() - 1); } - return baseURL + Constants.BRANCH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : (path + "/")))); + String encodedPath = path.replace(' ', '-'); + try { + encodedPath = URLEncoder.encode(encodedPath, "UTF-8"); + } catch (UnsupportedEncodingException e) { + } + return baseURL + Constants.BRANCH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : (encodedPath + "/")))); } protected String getBranch(String repository, HttpServletRequest request) { @@ -210,9 +220,8 @@ public class BranchServlet extends DaggerServlet { List pathEntries = JGitUtils.getFilesInPath(r, requestedPath, commit); if (pathEntries.isEmpty()) { // requested a specific resource + String file = StringUtils.getLastPathElement(requestedPath); try { - String file = StringUtils.getLastPathElement(requestedPath); - // query Tika for the content type Tika tika = new Tika(); String contentType = tika.detect(file); @@ -226,16 +235,20 @@ public class BranchServlet extends DaggerServlet { contentType = "application/octet-stream"; } } - response.setContentType(contentType); + setContentType(response, contentType); + + if (isTextType(contentType)) { - if (contentType.startsWith("text/") - || "application/json".equals(contentType) - || "application/xml".equals(contentType)) { + // load, interpret, and serve text content as UTF-8 + String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); + String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings); + + byte [] bytes = content.getBytes(Constants.ENCODING); + response.setContentLength(bytes.length); + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + sendContent(response, JGitUtils.getCommitDate(commit), is); - // serve text content - String encoding = commit.getEncoding().name(); - response.setCharacterEncoding(encoding); } else { // serve binary content String filename = StringUtils.getLastPathElement(requestedPath); @@ -255,10 +268,10 @@ public class BranchServlet extends DaggerServlet { catch (UnsupportedEncodingException e) { response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\""); } - } - // send content - streamFromRepo(response, r, commit, requestedPath); + // stream binary content directly from the repository + streamFromRepo(response, r, commit, requestedPath); + } return; } catch (Exception e) { logger.error(null, e); @@ -293,8 +306,8 @@ public class BranchServlet extends DaggerServlet { fullPath = requestedPath + "/" + fileName; } - String encoding = commit.getEncoding().name(); - String stringContent = JGitUtils.getStringContent(r, commit.getTree(), fullPath, encoding); + String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); + String stringContent = JGitUtils.getStringContent(r, commit.getTree(), fullPath, encodings); if (stringContent == null) { continue; } @@ -306,6 +319,7 @@ public class BranchServlet extends DaggerServlet { response.setContentType("text/html; charset=" + Constants.ENCODING); byte [] bytes = content.getBytes(Constants.ENCODING); + response.setContentLength(bytes.length); ByteArrayInputStream is = new ByteArrayInputStream(bytes); sendContent(response, JGitUtils.getCommitDate(commit), is); @@ -371,6 +385,29 @@ public class BranchServlet extends DaggerServlet { } } + protected boolean isTextType(String contentType) { + if (contentType.startsWith("text/") + || "application/json".equals(contentType) + || "application/xml".equals(contentType)) { + return true; + } + return false; + } + + /** + * Override all text types to be plain text. + * + * @param response + * @param contentType + */ + protected void setContentType(HttpServletResponse response, String contentType) { + if (isTextType(contentType)) { + response.setContentType("text/plain"); + } else { + response.setContentType(contentType); + } + } + private void streamFromRepo(HttpServletResponse response, Repository repository, RevCommit commit, String requestedPath) throws IOException { diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java index 777d3a87..7919e442 100644 --- a/src/main/java/com/gitblit/servlet/PagesServlet.java +++ b/src/main/java/com/gitblit/servlet/PagesServlet.java @@ -16,6 +16,7 @@ package com.gitblit.servlet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import com.gitblit.Constants; @@ -67,4 +68,9 @@ public class PagesServlet extends BranchServlet { protected boolean renderIndex() { return true; } + + @Override + protected void setContentType(HttpServletResponse response, String contentType) { + response.setContentType(contentType);; + } } -- cgit v1.2.3 From ff17f7bac432b4ba8310ba3ea335748a34859d50 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 5 May 2014 09:53:24 -0400 Subject: Replace RawPage with RawServlet --- src/main/java/WEB-INF/web.xml | 30 +- src/main/java/com/gitblit/Constants.java | 2 +- .../java/com/gitblit/servlet/BranchFilter.java | 126 ------ .../java/com/gitblit/servlet/BranchServlet.java | 480 --------------------- src/main/java/com/gitblit/servlet/PagesFilter.java | 2 +- .../java/com/gitblit/servlet/PagesServlet.java | 2 +- src/main/java/com/gitblit/servlet/RawFilter.java | 126 ++++++ src/main/java/com/gitblit/servlet/RawServlet.java | 472 ++++++++++++++++++++ .../java/com/gitblit/wicket/GitBlitWebApp.java | 4 +- .../java/com/gitblit/wicket/MarkupProcessor.java | 11 +- .../java/com/gitblit/wicket/pages/BasePage.java | 4 + .../java/com/gitblit/wicket/pages/BlobPage.java | 12 +- .../com/gitblit/wicket/pages/CommitDiffPage.java | 5 +- .../java/com/gitblit/wicket/pages/CommitPage.java | 5 +- .../java/com/gitblit/wicket/pages/ComparePage.java | 5 +- .../java/com/gitblit/wicket/pages/DocPage.java | 6 +- .../java/com/gitblit/wicket/pages/DocsPage.java | 9 +- .../java/com/gitblit/wicket/pages/TreePage.java | 6 +- .../java/com/gitblit/wicket/panels/TagsPanel.java | 11 +- 19 files changed, 664 insertions(+), 654 deletions(-) delete mode 100644 src/main/java/com/gitblit/servlet/BranchFilter.java delete mode 100644 src/main/java/com/gitblit/servlet/BranchServlet.java create mode 100644 src/main/java/com/gitblit/servlet/RawFilter.java create mode 100644 src/main/java/com/gitblit/servlet/RawServlet.java (limited to 'src/main/java') diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml index d60992dd..cb483af4 100644 --- a/src/main/java/WEB-INF/web.xml +++ b/src/main/java/WEB-INF/web.xml @@ -134,18 +134,18 @@ - - BranchServlet - com.gitblit.servlet.BranchServlet + RawServlet + com.gitblit.servlet.RawServlet - BranchServlet - /branch/* + RawServlet + /raw/* @@ -280,16 +280,16 @@ - BranchFilter - com.gitblit.servlet.BranchFilter + RawFilter + com.gitblit.servlet.RawFilter - BranchFilter - /branch/* + RawFilter + /raw/* @@ -340,12 +340,12 @@ * FederationServlet * RpcFilter * RpcServlet - * BranchFilter - * BranchServlet + * RawFilter + * RawServlet * PagesFilter * PagesServlet * com.gitblit.Constants.PAGES_PATH --> - r/,git/,pt,feed/,zip/,federation/,rpc/,branch/,pages/,robots.txt,logo.png,graph/,sparkleshare/ + r/,git/,pt,feed/,zip/,federation/,rpc/,raw/,pages/,robots.txt,logo.png,graph/,sparkleshare/ diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index 96f13c89..4b9755f3 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -68,7 +68,7 @@ public class Constants { public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/"; - public static final String BRANCH = "/branch/"; + public static final String RAW_PATH = "/raw/"; public static final String BRANCH_GRAPH_PATH = "/graph/"; diff --git a/src/main/java/com/gitblit/servlet/BranchFilter.java b/src/main/java/com/gitblit/servlet/BranchFilter.java deleted file mode 100644 index 58b8f433..00000000 --- a/src/main/java/com/gitblit/servlet/BranchFilter.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2012 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.servlet; - -import org.eclipse.jgit.lib.Repository; - -import com.gitblit.Constants.AccessRestrictionType; -import com.gitblit.models.RepositoryModel; -import com.gitblit.models.UserModel; - -/** - * The BranchFilter is an AccessRestrictionFilter which ensures http branch - * requests for a view-restricted repository are authenticated and authorized. - * - * @author James Moger - * - */ -public class BranchFilter extends AccessRestrictionFilter { - - /** - * Extract the repository name from the url. - * - * @param url - * @return repository name - */ - @Override - protected String extractRepositoryName(String url) { - // get the repository name from the url by finding a known url suffix - String repository = ""; - Repository r = null; - int offset = 0; - while (r == null) { - int slash = url.indexOf('/', offset); - if (slash == -1) { - repository = url; - } else { - repository = url.substring(0, slash); - } - r = repositoryManager.getRepository(repository, false); - if (r == null) { - // try again - offset = slash + 1; - } else { - // close the repo - r.close(); - } - if (repository.equals(url)) { - // either only repository in url or no repository found - break; - } - } - return repository; - } - - /** - * Analyze the url and returns the action of the request. - * - * @param cloneUrl - * @return action of the request - */ - @Override - protected String getUrlRequestAction(String suffix) { - return "VIEW"; - } - - /** - * Determine if a non-existing repository can be created using this filter. - * - * @return true if the filter allows repository creation - */ - @Override - protected boolean isCreationAllowed() { - return false; - } - - /** - * Determine if the action may be executed on the repository. - * - * @param repository - * @param action - * @return true if the action may be performed - */ - @Override - protected boolean isActionAllowed(RepositoryModel repository, String action) { - return true; - } - - /** - * Determine if the repository requires authentication. - * - * @param repository - * @param action - * @return true if authentication required - */ - @Override - protected boolean requiresAuthentication(RepositoryModel repository, String action) { - return repository.accessRestriction.atLeast(AccessRestrictionType.VIEW); - } - - /** - * Determine if the user can access the repository and perform the specified - * action. - * - * @param repository - * @param user - * @param action - * @return true if user may execute the action on the repository - */ - @Override - protected boolean canAccess(RepositoryModel repository, UserModel user, String action) { - return user.canView(repository); - } -} diff --git a/src/main/java/com/gitblit/servlet/BranchServlet.java b/src/main/java/com/gitblit/servlet/BranchServlet.java deleted file mode 100644 index 33808961..00000000 --- a/src/main/java/com/gitblit/servlet/BranchServlet.java +++ /dev/null @@ -1,480 +0,0 @@ -/* - * Copyright 2014 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.servlet; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.text.MessageFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.tika.Tika; -import org.eclipse.jgit.lib.FileMode; -import org.eclipse.jgit.lib.MutableObjectId; -import org.eclipse.jgit.lib.ObjectLoader; -import org.eclipse.jgit.lib.ObjectReader; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.treewalk.TreeWalk; -import org.eclipse.jgit.treewalk.filter.PathFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.gitblit.Constants; -import com.gitblit.Keys; -import com.gitblit.dagger.DaggerServlet; -import com.gitblit.manager.IRepositoryManager; -import com.gitblit.manager.IRuntimeManager; -import com.gitblit.models.PathModel; -import com.gitblit.utils.ByteFormat; -import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.MarkdownUtils; -import com.gitblit.utils.StringUtils; - -import dagger.ObjectGraph; - -/** - * Serves the content of a branch. - * - * @author James Moger - * - */ -public class BranchServlet extends DaggerServlet { - - private static final long serialVersionUID = 1L; - - private transient Logger logger = LoggerFactory.getLogger(BranchServlet.class); - - private IRuntimeManager runtimeManager; - - private IRepositoryManager repositoryManager; - - @Override - protected void inject(ObjectGraph dagger) { - this.runtimeManager = dagger.get(IRuntimeManager.class); - this.repositoryManager = dagger.get(IRepositoryManager.class); - } - - /** - * Returns an url to this servlet for the specified parameters. - * - * @param baseURL - * @param repository - * @param branch - * @param path - * @return an url - */ - public static String asLink(String baseURL, String repository, String branch, String path) { - if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') { - baseURL = baseURL.substring(0, baseURL.length() - 1); - } - String encodedPath = path.replace(' ', '-'); - try { - encodedPath = URLEncoder.encode(encodedPath, "UTF-8"); - } catch (UnsupportedEncodingException e) { - } - return baseURL + Constants.BRANCH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : (encodedPath + "/")))); - } - - protected String getBranch(String repository, HttpServletRequest request) { - String pi = request.getPathInfo(); - String branch = pi.substring(pi.indexOf(repository) + repository.length() + 1); - int fs = branch.indexOf('/'); - if (fs > -1) { - branch = branch.substring(0, fs); - } - return branch; - } - - protected String getPath(String repository, String branch, HttpServletRequest request) { - String base = repository + "/" + branch; - String pi = request.getPathInfo().substring(1); - if (pi.equals(base)) { - return ""; - } - String path = pi.substring(pi.indexOf(base) + base.length() + 1); - if (path.endsWith("/")) { - path = path.substring(0, path.length() - 1); - } - return path; - } - - protected boolean renderIndex() { - return false; - } - - /** - * Retrieves the specified resource from the specified branch of the - * repository. - * - * @param request - * @param response - * @throws javax.servlet.ServletException - * @throws java.io.IOException - */ - private void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String path = request.getPathInfo(); - if (path.toLowerCase().endsWith(".git")) { - // forward to url with trailing / - // this is important for relative pages links - response.sendRedirect(request.getServletPath() + path + "/"); - return; - } - if (path.charAt(0) == '/') { - // strip leading / - path = path.substring(1); - } - - // determine repository and resource from url - String repository = ""; - Repository r = null; - int offset = 0; - while (r == null) { - int slash = path.indexOf('/', offset); - if (slash == -1) { - repository = path; - } else { - repository = path.substring(0, slash); - } - offset += slash; - r = repositoryManager.getRepository(repository, false); - if (repository.equals(path)) { - // either only repository in url or no repository found - break; - } - } - - ServletContext context = request.getSession().getServletContext(); - - try { - if (r == null) { - // repository not found! - String mkd = MessageFormat.format( - "# Error\nSorry, no valid **repository** specified in this url: {0}!", - path); - error(response, mkd); - return; - } - - // identify the branch - String branch = getBranch(repository, request); - if (StringUtils.isEmpty(branch)) { - branch = r.getBranch(); - if (branch == null) { - // no branches found! empty? - String mkd = MessageFormat.format( - "# Error\nSorry, no valid **branch** specified in this url: {0}!", - path); - error(response, mkd); - } else { - // redirect to default branch - String base = request.getRequestURI(); - String url = base + branch + "/"; - response.sendRedirect(url); - } - return; - } - - // identify the requested path - String requestedPath = getPath(repository, branch, request); - - // identify the commit - RevCommit commit = JGitUtils.getCommit(r, branch); - if (commit == null) { - // branch not found! - String mkd = MessageFormat.format( - "# Error\nSorry, the repository {0} does not have a **{1}** branch!", - repository, branch); - error(response, mkd); - return; - } - - - List pathEntries = JGitUtils.getFilesInPath(r, requestedPath, commit); - if (pathEntries.isEmpty()) { - // requested a specific resource - String file = StringUtils.getLastPathElement(requestedPath); - try { - // query Tika for the content type - Tika tika = new Tika(); - String contentType = tika.detect(file); - - if (contentType == null) { - // ask the container for the content type - contentType = context.getMimeType(requestedPath); - - if (contentType == null) { - // still unknown content type, assume binary - contentType = "application/octet-stream"; - } - } - - setContentType(response, contentType); - - if (isTextType(contentType)) { - - // load, interpret, and serve text content as UTF-8 - String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); - String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings); - - byte [] bytes = content.getBytes(Constants.ENCODING); - response.setContentLength(bytes.length); - ByteArrayInputStream is = new ByteArrayInputStream(bytes); - sendContent(response, JGitUtils.getCommitDate(commit), is); - - } else { - // serve binary content - String filename = StringUtils.getLastPathElement(requestedPath); - try { - String userAgent = request.getHeader("User-Agent"); - if (userAgent != null && userAgent.indexOf("MSIE 5.5") > -1) { - response.setHeader("Content-Disposition", "filename=\"" - + URLEncoder.encode(filename, Constants.ENCODING) + "\""); - } else if (userAgent != null && userAgent.indexOf("MSIE") > -1) { - response.setHeader("Content-Disposition", "attachment; filename=\"" - + URLEncoder.encode(filename, Constants.ENCODING) + "\""); - } else { - response.setHeader("Content-Disposition", "attachment; filename=\"" - + new String(filename.getBytes(Constants.ENCODING), "latin1") + "\""); - } - } - catch (UnsupportedEncodingException e) { - response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\""); - } - - // stream binary content directly from the repository - streamFromRepo(response, r, commit, requestedPath); - } - return; - } catch (Exception e) { - logger.error(null, e); - } - } else { - // path request - if (!request.getPathInfo().endsWith("/")) { - // redirect to trailing '/' url - response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/"); - return; - } - - if (renderIndex()) { - // locate and render an index file - Map names = new TreeMap(); - for (PathModel entry : pathEntries) { - names.put(entry.name.toLowerCase(), entry.name); - } - - List extensions = new ArrayList(); - extensions.add("html"); - extensions.add("htm"); - - String content = null; - for (String ext : extensions) { - String key = "index." + ext; - - if (names.containsKey(key)) { - String fileName = names.get(key); - String fullPath = fileName; - if (!requestedPath.isEmpty()) { - fullPath = requestedPath + "/" + fileName; - } - - String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); - String stringContent = JGitUtils.getStringContent(r, commit.getTree(), fullPath, encodings); - if (stringContent == null) { - continue; - } - content = stringContent; - requestedPath = fullPath; - break; - } - } - - response.setContentType("text/html; charset=" + Constants.ENCODING); - byte [] bytes = content.getBytes(Constants.ENCODING); - response.setContentLength(bytes.length); - - ByteArrayInputStream is = new ByteArrayInputStream(bytes); - sendContent(response, JGitUtils.getCommitDate(commit), is); - return; - } - } - - // no content, document list or 404 page - if (pathEntries.isEmpty()) { - // default 404 page - String str = MessageFormat.format( - "# Error\nSorry, the requested resource **{0}** was not found.", - requestedPath); - String content = MarkdownUtils.transformMarkdown(str); - - try { - response.setStatus(HttpServletResponse.SC_NOT_FOUND); - - byte [] bytes = content.getBytes(Constants.ENCODING); - ByteArrayInputStream is = new ByteArrayInputStream(bytes); - sendContent(response, new Date(), is); - return; - } catch (Throwable t) { - logger.error("Failed to write page to client", t); - } - } else { - // - // directory list - // - response.setContentType("text/html"); - response.getWriter().append(""); - response.getWriter().append(""); - response.getWriter().append(""); - response.getWriter().append(""); - response.getWriter().append(""); - String pattern = ""; - final ByteFormat byteFormat = new ByteFormat(); - if (!pathEntries.isEmpty()) { - if (pathEntries.get(0).path.indexOf('/') > -1) { - // we are in a subdirectory, add parent directory link - String pp = URLEncoder.encode(requestedPath, Constants.ENCODING); - pathEntries.add(0, new PathModel("..", pp + "/..", 0, FileMode.TREE.getBits(), null, null)); - } - } - - String basePath = request.getServletPath() + request.getPathInfo(); - if (basePath.charAt(basePath.length() - 1) == '/') { - // strip trailing slash - basePath = basePath.substring(0, basePath.length() - 1); - } - for (PathModel entry : pathEntries) { - String pp = URLEncoder.encode(entry.name, Constants.ENCODING); - response.getWriter().append(MessageFormat.format(pattern, basePath, pp, - JGitUtils.getPermissionsFromMode(entry.mode), byteFormat.format(entry.size))); - } - response.getWriter().append(""); - response.getWriter().append("
      pathmodesize
      {1}{2}{3}
      "); - } - } catch (Throwable t) { - logger.error("Failed to write page to client", t); - } finally { - r.close(); - } - } - - protected boolean isTextType(String contentType) { - if (contentType.startsWith("text/") - || "application/json".equals(contentType) - || "application/xml".equals(contentType)) { - return true; - } - return false; - } - - /** - * Override all text types to be plain text. - * - * @param response - * @param contentType - */ - protected void setContentType(HttpServletResponse response, String contentType) { - if (isTextType(contentType)) { - response.setContentType("text/plain"); - } else { - response.setContentType(contentType); - } - } - - private void streamFromRepo(HttpServletResponse response, Repository repository, - RevCommit commit, String requestedPath) throws IOException { - - response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime()); - response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); - - RevWalk rw = new RevWalk(repository); - TreeWalk tw = new TreeWalk(repository); - try { - tw.reset(); - tw.addTree(commit.getTree()); - PathFilter f = PathFilter.create(requestedPath); - tw.setFilter(f); - tw.setRecursive(true); - MutableObjectId id = new MutableObjectId(); - ObjectReader reader = tw.getObjectReader(); - while (tw.next()) { - FileMode mode = tw.getFileMode(0); - if (mode == FileMode.GITLINK || mode == FileMode.TREE) { - continue; - } - tw.getObjectId(id, 0); - - long len = reader.getObjectSize(id, org.eclipse.jgit.lib.Constants.OBJ_BLOB); - response.setIntHeader("Content-Length", (int) len); - ObjectLoader ldr = repository.open(id); - ldr.copyTo(response.getOutputStream()); - } - } finally { - tw.release(); - rw.dispose(); - } - - response.flushBuffer(); - } - - private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException { - response.setDateHeader("Last-Modified", date.getTime()); - response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); - try { - byte[] tmp = new byte[8192]; - int len = 0; - while ((len = is.read(tmp)) > -1) { - response.getOutputStream().write(tmp, 0, len); - } - } finally { - is.close(); - } - response.flushBuffer(); - } - - private void error(HttpServletResponse response, String mkd) throws ServletException, - IOException, ParseException { - String content = MarkdownUtils.transformMarkdown(mkd); - response.setContentType("text/html; charset=" + Constants.ENCODING); - response.getWriter().write(content); - } - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } -} diff --git a/src/main/java/com/gitblit/servlet/PagesFilter.java b/src/main/java/com/gitblit/servlet/PagesFilter.java index 0535ea06..e07d9b3b 100644 --- a/src/main/java/com/gitblit/servlet/PagesFilter.java +++ b/src/main/java/com/gitblit/servlet/PagesFilter.java @@ -23,7 +23,7 @@ package com.gitblit.servlet; * @author James Moger * */ -public class PagesFilter extends BranchFilter { +public class PagesFilter extends RawFilter { } diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java index 7919e442..f578f86f 100644 --- a/src/main/java/com/gitblit/servlet/PagesServlet.java +++ b/src/main/java/com/gitblit/servlet/PagesServlet.java @@ -26,7 +26,7 @@ import com.gitblit.Constants; * @author James Moger * */ -public class PagesServlet extends BranchServlet { +public class PagesServlet extends RawServlet { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gitblit/servlet/RawFilter.java b/src/main/java/com/gitblit/servlet/RawFilter.java new file mode 100644 index 00000000..34989c98 --- /dev/null +++ b/src/main/java/com/gitblit/servlet/RawFilter.java @@ -0,0 +1,126 @@ +/* + * Copyright 2012 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.servlet; + +import org.eclipse.jgit.lib.Repository; + +import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.UserModel; + +/** + * The RawFilter is an AccessRestrictionFilter which ensures http branch + * requests for a view-restricted repository are authenticated and authorized. + * + * @author James Moger + * + */ +public class RawFilter extends AccessRestrictionFilter { + + /** + * Extract the repository name from the url. + * + * @param url + * @return repository name + */ + @Override + protected String extractRepositoryName(String url) { + // get the repository name from the url by finding a known url suffix + String repository = ""; + Repository r = null; + int offset = 0; + while (r == null) { + int slash = url.indexOf('/', offset); + if (slash == -1) { + repository = url; + } else { + repository = url.substring(0, slash); + } + r = repositoryManager.getRepository(repository, false); + if (r == null) { + // try again + offset = slash + 1; + } else { + // close the repo + r.close(); + } + if (repository.equals(url)) { + // either only repository in url or no repository found + break; + } + } + return repository; + } + + /** + * Analyze the url and returns the action of the request. + * + * @param cloneUrl + * @return action of the request + */ + @Override + protected String getUrlRequestAction(String suffix) { + return "VIEW"; + } + + /** + * Determine if a non-existing repository can be created using this filter. + * + * @return true if the filter allows repository creation + */ + @Override + protected boolean isCreationAllowed() { + return false; + } + + /** + * Determine if the action may be executed on the repository. + * + * @param repository + * @param action + * @return true if the action may be performed + */ + @Override + protected boolean isActionAllowed(RepositoryModel repository, String action) { + return true; + } + + /** + * Determine if the repository requires authentication. + * + * @param repository + * @param action + * @return true if authentication required + */ + @Override + protected boolean requiresAuthentication(RepositoryModel repository, String action) { + return repository.accessRestriction.atLeast(AccessRestrictionType.VIEW); + } + + /** + * Determine if the user can access the repository and perform the specified + * action. + * + * @param repository + * @param user + * @param action + * @return true if user may execute the action on the repository + */ + @Override + protected boolean canAccess(RepositoryModel repository, UserModel user, String action) { + return user.canView(repository); + } +} diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java new file mode 100644 index 00000000..cde7b2e1 --- /dev/null +++ b/src/main/java/com/gitblit/servlet/RawServlet.java @@ -0,0 +1,472 @@ +/* + * Copyright 2014 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.servlet; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.text.MessageFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.tika.Tika; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.MutableObjectId; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.treewalk.filter.PathFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.gitblit.Constants; +import com.gitblit.Keys; +import com.gitblit.dagger.DaggerServlet; +import com.gitblit.manager.IRepositoryManager; +import com.gitblit.manager.IRuntimeManager; +import com.gitblit.models.PathModel; +import com.gitblit.utils.ByteFormat; +import com.gitblit.utils.JGitUtils; +import com.gitblit.utils.MarkdownUtils; +import com.gitblit.utils.StringUtils; + +import dagger.ObjectGraph; + +/** + * Serves the content of a branch. + * + * @author James Moger + * + */ +public class RawServlet extends DaggerServlet { + + private static final long serialVersionUID = 1L; + + private transient Logger logger = LoggerFactory.getLogger(RawServlet.class); + + private IRuntimeManager runtimeManager; + + private IRepositoryManager repositoryManager; + + @Override + protected void inject(ObjectGraph dagger) { + this.runtimeManager = dagger.get(IRuntimeManager.class); + this.repositoryManager = dagger.get(IRepositoryManager.class); + } + + /** + * Returns an url to this servlet for the specified parameters. + * + * @param baseURL + * @param repository + * @param branch + * @param path + * @return an url + */ + public static String asLink(String baseURL, String repository, String branch, String path) { + if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') { + baseURL = baseURL.substring(0, baseURL.length() - 1); + } + String encodedPath = path.replace(' ', '-'); + try { + encodedPath = URLEncoder.encode(encodedPath, "UTF-8"); + } catch (UnsupportedEncodingException e) { + } + return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath))); + } + + protected String getBranch(String repository, HttpServletRequest request) { + String pi = request.getPathInfo(); + String branch = pi.substring(pi.indexOf(repository) + repository.length() + 1); + int fs = branch.indexOf('/'); + if (fs > -1) { + branch = branch.substring(0, fs); + } + return branch; + } + + protected String getPath(String repository, String branch, HttpServletRequest request) { + String base = repository + "/" + branch; + String pi = request.getPathInfo().substring(1); + if (pi.equals(base)) { + return ""; + } + String path = pi.substring(pi.indexOf(base) + base.length() + 1); + if (path.endsWith("/")) { + path = path.substring(0, path.length() - 1); + } + return path; + } + + protected boolean renderIndex() { + return false; + } + + /** + * Retrieves the specified resource from the specified branch of the + * repository. + * + * @param request + * @param response + * @throws javax.servlet.ServletException + * @throws java.io.IOException + */ + private void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String path = request.getPathInfo(); + if (path.toLowerCase().endsWith(".git")) { + // forward to url with trailing / + // this is important for relative pages links + response.sendRedirect(request.getServletPath() + path + "/"); + return; + } + if (path.charAt(0) == '/') { + // strip leading / + path = path.substring(1); + } + + // determine repository and resource from url + String repository = ""; + Repository r = null; + int offset = 0; + while (r == null) { + int slash = path.indexOf('/', offset); + if (slash == -1) { + repository = path; + } else { + repository = path.substring(0, slash); + } + offset += slash; + r = repositoryManager.getRepository(repository, false); + if (repository.equals(path)) { + // either only repository in url or no repository found + break; + } + } + + ServletContext context = request.getSession().getServletContext(); + + try { + if (r == null) { + // repository not found! + String mkd = MessageFormat.format( + "# Error\nSorry, no valid **repository** specified in this url: {0}!", + path); + error(response, mkd); + return; + } + + // identify the branch + String branch = getBranch(repository, request); + if (StringUtils.isEmpty(branch)) { + branch = r.getBranch(); + if (branch == null) { + // no branches found! empty? + String mkd = MessageFormat.format( + "# Error\nSorry, no valid **branch** specified in this url: {0}!", + path); + error(response, mkd); + } else { + // redirect to default branch + String base = request.getRequestURI(); + String url = base + branch + "/"; + response.sendRedirect(url); + } + return; + } + + // identify the requested path + String requestedPath = getPath(repository, branch, request); + + // identify the commit + RevCommit commit = JGitUtils.getCommit(r, branch); + if (commit == null) { + // branch not found! + String mkd = MessageFormat.format( + "# Error\nSorry, the repository {0} does not have a **{1}** branch!", + repository, branch); + error(response, mkd); + return; + } + + + List pathEntries = JGitUtils.getFilesInPath(r, requestedPath, commit); + if (pathEntries.isEmpty()) { + // requested a specific resource + String file = StringUtils.getLastPathElement(requestedPath); + try { + // query Tika for the content type + Tika tika = new Tika(); + String contentType = tika.detect(file); + + if (contentType == null) { + // ask the container for the content type + contentType = context.getMimeType(requestedPath); + + if (contentType == null) { + // still unknown content type, assume binary + contentType = "application/octet-stream"; + } + } + + setContentType(response, contentType); + + if (isTextType(contentType)) { + + // load, interpret, and serve text content as UTF-8 + String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); + String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings); + + byte [] bytes = content.getBytes(Constants.ENCODING); + response.setContentLength(bytes.length); + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + sendContent(response, JGitUtils.getCommitDate(commit), is); + + } else { + // serve binary content + String filename = StringUtils.getLastPathElement(requestedPath); + try { + String userAgent = request.getHeader("User-Agent"); + if (userAgent != null && userAgent.indexOf("MSIE 5.5") > -1) { + response.setHeader("Content-Disposition", "filename=\"" + + URLEncoder.encode(filename, Constants.ENCODING) + "\""); + } else if (userAgent != null && userAgent.indexOf("MSIE") > -1) { + response.setHeader("Content-Disposition", "attachment; filename=\"" + + URLEncoder.encode(filename, Constants.ENCODING) + "\""); + } else { + response.setHeader("Content-Disposition", "attachment; filename=\"" + + new String(filename.getBytes(Constants.ENCODING), "latin1") + "\""); + } + } + catch (UnsupportedEncodingException e) { + response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\""); + } + + // stream binary content directly from the repository + streamFromRepo(response, r, commit, requestedPath); + } + return; + } catch (Exception e) { + logger.error(null, e); + } + } else { + // path request + if (!request.getPathInfo().endsWith("/")) { + // redirect to trailing '/' url + response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/"); + return; + } + + if (renderIndex()) { + // locate and render an index file + Map names = new TreeMap(); + for (PathModel entry : pathEntries) { + names.put(entry.name.toLowerCase(), entry.name); + } + + List extensions = new ArrayList(); + extensions.add("html"); + extensions.add("htm"); + + String content = null; + for (String ext : extensions) { + String key = "index." + ext; + + if (names.containsKey(key)) { + String fileName = names.get(key); + String fullPath = fileName; + if (!requestedPath.isEmpty()) { + fullPath = requestedPath + "/" + fileName; + } + + String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); + String stringContent = JGitUtils.getStringContent(r, commit.getTree(), fullPath, encodings); + if (stringContent == null) { + continue; + } + content = stringContent; + requestedPath = fullPath; + break; + } + } + + response.setContentType("text/html; charset=" + Constants.ENCODING); + byte [] bytes = content.getBytes(Constants.ENCODING); + response.setContentLength(bytes.length); + + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + sendContent(response, JGitUtils.getCommitDate(commit), is); + return; + } + } + + // no content, document list or 404 page + if (pathEntries.isEmpty()) { + // default 404 page + String str = MessageFormat.format( + "# Error\nSorry, the requested resource **{0}** was not found.", + requestedPath); + response.setStatus(HttpServletResponse.SC_NOT_FOUND); + error(response, str); + return; + } else { + // + // directory list + // + response.setContentType("text/html"); + response.getWriter().append(""); + response.getWriter().append(""); + response.getWriter().append(""); + response.getWriter().append(""); + response.getWriter().append(""); + String pattern = ""; + final ByteFormat byteFormat = new ByteFormat(); + if (!pathEntries.isEmpty()) { + if (pathEntries.get(0).path.indexOf('/') > -1) { + // we are in a subdirectory, add parent directory link + String pp = URLEncoder.encode(requestedPath, Constants.ENCODING); + pathEntries.add(0, new PathModel("..", pp + "/..", 0, FileMode.TREE.getBits(), null, null)); + } + } + + String basePath = request.getServletPath() + request.getPathInfo(); + if (basePath.charAt(basePath.length() - 1) == '/') { + // strip trailing slash + basePath = basePath.substring(0, basePath.length() - 1); + } + for (PathModel entry : pathEntries) { + String pp = URLEncoder.encode(entry.name, Constants.ENCODING); + response.getWriter().append(MessageFormat.format(pattern, basePath, pp, + JGitUtils.getPermissionsFromMode(entry.mode), + entry.isFile() ? byteFormat.format(entry.size) : "")); + } + response.getWriter().append(""); + response.getWriter().append("
      pathmodesize
      {1}{2}{3}
      "); + } + } catch (Throwable t) { + logger.error("Failed to write page to client", t); + } finally { + r.close(); + } + } + + protected boolean isTextType(String contentType) { + if (contentType.startsWith("text/") + || "application/json".equals(contentType) + || "application/xml".equals(contentType)) { + return true; + } + return false; + } + + /** + * Override all text types to be plain text. + * + * @param response + * @param contentType + */ + protected void setContentType(HttpServletResponse response, String contentType) { + if (isTextType(contentType)) { + response.setContentType("text/plain"); + } else { + response.setContentType(contentType); + } + } + + private void streamFromRepo(HttpServletResponse response, Repository repository, + RevCommit commit, String requestedPath) throws IOException { + + response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime()); + response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); + + RevWalk rw = new RevWalk(repository); + TreeWalk tw = new TreeWalk(repository); + try { + tw.reset(); + tw.addTree(commit.getTree()); + PathFilter f = PathFilter.create(requestedPath); + tw.setFilter(f); + tw.setRecursive(true); + MutableObjectId id = new MutableObjectId(); + ObjectReader reader = tw.getObjectReader(); + while (tw.next()) { + FileMode mode = tw.getFileMode(0); + if (mode == FileMode.GITLINK || mode == FileMode.TREE) { + continue; + } + tw.getObjectId(id, 0); + + long len = reader.getObjectSize(id, org.eclipse.jgit.lib.Constants.OBJ_BLOB); + response.setIntHeader("Content-Length", (int) len); + ObjectLoader ldr = repository.open(id); + ldr.copyTo(response.getOutputStream()); + } + } finally { + tw.release(); + rw.dispose(); + } + + response.flushBuffer(); + } + + private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException { + response.setDateHeader("Last-Modified", date.getTime()); + response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate"); + try { + byte[] tmp = new byte[8192]; + int len = 0; + while ((len = is.read(tmp)) > -1) { + response.getOutputStream().write(tmp, 0, len); + } + } finally { + is.close(); + } + response.flushBuffer(); + } + + private void error(HttpServletResponse response, String mkd) throws ServletException, + IOException, ParseException { + String content = MarkdownUtils.transformMarkdown(mkd); + response.setContentType("text/html; charset=" + Constants.ENCODING); + response.getWriter().write(content); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } +} diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index 9f002d2b..dc79af26 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -64,13 +64,13 @@ import com.gitblit.wicket.pages.LogoutPage; import com.gitblit.wicket.pages.LuceneSearchPage; import com.gitblit.wicket.pages.MetricsPage; import com.gitblit.wicket.pages.MyDashboardPage; +import com.gitblit.wicket.pages.MyTicketsPage; import com.gitblit.wicket.pages.NewMilestonePage; import com.gitblit.wicket.pages.NewTicketPage; import com.gitblit.wicket.pages.OverviewPage; import com.gitblit.wicket.pages.PatchPage; import com.gitblit.wicket.pages.ProjectPage; import com.gitblit.wicket.pages.ProjectsPage; -import com.gitblit.wicket.pages.RawPage; import com.gitblit.wicket.pages.ReflogPage; import com.gitblit.wicket.pages.RepositoriesPage; import com.gitblit.wicket.pages.ReviewProposalPage; @@ -81,7 +81,6 @@ import com.gitblit.wicket.pages.TicketsPage; import com.gitblit.wicket.pages.TreePage; import com.gitblit.wicket.pages.UserPage; import com.gitblit.wicket.pages.UsersPage; -import com.gitblit.wicket.pages.MyTicketsPage; public class GitBlitWebApp extends WebApplication { @@ -173,7 +172,6 @@ public class GitBlitWebApp extends WebApplication { mount("/tag", TagPage.class, "r", "h"); mount("/tree", TreePage.class, "r", "h", "f"); mount("/blob", BlobPage.class, "r", "h", "f"); - mount("/raw", RawPage.class, "r", "h", "f"); mount("/blobdiff", BlobDiffPage.class, "r", "h", "f"); mount("/commitdiff", CommitDiffPage.class, "r", "h"); mount("/compare", ComparePage.class, "r", "h"); diff --git a/src/main/java/com/gitblit/wicket/MarkupProcessor.java b/src/main/java/com/gitblit/wicket/MarkupProcessor.java index ff6fbce2..e7681f2c 100644 --- a/src/main/java/com/gitblit/wicket/MarkupProcessor.java +++ b/src/main/java/com/gitblit/wicket/MarkupProcessor.java @@ -56,11 +56,11 @@ import org.slf4j.LoggerFactory; import com.gitblit.IStoredSettings; import com.gitblit.Keys; import com.gitblit.models.PathModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.pages.DocPage; -import com.gitblit.wicket.pages.RawPage; import com.google.common.base.Joiner; /** @@ -260,7 +260,8 @@ public class MarkupProcessor { if (imagePath.indexOf("://") == -1) { // relative image String path = doc.getRelativePath(imagePath); - url = getWicketUrl(RawPage.class, repositoryName, commitId, path); + String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot(); + url = RawServlet.asLink(contextUrl, repositoryName, commitId, path); } else { // absolute image url = imagePath; @@ -312,7 +313,8 @@ public class MarkupProcessor { if (node.url.indexOf("://") == -1) { // repository-relative image link String path = doc.getRelativePath(node.url); - String url = getWicketUrl(RawPage.class, repositoryName, commitId, path); + String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot(); + String url = RawServlet.asLink(contextUrl, repositoryName, commitId, path); return new Rendering(url, text); } // absolute image link @@ -325,7 +327,8 @@ public class MarkupProcessor { if (url.indexOf("://") == -1) { // repository-relative image link String path = doc.getRelativePath(url); - String wurl = getWicketUrl(RawPage.class, repositoryName, commitId, path); + String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot(); + String wurl = RawServlet.asLink(contextUrl, repositoryName, commitId, path); rendering = new Rendering(wurl, alt); } else { // absolute image link diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java index 7d3d3a24..49710397 100644 --- a/src/main/java/com/gitblit/wicket/pages/BasePage.java +++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java @@ -98,6 +98,10 @@ public abstract class BasePage extends SessionPage { } } + protected String getContextUrl() { + return getRequest().getRelativePathPrefixToContextRoot(); + } + protected String getCanonicalUrl() { return getCanonicalUrl(getClass(), getPageParameters()); } diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java index 299d8dbc..f3d0bc92 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java @@ -24,10 +24,12 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.link.ExternalLink; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import com.gitblit.Keys; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.CacheControl; @@ -57,8 +59,8 @@ public class BlobPage extends RepositoryPage { WicketUtils.newPathParameter(repositoryName, objectId, blobPath)) .setEnabled(false)); add(new BookmarkablePageLink("historyLink", HistoryPage.class).setEnabled(false)); - add(new BookmarkablePageLink("rawLink", RawPage.class, - WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, blobPath); + add(new ExternalLink("rawLink", rawUrl)); add(new CommitHeaderPanel("commitHeader", objectId)); add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings)); @@ -87,8 +89,8 @@ public class BlobPage extends RepositoryPage { WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); add(new BookmarkablePageLink("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); - add(new BookmarkablePageLink("rawLink", RawPage.class, - WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, blobPath); + add(new ExternalLink("rawLink", rawUrl)); add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); @@ -115,7 +117,7 @@ public class BlobPage extends RepositoryPage { case 2: // image blobs add(new Label("blobText").setVisible(false)); - add(new ExternalImage("blobImage", urlFor(RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)).toString())); + add(new ExternalImage("blobImage", rawUrl)); break; case 3: // binary blobs diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java index 7f2a8a61..71a5ea67 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java @@ -34,6 +34,7 @@ import com.gitblit.Constants; import com.gitblit.models.GitNote; import com.gitblit.models.PathModel.PathChangeModel; import com.gitblit.models.SubmoduleModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.DiffUtils; import com.gitblit.utils.DiffUtils.DiffOutput; import com.gitblit.utils.DiffUtils.DiffOutputType; @@ -170,8 +171,8 @@ public class CommitDiffPage extends RepositoryPage { item.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); - item.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path)) + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path); + item.add(new ExternalLink("raw", rawUrl) .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) diff --git a/src/main/java/com/gitblit/wicket/pages/CommitPage.java b/src/main/java/com/gitblit/wicket/pages/CommitPage.java index 8bc98489..6fadec5b 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.java @@ -35,6 +35,7 @@ import com.gitblit.Constants; import com.gitblit.models.GitNote; import com.gitblit.models.PathModel.PathChangeModel; import com.gitblit.models.SubmoduleModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.JGitUtils; import com.gitblit.wicket.CacheControl; import com.gitblit.wicket.CacheControl.LastModified; @@ -222,8 +223,8 @@ public class CommitPage extends RepositoryPage { item.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); - item.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path)) + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path); + item.add(new ExternalLink("raw", rawUrl) .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java index 2024bf17..1ec66133 100644 --- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java +++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java @@ -41,6 +41,7 @@ import com.gitblit.models.PathModel.PathChangeModel; import com.gitblit.models.RefModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.SubmoduleModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.DiffUtils; import com.gitblit.utils.DiffUtils.DiffOutput; import com.gitblit.utils.DiffUtils.DiffOutputType; @@ -184,8 +185,8 @@ public class ComparePage extends RepositoryPage { item.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils .newPathParameter(repositoryName, endId, entry.path)) .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); - item.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils - .newPathParameter(repositoryName, endId, entry.path)) + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, endId, entry.path); + item.add(new ExternalLink("raw", rawUrl) .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils .newPathParameter(repositoryName, endId, entry.path)) diff --git a/src/main/java/com/gitblit/wicket/pages/DocPage.java b/src/main/java/com/gitblit/wicket/pages/DocPage.java index bf99978c..c06d8065 100644 --- a/src/main/java/com/gitblit/wicket/pages/DocPage.java +++ b/src/main/java/com/gitblit/wicket/pages/DocPage.java @@ -20,10 +20,12 @@ import java.util.List; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.html.panel.Fragment; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.BugtraqProcessor; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; @@ -87,8 +89,8 @@ public class DocPage extends RepositoryPage { WicketUtils.newPathParameter(repositoryName, objectId, documentPath))); fragment.add(new BookmarkablePageLink("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, documentPath))); - fragment.add(new BookmarkablePageLink("rawLink", RawPage.class, WicketUtils.newPathParameter( - repositoryName, objectId, documentPath))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, documentPath); + fragment.add(new ExternalLink("rawLink", rawUrl)); fragment.add(new Label("content", markupDoc.html).setEscapeModelStrings(false)); add(fragment); diff --git a/src/main/java/com/gitblit/wicket/pages/DocsPage.java b/src/main/java/com/gitblit/wicket/pages/DocsPage.java index 907dd6e2..fc56ee07 100644 --- a/src/main/java/com/gitblit/wicket/pages/DocsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.java @@ -31,6 +31,7 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import com.gitblit.models.PathModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.ByteFormat; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; @@ -103,8 +104,8 @@ public class DocsPage extends RepositoryPage { WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath))); item.add(new BookmarkablePageLink("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath))); - item.add(new BookmarkablePageLink("rawLink", RawPage.class, WicketUtils.newPathParameter( - repositoryName, commitId, doc.documentPath))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, doc.documentPath); + item.add(new ExternalLink("rawLink", rawUrl)); // document content String file = StringUtils.getLastPathElement(doc.documentPath); @@ -145,8 +146,8 @@ public class DocsPage extends RepositoryPage { // links item.add(new BookmarkablePageLink("view", DocPage.class, WicketUtils .newPathParameter(repositoryName, id, entry.path))); - item.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils - .newPathParameter(repositoryName, id, entry.path))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, id, entry.path); + item.add(new ExternalLink("raw", rawUrl)); item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils .newPathParameter(repositoryName, id, entry.path))); item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.java b/src/main/java/com/gitblit/wicket/pages/TreePage.java index d6bf1fe1..722b824f 100644 --- a/src/main/java/com/gitblit/wicket/pages/TreePage.java +++ b/src/main/java/com/gitblit/wicket/pages/TreePage.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; @@ -30,6 +31,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import com.gitblit.models.PathModel; import com.gitblit.models.SubmoduleModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.ByteFormat; import com.gitblit.utils.JGitUtils; import com.gitblit.wicket.CacheControl; @@ -162,8 +164,8 @@ public class TreePage extends RepositoryPage { links.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, id, path))); - links.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils - .newPathParameter(repositoryName, id, path))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, id, path); + links.add(new ExternalLink("raw", rawUrl)); links.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils.newPathParameter(repositoryName, id, path))); diff --git a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java index 9f3987be..f1f82739 100644 --- a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java @@ -17,9 +17,11 @@ package com.gitblit.wicket.panels; import java.util.List; +import org.apache.wicket.RequestCycle; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; @@ -29,13 +31,13 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import com.gitblit.models.RefModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.BlobPage; import com.gitblit.wicket.pages.CommitPage; import com.gitblit.wicket.pages.LogPage; -import com.gitblit.wicket.pages.RawPage; import com.gitblit.wicket.pages.TagPage; import com.gitblit.wicket.pages.TagsPage; import com.gitblit.wicket.pages.TreePage; @@ -113,9 +115,10 @@ public class TagsPanel extends BasePanel { .newObjectParameter(repositoryName, entry.getReferencedObjectId() .getName()))); - fragment.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils - .newObjectParameter(repositoryName, entry.getReferencedObjectId() - .getName()))); + String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot(); + String rawUrl = RawServlet.asLink(contextUrl, repositoryName, entry.displayName, + entry.getReferencedObjectId().getName()); + fragment.add(new ExternalLink("raw", rawUrl)); item.add(fragment); } else { // TODO Tree Tag Object -- cgit v1.2.3 From 477412d32836c6a8821f17ff0c26a3c18843d815 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 5 May 2014 10:32:38 -0400 Subject: Add raw links to branches --- src/main/java/com/gitblit/servlet/RawServlet.java | 15 +++++++++++++-- src/main/java/com/gitblit/wicket/panels/BasePanel.java | 4 ++++ .../java/com/gitblit/wicket/panels/BranchesPanel.html | 6 +++--- .../java/com/gitblit/wicket/panels/BranchesPanel.java | 5 +++++ 4 files changed, 25 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java index cde7b2e1..15e036ea 100644 --- a/src/main/java/com/gitblit/servlet/RawServlet.java +++ b/src/main/java/com/gitblit/servlet/RawServlet.java @@ -94,7 +94,17 @@ public class RawServlet extends DaggerServlet { if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') { baseURL = baseURL.substring(0, baseURL.length() - 1); } - String encodedPath = path.replace(' ', '-'); + + if (branch != null) { + char fsc = '!'; + char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/'); + if (c != '/') { + fsc = c; + } + branch = branch.replace('/', fsc); + } + + String encodedPath = path == null ? "" : path.replace(' ', '-'); try { encodedPath = URLEncoder.encode(encodedPath, "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -109,7 +119,8 @@ public class RawServlet extends DaggerServlet { if (fs > -1) { branch = branch.substring(0, fs); } - return branch; + char c = runtimeManager.getSettings().getChar(Keys.web.forwardSlashCharacter, '/'); + return branch.replace('!', '/').replace(c, '/'); } protected String getPath(String repository, String branch, HttpServletRequest request) { diff --git a/src/main/java/com/gitblit/wicket/panels/BasePanel.java b/src/main/java/com/gitblit/wicket/panels/BasePanel.java index dda57979..e8f8f6f2 100644 --- a/src/main/java/com/gitblit/wicket/panels/BasePanel.java +++ b/src/main/java/com/gitblit/wicket/panels/BasePanel.java @@ -44,6 +44,10 @@ public abstract class BasePanel extends Panel { return GitBlitWebApp.get(); } + protected String getContextUrl() { + return getRequest().getRelativePathPrefixToContextRoot(); + } + protected TimeZone getTimeZone() { return app().settings().getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get() .getTimezone() : app().getTimezone(); diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.html b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.html index e95b283a..05df23ea 100644 --- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.html @@ -29,21 +29,21 @@ - | | | + | | | | - | | | | + | | | | | - | + | | diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java index 6a7873ea..4bf00f8a 100644 --- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java @@ -40,6 +40,7 @@ import com.gitblit.Constants; import com.gitblit.models.RefModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.servlet.SyndicationServlet; import com.gitblit.utils.CommitCache; import com.gitblit.utils.JGitUtils; @@ -143,6 +144,8 @@ public class BranchesPanel extends BasePanel { .newObjectParameter(model.name, entry.getName()))); fragment.add(new BookmarkablePageLink("tree", TreePage.class, WicketUtils .newObjectParameter(model.name, entry.getName()))); + String rawUrl = RawServlet.asLink(getContextUrl(), model.name, Repository.shortenRefName(entry.getName()), null); + fragment.add(new ExternalLink("raw", rawUrl)); fragment.add(new BookmarkablePageLink("metrics", MetricsPage.class, WicketUtils.newObjectParameter(model.name, entry.getName()))); fragment.add(new ExternalLink("syndication", SyndicationServlet.asLink( @@ -158,6 +161,8 @@ public class BranchesPanel extends BasePanel { .newObjectParameter(model.name, entry.getName()))); fragment.add(new BookmarkablePageLink("tree", TreePage.class, WicketUtils .newObjectParameter(model.name, entry.getName()))); + String rawUrl = RawServlet.asLink(getContextUrl(), model.name, Repository.shortenRefName(entry.getName()), null); + fragment.add(new ExternalLink("raw", rawUrl)); item.add(fragment); } WicketUtils.setAlternatingBackground(item, counter); -- cgit v1.2.3 From ec24568f14ee38b264c86133ce8ebcc35a39034b Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 10 Mar 2014 01:50:49 +0100 Subject: Add http request filter extension point To allow for integration of 3rd party server monitoring solutions, Gitblit needs to expose an extension point for collecting http data. --- src/main/java/WEB-INF/web.xml | 11 +++- src/main/java/com/gitblit/dagger/DaggerFilter.java | 4 +- .../com/gitblit/extensions/HttpRequestFilter.java | 49 ++++++++++++++ .../gitblit/servlet/AccessRestrictionFilter.java | 5 +- .../com/gitblit/servlet/AuthenticationFilter.java | 3 +- .../servlet/EnforceAuthenticationFilter.java | 3 +- src/main/java/com/gitblit/servlet/GitFilter.java | 5 +- src/main/java/com/gitblit/servlet/ProxyFilter.java | 76 ++++++++++++++++++++++ src/main/java/com/gitblit/servlet/RpcFilter.java | 5 +- .../com/gitblit/servlet/SyndicationFilter.java | 5 +- src/site/plugins_extensions.mkd | 20 ++++++ 11 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/gitblit/extensions/HttpRequestFilter.java create mode 100644 src/main/java/com/gitblit/servlet/ProxyFilter.java (limited to 'src/main/java') diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml index cb483af4..3a6c4490 100644 --- a/src/main/java/WEB-INF/web.xml +++ b/src/main/java/WEB-INF/web.xml @@ -214,6 +214,15 @@ /robots.txt + + ProxyFilter + com.gitblit.servlet.ProxyFilter + + + ProxyFilter + /* + + #'):]) __call(['git', 'fetch', args.remote]) - __call(['git', 'branch', '--set-upstream-to={}/ticket/{:d}'.format(args.remote, args.id)]) + __call(['git', 'branch', '-u', '{}/ticket/{:d}'.format(args.remote, args.id)]) break return diff --git a/src/site/tickets_using.mkd b/src/site/tickets_using.mkd index 3936e00d..3cda7314 100644 --- a/src/site/tickets_using.mkd +++ b/src/site/tickets_using.mkd @@ -28,7 +28,7 @@ Any authenticated user who can clone your repository. ...add a single commit... git push origin HEAD:refs/for/new # read ticket id from server output - git branch --set-upstream-to=origin/ticket/{id} + git branch -u origin/ticket/{id} ### Creating the first Patchset for an Existing Ticket @@ -42,7 +42,7 @@ Any authenticated user who can clone your repository. cd repo git checkout -b ticket/{id} ...add one or more commits... - git push --set-upstream origin ticket/{id} + git push -u origin ticket/{id} ### Safely adding commits to a Patchset for an Existing Ticket -- cgit v1.2.3 From 021c70877c889528c0629cac11cb5932f1126eb8 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 5 May 2014 13:37:46 -0400 Subject: Prune deleted branches on fetch --- src/main/java/pt.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/pt.py b/src/main/java/pt.py index fcfe5006..02c4168a 100644 --- a/src/main/java/pt.py +++ b/src/main/java/pt.py @@ -54,9 +54,9 @@ def fetch(args): # fetch all current ticket patchsets print("Fetching ticket patchsets from the '{}' repository".format(args.remote)) if args.quiet: - __call(['git', 'fetch', args.remote, '--quiet']) + __call(['git', 'fetch', '-p', args.remote, '--quiet']) else: - __call(['git', 'fetch', args.remote]) + __call(['git', 'fetch', '-p', args.remote]) else: # fetch specific patchset __resolve_patchset(args) @@ -288,7 +288,7 @@ def propose(args): if fields[0] == 'remote' and fields[1].strip().startswith('--> #'): # set the upstream branch configuration args.id = int(fields[1].strip()[len('--> #'):]) - __call(['git', 'fetch', args.remote]) + __call(['git', 'fetch', '-p', args.remote]) __call(['git', 'branch', '-u', '{}/ticket/{:d}'.format(args.remote, args.id)]) break -- cgit v1.2.3 From a806d728a60525720e0ef6c5bcb7e7062a4835ad Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 5 May 2014 13:40:57 -0400 Subject: Create ticket/N branch on pt start N --- src/main/java/pt.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/pt.py b/src/main/java/pt.py index 02c4168a..f45baded 100644 --- a/src/main/java/pt.py +++ b/src/main/java/pt.py @@ -206,6 +206,12 @@ def start(args): branches.append(branch.strip()) branch = 'topic/' + args.topic + try: + int(args.topic) + branch = 'ticket/' + args.topic + except ValueError: + pass + illegals = set(branches) & {'topic', branch} # ensure there are no local branch names that will interfere with branch creation @@ -246,6 +252,13 @@ def propose(args): push_ref = topic except ValueError: pass + if curr_branch.startswith('ticket/'): + topic = curr_branch[7:].strip() + try: + int(topic) + push_ref = topic + except ValueError: + pass if push_ref is None: push_ref = 'new' else: -- cgit v1.2.3 From 3b23dcdde4ef55927e45e56596e7023ce2cf9424 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 7 May 2014 14:32:09 -0400 Subject: Consolidate open tickets page parameters --- src/main/java/com/gitblit/wicket/WicketUtils.java | 14 ++++++++++++++ .../java/com/gitblit/wicket/pages/EditMilestonePage.java | 14 +++++++------- .../java/com/gitblit/wicket/pages/NewMilestonePage.java | 8 ++++---- src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 9 ++------- .../java/com/gitblit/wicket/panels/TicketListPanel.java | 6 +----- 5 files changed, 28 insertions(+), 23 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index 10b21468..687f0105 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -445,6 +445,20 @@ public class WicketUtils { return new PageParameters(parameterMap); } + public static PageParameters newTicketsParameters(String repositoryName, String... states) { + PageParameters tParams = newRepositoryParameter(repositoryName); + if (states != null) { + for (String state : states) { + tParams.add("status", state); + } + } + return tParams; + } + + public static PageParameters newOpenTicketsParameter(String repositoryName) { + return newTicketsParameters(repositoryName, TicketsUI.openStatii); + } + public static String getProjectName(PageParameters params) { return params.getString("p", ""); } diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java index b844442a..d6f58e7b 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java @@ -66,7 +66,7 @@ public class EditMilestonePage extends RepositoryPage { RepositoryModel model = getRepositoryModel(); if (!app().tickets().isAcceptingTicketUpdates(model)) { // ticket service is read-only - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } UserModel currentUser = GitBlitWebSession.get().getUser(); @@ -76,19 +76,19 @@ public class EditMilestonePage extends RepositoryPage { if (!currentUser.isAuthenticated || !currentUser.canAdmin(model)) { // administration prohibited - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } oldName = WicketUtils.getObject(params); if (StringUtils.isEmpty(oldName)) { // milestone not specified - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } TicketMilestone tm = app().tickets().getMilestone(getRepositoryModel(), oldName); if (tm == null) { // milestone does not exist - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } setStatelessHint(false); @@ -140,7 +140,7 @@ public class EditMilestonePage extends RepositoryPage { } if (success && app().tickets().updateMilestone(getRepositoryModel(), tm, createdBy)) { - setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(getRepositoryModel().name)); + setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } else { // TODO error } @@ -151,7 +151,7 @@ public class EditMilestonePage extends RepositoryPage { @Override public void onSubmit() { - setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } }; cancel.setDefaultFormProcessing(false); @@ -167,7 +167,7 @@ public class EditMilestonePage extends RepositoryPage { boolean notify = notificationModel.getObject(); if (app().tickets().deleteMilestone(getRepositoryModel(), oldName, createdBy, notify)) { - setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } else { // TODO error processing } diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java index a9f76d3a..cc331903 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java @@ -55,7 +55,7 @@ public class NewMilestonePage extends RepositoryPage { RepositoryModel model = getRepositoryModel(); if (!app().tickets().isAcceptingTicketUpdates(model)) { // ticket service is read-only - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } UserModel currentUser = GitBlitWebSession.get().getUser(); @@ -65,7 +65,7 @@ public class NewMilestonePage extends RepositoryPage { if (!currentUser.isAuthenticated || !currentUser.canAdmin(model)) { // administration prohibited - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } setStatelessHint(false); @@ -108,7 +108,7 @@ public class NewMilestonePage extends RepositoryPage { if (milestone != null) { milestone.due = due; app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy); - throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(getRepositoryModel().name)); + throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } else { // TODO error } @@ -120,7 +120,7 @@ public class NewMilestonePage extends RepositoryPage { @Override public void onSubmit() { - setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)); + setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } }; cancel.setDefaultFormProcessing(false); diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java index 165feedf..a0c9ce01 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java @@ -60,7 +60,6 @@ import com.gitblit.models.UserModel; import com.gitblit.models.UserRepositoryPreferences; import com.gitblit.servlet.PagesServlet; import com.gitblit.servlet.SyndicationServlet; -import com.gitblit.tickets.TicketIndexer.Lucene; import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.BugtraqProcessor; import com.gitblit.utils.DeepCopier; @@ -70,7 +69,6 @@ import com.gitblit.utils.StringUtils; import com.gitblit.wicket.CacheControl; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.SessionlessForm; -import com.gitblit.wicket.TicketsUI; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.NavigationPanel; @@ -202,11 +200,8 @@ public abstract class RepositoryPage extends RootPage { } navLinks.add(new PageNavLink("gb.commits", LogPage.class, params)); navLinks.add(new PageNavLink("gb.tree", TreePage.class, params)); - if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(getRepositoryModel()) || app().tickets().hasTickets(getRepositoryModel()))) { - PageParameters tParams = new PageParameters(params); - for (String state : TicketsUI.openStatii) { - tParams.add(Lucene.status.name(), state); - } + if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(model) || app().tickets().hasTickets(model))) { + PageParameters tParams = WicketUtils.newOpenTicketsParameter(repositoryName); navLinks.add(new PageNavLink("gb.tickets", TicketsPage.class, tParams)); } navLinks.add(new PageNavLink("gb.docs", DocsPage.class, params, true)); diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java index 395200c1..ab763b8f 100644 --- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java @@ -32,7 +32,6 @@ import com.gitblit.Constants; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.tickets.QueryResult; -import com.gitblit.tickets.TicketIndexer.Lucene; import com.gitblit.tickets.TicketLabel; import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.BugtraqProcessor; @@ -77,10 +76,7 @@ public class TicketListPanel extends BasePanel { if (showRepository) { String name = StringUtils.stripDotGit(ticket.repository); - PageParameters rp = new PageParameters(WicketUtils.newRepositoryParameter(ticket.repository)); - for (String state : TicketsUI.openStatii) { - rp.add(Lucene.status.name(), state); - } + PageParameters rp = WicketUtils.newOpenTicketsParameter(ticket.repository); LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp); WicketUtils.setCssBackground(link, name); item.add(link); -- cgit v1.2.3 From 0ee8041f980dab7fee723a326fa2a2f5d1fea054 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 7 May 2014 15:37:03 -0400 Subject: Fix class loading failure when there are no STARTED plugins --- src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 4 +++- .../java/com/gitblit/wicket/PluginClassResolver.java | 20 +++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index d3aa62fd..7291d039 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -25,6 +25,7 @@ import org.apache.wicket.Application; import org.apache.wicket.Request; import org.apache.wicket.Response; import org.apache.wicket.Session; +import org.apache.wicket.application.IClassResolver; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.protocol.http.WebApplication; @@ -226,7 +227,8 @@ public class GitBlitWebApp extends WebApplication implements GitblitWicketApp { } // customize the Wicket class resolver to load from plugins - PluginClassResolver classResolver = new PluginClassResolver(pluginManager); + IClassResolver coreResolver = getApplicationSettings().getClassResolver(); + PluginClassResolver classResolver = new PluginClassResolver(coreResolver, pluginManager); getApplicationSettings().setClassResolver(classResolver); getMarkupSettings().setDefaultMarkupEncoding("UTF-8"); diff --git a/src/main/java/com/gitblit/wicket/PluginClassResolver.java b/src/main/java/com/gitblit/wicket/PluginClassResolver.java index ba53b04b..476f9611 100644 --- a/src/main/java/com/gitblit/wicket/PluginClassResolver.java +++ b/src/main/java/com/gitblit/wicket/PluginClassResolver.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.Set; import java.util.TreeSet; -import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.application.IClassResolver; import org.slf4j.Logger; @@ -40,9 +39,11 @@ import com.gitblit.manager.IPluginManager; public class PluginClassResolver implements IClassResolver { private static final Logger logger = LoggerFactory.getLogger(PluginClassResolver.class); + private final IClassResolver coreResolver; private final IPluginManager pluginManager; - public PluginClassResolver(IPluginManager pluginManager) { + public PluginClassResolver(IClassResolver coreResolver, IPluginManager pluginManager) { + this.coreResolver = coreResolver; this.pluginManager = pluginManager; } @@ -65,7 +66,7 @@ public class PluginClassResolver implements IClassResolver { } } - throw new ClassNotFoundException(className); + return coreResolver.resolveClass(className); } @Override @@ -85,6 +86,11 @@ public class PluginClassResolver implements IClassResolver { } } + Iterator it = coreResolver.getResources(name); + while (it.hasNext()) { + URL url = it.next(); + urls.add(url); + } return urls.iterator(); } @@ -94,14 +100,6 @@ public class PluginClassResolver implements IClassResolver { // Try the classloader for the wicket jar/bundle Enumeration resources = plugin.getPluginClassLoader().getResources(name); loadResources(resources, loadedFiles); - - // Try the classloader for the user's application jar/bundle - resources = Application.get().getClass().getClassLoader().getResources(name); - loadResources(resources, loadedFiles); - - // Try the context class loader - resources = Thread.currentThread().getContextClassLoader().getResources(name); - loadResources(resources, loadedFiles); } catch (IOException e) { throw new WicketRuntimeException(e); } -- cgit v1.2.3 From 03d5ee0bcc4b9d7b6814d7212d19d1126638810d Mon Sep 17 00:00:00 2001 From: manisha Date: Fri, 21 Mar 2014 14:27:02 +0530 Subject: Implement FORK RPC request type --- src/main/java/com/gitblit/Constants.java | 2 +- .../models/UserRepositoryCompositeModel.java | 47 ++ src/main/java/com/gitblit/servlet/RpcServlet.java | 689 +++++++++++---------- src/main/java/com/gitblit/utils/RpcUtils.java | 31 +- src/test/config/test-users.conf | 1 - src/test/java/com/gitblit/tests/RpcTests.java | 6 + src/test/java/com/gitblit/tests/Test.java | 11 + 7 files changed, 435 insertions(+), 352 deletions(-) create mode 100644 src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java create mode 100644 src/test/java/com/gitblit/tests/Test.java (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index a5e76a51..cbbc0cac 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -353,7 +353,7 @@ public class Constants { // Order is important here. anything above LIST_SETTINGS requires // administrator privileges and web.allowRpcManagement. CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, LIST_SETTINGS, - CREATE_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY, + CREATE_REPOSITORY, FORK_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY, LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER, LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM, LIST_REPOSITORY_MEMBERS, SET_REPOSITORY_MEMBERS, LIST_REPOSITORY_TEAMS, SET_REPOSITORY_TEAMS, diff --git a/src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java b/src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java new file mode 100644 index 00000000..122bb3ba --- /dev/null +++ b/src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java @@ -0,0 +1,47 @@ +package com.gitblit.models; + +/* + * 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. + */ + + +import com.gitblit.utils.StringUtils; + +import java.io.Serializable; + +public class UserRepositoryCompositeModel implements Serializable { + + private static final long serialVersionUID = 1L; + + public UserModel userModel; + public RepositoryModel repositoryModel; + + public UserModel getUserModel() { + return userModel; + } + + public void setUserModel(UserModel userModel) { + this.userModel = userModel; + } + + public RepositoryModel getRepositoryModel() { + return repositoryModel; + } + + public void setRepositoryModel(RepositoryModel repositoryModel) { + this.repositoryModel = repositoryModel; + } + +} \ No newline at end of file diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java index 2d59ebd7..80c50714 100644 --- a/src/main/java/com/gitblit/servlet/RpcServlet.java +++ b/src/main/java/com/gitblit/servlet/RpcServlet.java @@ -27,6 +27,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.gitblit.models.*; import org.eclipse.jgit.lib.Repository; import com.gitblit.Constants; @@ -35,12 +36,6 @@ import com.gitblit.GitBlitException; import com.gitblit.IStoredSettings; import com.gitblit.Keys; import com.gitblit.manager.IGitblit; -import com.gitblit.models.RefModel; -import com.gitblit.models.RegistrantAccessPermission; -import com.gitblit.models.RepositoryModel; -import com.gitblit.models.ServerSettings; -import com.gitblit.models.TeamModel; -import com.gitblit.models.UserModel; import com.gitblit.utils.DeepCopier; import com.gitblit.utils.HttpUtils; import com.gitblit.utils.JGitUtils; @@ -53,352 +48,368 @@ import dagger.ObjectGraph; * Handles remote procedure calls. * * @author James Moger - * */ public class RpcServlet extends JsonServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; + + public static final int PROTOCOL_VERSION = 7; - public static final int PROTOCOL_VERSION = 7; + private IStoredSettings settings; - private IStoredSettings settings; + private IGitblit gitblit; - private IGitblit gitblit; + @Override + protected void inject(ObjectGraph dagger) { + this.settings = dagger.get(IStoredSettings.class); + this.gitblit = dagger.get(IGitblit.class); + } - @Override - protected void inject(ObjectGraph dagger) { - this.settings = dagger.get(IStoredSettings.class); - this.gitblit = dagger.get(IGitblit.class); - } + /** + * Processes an rpc request. + * + * @param request + * @param response + * @throws javax.servlet.ServletException + * @throws java.io.IOException + */ + @Override + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + RpcRequest reqType = RpcRequest.fromName(request.getParameter("req")); + String objectName = request.getParameter("name"); + logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, + request.getRemoteAddr())); - /** - * Processes an rpc request. - * - * @param request - * @param response - * @throws javax.servlet.ServletException - * @throws java.io.IOException - */ - @Override - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - RpcRequest reqType = RpcRequest.fromName(request.getParameter("req")); - String objectName = request.getParameter("name"); - logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, - request.getRemoteAddr())); + UserModel user = (UserModel) request.getUserPrincipal(); - UserModel user = (UserModel) request.getUserPrincipal(); + boolean allowManagement = user != null && user.canAdmin() + && settings.getBoolean(Keys.web.enableRpcManagement, false); - boolean allowManagement = user != null && user.canAdmin() - && settings.getBoolean(Keys.web.enableRpcManagement, false); + boolean allowAdmin = user != null && user.canAdmin() + && settings.getBoolean(Keys.web.enableRpcAdministration, false); - boolean allowAdmin = user != null && user.canAdmin() - && settings.getBoolean(Keys.web.enableRpcAdministration, false); + Object result = null; + if (RpcRequest.GET_PROTOCOL.equals(reqType)) { + // Return the protocol version + result = PROTOCOL_VERSION; + } else if (RpcRequest.LIST_REPOSITORIES.equals(reqType)) { + // Determine the Gitblit clone url + String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); + if (StringUtils.isEmpty(gitblitUrl)) { + gitblitUrl = HttpUtils.getGitblitURL(request); + } + StringBuilder sb = new StringBuilder(); + sb.append(gitblitUrl); + sb.append(Constants.R_PATH); + sb.append("{0}"); + String cloneUrl = sb.toString(); - Object result = null; - if (RpcRequest.GET_PROTOCOL.equals(reqType)) { - // Return the protocol version - result = PROTOCOL_VERSION; - } else if (RpcRequest.LIST_REPOSITORIES.equals(reqType)) { - // Determine the Gitblit clone url - String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); - if (StringUtils.isEmpty(gitblitUrl)) { - gitblitUrl = HttpUtils.getGitblitURL(request); - } - StringBuilder sb = new StringBuilder(); - sb.append(gitblitUrl); - sb.append(Constants.R_PATH); - sb.append("{0}"); - String cloneUrl = sb.toString(); + // list repositories + List list = gitblit.getRepositoryModels(user); + Map repositories = new HashMap(); + for (RepositoryModel model : list) { + String url = MessageFormat.format(cloneUrl, model.name); + repositories.put(url, model); + } + result = repositories; + } else if (RpcRequest.LIST_BRANCHES.equals(reqType)) { + // list all local branches in all repositories accessible to user + Map> localBranches = new HashMap>(); + List models = gitblit.getRepositoryModels(user); + for (RepositoryModel model : models) { + if (!model.hasCommits) { + // skip empty repository + continue; + } + if (model.isCollectingGarbage) { + // skip garbage collecting repository + logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", model.name)); + continue; + } + // get local branches + Repository repository = gitblit.getRepository(model.name); + List refs = JGitUtils.getLocalBranches(repository, false, -1); + if (model.showRemoteBranches) { + // add remote branches if repository displays them + refs.addAll(JGitUtils.getRemoteBranches(repository, false, -1)); + } + if (refs.size() > 0) { + List branches = new ArrayList(); + for (RefModel ref : refs) { + branches.add(ref.getName()); + } + localBranches.put(model.name, branches); + } + repository.close(); + } + result = localBranches; + } else if (RpcRequest.GET_USER.equals(reqType)) { + if (StringUtils.isEmpty(objectName)) { + if (UserModel.ANONYMOUS.equals(user)) { + response.sendError(forbiddenCode); + } else { + // return the current user, reset credentials + UserModel requestedUser = DeepCopier.copy(user); + result = requestedUser; + } + } else { + if (user.canAdmin() || objectName.equals(user.username)) { + // return the specified user + UserModel requestedUser = gitblit.getUserModel(objectName); + if (requestedUser == null) { + response.setStatus(failureCode); + } else { + result = requestedUser; + } + } else { + response.sendError(forbiddenCode); + } + } + } else if (RpcRequest.LIST_USERS.equals(reqType)) { + // list users + List names = gitblit.getAllUsernames(); + List users = new ArrayList(); + for (String name : names) { + users.add(gitblit.getUserModel(name)); + } + result = users; + } else if (RpcRequest.LIST_TEAMS.equals(reqType)) { + // list teams + List names = gitblit.getAllTeamNames(); + List teams = new ArrayList(); + for (String name : names) { + teams.add(gitblit.getTeamModel(name)); + } + result = teams; + } else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) { + // create repository + RepositoryModel model = deserialize(request, response, RepositoryModel.class); + try { + gitblit.updateRepositoryModel(model.name, model, true); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.FORK_REPOSITORY.equals(reqType)) { + // fork repository + UserRepositoryCompositeModel userRepositoryCompositeModel = deserialize(request, response, + UserRepositoryCompositeModel.class); + RepositoryModel repoModel = userRepositoryCompositeModel.getRepositoryModel(); + UserModel userModel = userRepositoryCompositeModel.getUserModel(); + try { + if (repoModel != null && userModel != null) { + gitblit.fork(repoModel, userModel); + } else { + System.out.println("Non existing user model or repo model"); + response.setStatus(failureCode); + } - // list repositories - List list = gitblit.getRepositoryModels(user); - Map repositories = new HashMap(); - for (RepositoryModel model : list) { - String url = MessageFormat.format(cloneUrl, model.name); - repositories.put(url, model); - } - result = repositories; - } else if (RpcRequest.LIST_BRANCHES.equals(reqType)) { - // list all local branches in all repositories accessible to user - Map> localBranches = new HashMap>(); - List models = gitblit.getRepositoryModels(user); - for (RepositoryModel model : models) { - if (!model.hasCommits) { - // skip empty repository - continue; - } - if (model.isCollectingGarbage) { - // skip garbage collecting repository - logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", model.name)); - continue; - } - // get local branches - Repository repository = gitblit.getRepository(model.name); - List refs = JGitUtils.getLocalBranches(repository, false, -1); - if (model.showRemoteBranches) { - // add remote branches if repository displays them - refs.addAll(JGitUtils.getRemoteBranches(repository, false, -1)); - } - if (refs.size() > 0) { - List branches = new ArrayList(); - for (RefModel ref : refs) { - branches.add(ref.getName()); - } - localBranches.put(model.name, branches); - } - repository.close(); - } - result = localBranches; - } else if (RpcRequest.GET_USER.equals(reqType)) { - if (StringUtils.isEmpty(objectName)) { - if (UserModel.ANONYMOUS.equals(user)) { - response.sendError(forbiddenCode); - } else { - // return the current user, reset credentials - UserModel requestedUser = DeepCopier.copy(user); - result = requestedUser; - } - } else { - if (user.canAdmin() || objectName.equals(user.username)) { - // return the specified user - UserModel requestedUser = gitblit.getUserModel(objectName); - if (requestedUser == null) { - response.setStatus(failureCode); - } else { - result = requestedUser; - } - } else { - response.sendError(forbiddenCode); - } - } - } else if (RpcRequest.LIST_USERS.equals(reqType)) { - // list users - List names = gitblit.getAllUsernames(); - List users = new ArrayList(); - for (String name : names) { - users.add(gitblit.getUserModel(name)); - } - result = users; - } else if (RpcRequest.LIST_TEAMS.equals(reqType)) { - // list teams - List names = gitblit.getAllTeamNames(); - List teams = new ArrayList(); - for (String name : names) { - teams.add(gitblit.getTeamModel(name)); - } - result = teams; - } else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) { - // create repository - RepositoryModel model = deserialize(request, response, RepositoryModel.class); - try { - gitblit.updateRepositoryModel(model.name, model, true); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) { - // edit repository - RepositoryModel model = deserialize(request, response, RepositoryModel.class); - // name specifies original repository name in event of rename - String repoName = objectName; - if (repoName == null) { - repoName = model.name; - } - try { - gitblit.updateRepositoryModel(repoName, model, false); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) { - // delete repository - RepositoryModel model = deserialize(request, response, RepositoryModel.class); - gitblit.deleteRepositoryModel(model); - } else if (RpcRequest.CREATE_USER.equals(reqType)) { - // create user - UserModel model = deserialize(request, response, UserModel.class); - try { - gitblit.addUser(model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.EDIT_USER.equals(reqType)) { - // edit user - UserModel model = deserialize(request, response, UserModel.class); - // name parameter specifies original user name in event of rename - String username = objectName; - if (username == null) { - username = model.username; - } - try { - gitblit.reviseUser(username, model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.DELETE_USER.equals(reqType)) { - // delete user - UserModel model = deserialize(request, response, UserModel.class); - if (!gitblit.deleteUser(model.username)) { - response.setStatus(failureCode); - } - } else if (RpcRequest.CREATE_TEAM.equals(reqType)) { - // create team - TeamModel model = deserialize(request, response, TeamModel.class); - try { - gitblit.addTeam(model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.EDIT_TEAM.equals(reqType)) { - // edit team - TeamModel model = deserialize(request, response, TeamModel.class); - // name parameter specifies original team name in event of rename - String teamname = objectName; - if (teamname == null) { - teamname = model.name; - } - try { - gitblit.reviseTeam(teamname, model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.DELETE_TEAM.equals(reqType)) { - // delete team - TeamModel model = deserialize(request, response, TeamModel.class); - if (!gitblit.deleteTeam(model.name)) { - response.setStatus(failureCode); - } - } else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) { - // get repository members - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getRepositoryUsers(model); - } else if (RpcRequest.SET_REPOSITORY_MEMBERS.equals(reqType)) { - // rejected since 1.2.0 - response.setStatus(failureCode); - } else if (RpcRequest.LIST_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { - // get repository member permissions - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getUserAccessPermissions(model); - } else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { - // set the repository permissions for the specified users - RepositoryModel model = gitblit.getRepositoryModel(objectName); - Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); - result = gitblit.setUserAccessPermissions(model, permissions); - } else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) { - // get repository teams - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getRepositoryTeams(model); - } else if (RpcRequest.SET_REPOSITORY_TEAMS.equals(reqType)) { - // rejected since 1.2.0 - response.setStatus(failureCode); - } else if (RpcRequest.LIST_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { - // get repository team permissions - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getTeamAccessPermissions(model); - } else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { - // set the repository permissions for the specified teams - RepositoryModel model = gitblit.getRepositoryModel(objectName); - Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); - result = gitblit.setTeamAccessPermissions(model, permissions); - } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) { - // return the list of federation registrations - if (allowAdmin) { - result = gitblit.getFederationRegistrations(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_FEDERATION_RESULTS.equals(reqType)) { - // return the list of federation result registrations - if (allowAdmin && gitblit.canFederate()) { - result = gitblit.getFederationResultRegistrations(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) { - // return the list of federation proposals - if (allowAdmin && gitblit.canFederate()) { - result = gitblit.getPendingFederationProposals(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) { - // return the list of federation sets - if (allowAdmin && gitblit.canFederate()) { - String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); - if (StringUtils.isEmpty(gitblitUrl)) { - gitblitUrl = HttpUtils.getGitblitURL(request); - } - result = gitblit.getFederationSets(gitblitUrl); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) { - // return the server's settings - ServerSettings serverSettings = gitblit.getSettingsModel(); - if (allowAdmin) { - // return all settings - result = serverSettings; - } else { - // anonymous users get a few settings to allow browser launching - List keys = new ArrayList(); - keys.add(Keys.web.siteName); - keys.add(Keys.web.mountParameters); - keys.add(Keys.web.syndicationEntries); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) { + // edit repository + RepositoryModel model = deserialize(request, response, RepositoryModel.class); + // name specifies original repository name in event of rename + String repoName = objectName; + if (repoName == null) { + repoName = model.name; + } + try { + gitblit.updateRepositoryModel(repoName, model, false); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) { + // delete repository + RepositoryModel model = deserialize(request, response, RepositoryModel.class); + gitblit.deleteRepositoryModel(model); + } else if (RpcRequest.CREATE_USER.equals(reqType)) { + // create user + UserModel model = deserialize(request, response, UserModel.class); + try { + gitblit.addUser(model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.EDIT_USER.equals(reqType)) { + // edit user + UserModel model = deserialize(request, response, UserModel.class); + // name parameter specifies original user name in event of rename + String username = objectName; + if (username == null) { + username = model.username; + } + try { + gitblit.reviseUser(username, model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.DELETE_USER.equals(reqType)) { + // delete user + UserModel model = deserialize(request, response, UserModel.class); + if (!gitblit.deleteUser(model.username)) { + response.setStatus(failureCode); + } + } else if (RpcRequest.CREATE_TEAM.equals(reqType)) { + // create team + TeamModel model = deserialize(request, response, TeamModel.class); + try { + gitblit.addTeam(model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.EDIT_TEAM.equals(reqType)) { + // edit team + TeamModel model = deserialize(request, response, TeamModel.class); + // name parameter specifies original team name in event of rename + String teamname = objectName; + if (teamname == null) { + teamname = model.name; + } + try { + gitblit.reviseTeam(teamname, model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.DELETE_TEAM.equals(reqType)) { + // delete team + TeamModel model = deserialize(request, response, TeamModel.class); + if (!gitblit.deleteTeam(model.name)) { + response.setStatus(failureCode); + } + } else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) { + // get repository members + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getRepositoryUsers(model); + } else if (RpcRequest.SET_REPOSITORY_MEMBERS.equals(reqType)) { + // rejected since 1.2.0 + response.setStatus(failureCode); + } else if (RpcRequest.LIST_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { + // get repository member permissions + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getUserAccessPermissions(model); + } else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { + // set the repository permissions for the specified users + RepositoryModel model = gitblit.getRepositoryModel(objectName); + Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); + result = gitblit.setUserAccessPermissions(model, permissions); + } else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) { + // get repository teams + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getRepositoryTeams(model); + } else if (RpcRequest.SET_REPOSITORY_TEAMS.equals(reqType)) { + // rejected since 1.2.0 + response.setStatus(failureCode); + } else if (RpcRequest.LIST_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { + // get repository team permissions + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getTeamAccessPermissions(model); + } else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { + // set the repository permissions for the specified teams + RepositoryModel model = gitblit.getRepositoryModel(objectName); + Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); + result = gitblit.setTeamAccessPermissions(model, permissions); + } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) { + // return the list of federation registrations + if (allowAdmin) { + result = gitblit.getFederationRegistrations(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_FEDERATION_RESULTS.equals(reqType)) { + // return the list of federation result registrations + if (allowAdmin && gitblit.canFederate()) { + result = gitblit.getFederationResultRegistrations(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) { + // return the list of federation proposals + if (allowAdmin && gitblit.canFederate()) { + result = gitblit.getPendingFederationProposals(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) { + // return the list of federation sets + if (allowAdmin && gitblit.canFederate()) { + String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); + if (StringUtils.isEmpty(gitblitUrl)) { + gitblitUrl = HttpUtils.getGitblitURL(request); + } + result = gitblit.getFederationSets(gitblitUrl); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) { + // return the server's settings + ServerSettings serverSettings = gitblit.getSettingsModel(); + if (allowAdmin) { + // return all settings + result = serverSettings; + } else { + // anonymous users get a few settings to allow browser launching + List keys = new ArrayList(); + keys.add(Keys.web.siteName); + keys.add(Keys.web.mountParameters); + keys.add(Keys.web.syndicationEntries); - if (allowManagement) { - // keys necessary for repository and/or user management - keys.add(Keys.realm.minPasswordLength); - keys.add(Keys.realm.passwordStorage); - keys.add(Keys.federation.sets); - } - // build the settings - ServerSettings managementSettings = new ServerSettings(); - for (String key : keys) { - managementSettings.add(serverSettings.get(key)); - } - if (allowManagement) { - managementSettings.pushScripts = serverSettings.pushScripts; - } - result = managementSettings; - } - } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) { - // update settings on the server - if (allowAdmin) { - Map map = deserialize(request, response, - RpcUtils.SETTINGS_TYPE); - gitblit.updateSettings(map); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_STATUS.equals(reqType)) { - // return the server's status information - if (allowAdmin) { - result = gitblit.getStatus(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.CLEAR_REPOSITORY_CACHE.equals(reqType)) { - // clear the repository list cache - if (allowManagement) { - gitblit.resetRepositoryListCache(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.REINDEX_TICKETS.equals(reqType)) { - if (allowManagement) { - if (StringUtils.isEmpty(objectName)) { - // reindex all tickets - gitblit.getTicketService().reindex(); - } else { - // reindex tickets in a specific repository - RepositoryModel model = gitblit.getRepositoryModel(objectName); - gitblit.getTicketService().reindex(model); - } - } else { - response.sendError(notAllowedCode); - } - } + if (allowManagement) { + // keys necessary for repository and/or user management + keys.add(Keys.realm.minPasswordLength); + keys.add(Keys.realm.passwordStorage); + keys.add(Keys.federation.sets); + } + // build the settings + ServerSettings managementSettings = new ServerSettings(); + for (String key : keys) { + managementSettings.add(serverSettings.get(key)); + } + if (allowManagement) { + managementSettings.pushScripts = serverSettings.pushScripts; + } + result = managementSettings; + } + } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) { + // update settings on the server + if (allowAdmin) { + Map map = deserialize(request, response, + RpcUtils.SETTINGS_TYPE); + gitblit.updateSettings(map); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_STATUS.equals(reqType)) { + // return the server's status information + if (allowAdmin) { + result = gitblit.getStatus(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.CLEAR_REPOSITORY_CACHE.equals(reqType)) { + // clear the repository list cache + if (allowManagement) { + gitblit.resetRepositoryListCache(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.REINDEX_TICKETS.equals(reqType)) { + if (allowManagement) { + if (StringUtils.isEmpty(objectName)) { + // reindex all tickets + gitblit.getTicketService().reindex(); + } else { + // reindex tickets in a specific repository + RepositoryModel model = gitblit.getRepositoryModel(objectName); + gitblit.getTicketService().reindex(model); + } + } else { + response.sendError(notAllowedCode); + } + } - // send the result of the request - serialize(response, result); - } + // send the result of the request + serialize(response, result); + } } diff --git a/src/main/java/com/gitblit/utils/RpcUtils.java b/src/main/java/com/gitblit/utils/RpcUtils.java index 5e577fb6..904461c8 100644 --- a/src/main/java/com/gitblit/utils/RpcUtils.java +++ b/src/main/java/com/gitblit/utils/RpcUtils.java @@ -25,16 +25,7 @@ import java.util.Map; import com.gitblit.Constants; import com.gitblit.Constants.RpcRequest; import com.gitblit.GitBlitException.UnknownRequestException; -import com.gitblit.models.FederationModel; -import com.gitblit.models.FederationProposal; -import com.gitblit.models.FederationSet; -import com.gitblit.models.FeedModel; -import com.gitblit.models.RegistrantAccessPermission; -import com.gitblit.models.RepositoryModel; -import com.gitblit.models.ServerSettings; -import com.gitblit.models.ServerStatus; -import com.gitblit.models.TeamModel; -import com.gitblit.models.UserModel; +import com.gitblit.models.*; import com.google.gson.reflect.TypeToken; /** @@ -203,7 +194,25 @@ public class RpcUtils { } - /** + /** + * Create a fork of an already existing repo + * + * @param repository + * @param user + + * @return true if the action succeeded + * @throws IOException + */ + public static boolean forkRpository(RepositoryModel repository, UserModel user, String serverUrl, + String account, char[] password) throws IOException { + UserRepositoryCompositeModel userRepositoryCompositeModel = new UserRepositoryCompositeModel(); + userRepositoryCompositeModel.setRepositoryModel(repository); + userRepositoryCompositeModel.setUserModel(user); + return doAction(RpcRequest.FORK_REPOSITORY, null, userRepositoryCompositeModel, serverUrl, account, password); + } + + + /** * Send a revised version of the repository model to the Gitblit server. * * @param repository diff --git a/src/test/config/test-users.conf b/src/test/config/test-users.conf index 1d01f846..4e00903b 100644 --- a/src/test/config/test-users.conf +++ b/src/test/config/test-users.conf @@ -6,7 +6,6 @@ role = "#notfederated" [user "sampleuser"] password = sampleuser - cookie = 6e07ed42149fc166206319faffdfba2e2ec82e43 accountType = LOCAL role = "#none" [team "admins"] diff --git a/src/test/java/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java index ced1a130..943153de 100644 --- a/src/test/java/com/gitblit/tests/RpcTests.java +++ b/src/test/java/com/gitblit/tests/RpcTests.java @@ -191,6 +191,12 @@ public class RpcTests extends GitblitUnitTest { assertEquals(AccessRestrictionType.VIEW, retrievedRepository.accessRestriction); assertEquals(AuthorizationControl.AUTHENTICATED, retrievedRepository.authorizationControl); + //fork repo + UserModel userModel = new UserModel("garbageUser"); + assertTrue("Failed to create Fork Repository!", + RpcUtils.forkRpository(model, userModel, url, account, password.toCharArray())); + + // rename and change access restriciton String originalName = model.name; model.name = "garbagerepo2.git"; diff --git a/src/test/java/com/gitblit/tests/Test.java b/src/test/java/com/gitblit/tests/Test.java new file mode 100644 index 00000000..275c6b4c --- /dev/null +++ b/src/test/java/com/gitblit/tests/Test.java @@ -0,0 +1,11 @@ +package com.gitblit.tests; + +/** + * Created with IntelliJ IDEA. + * User: manisha + * Date: 3/21/14 + * Time: 12:03 PM + * To change this template use File | Settings | File Templates. + */ +public @interface Test { +} -- cgit v1.2.3 From 813a1fab72a462bdd9387ac3f137055853a69710 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 8 May 2014 11:11:04 -0400 Subject: Revise, complete, and fully test the FORK rpc --- releases.moxie | 6 +- src/main/java/com/gitblit/Constants.java | 7 ++- .../models/UserRepositoryCompositeModel.java | 47 --------------- src/main/java/com/gitblit/servlet/RpcServlet.java | 50 ++++++++++------ src/main/java/com/gitblit/utils/RpcUtils.java | 21 ++++--- src/site/rpc.mkd | 8 ++- src/test/config/test-users.conf | 1 + src/test/java/com/gitblit/tests/RpcTests.java | 69 ++++++++++++++++++++-- src/test/java/com/gitblit/tests/Test.java | 11 ---- 9 files changed, 122 insertions(+), 98 deletions(-) delete mode 100644 src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java delete mode 100644 src/test/java/com/gitblit/tests/Test.java (limited to 'src/main/java') diff --git a/releases.moxie b/releases.moxie index aac46f0c..228fc7e6 100644 --- a/releases.moxie +++ b/releases.moxie @@ -11,9 +11,11 @@ r24: { security: ~ fixes: ~ changes: ~ - additions: ~ + additions: + - Add FORK_REPOSITORY RPC request type (issue-371, pr-161, ticket-65) dependencyChanges: ~ - contributors: ~ + contributors: + - Manisha Gayathri } # diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index cbbc0cac..c8ce83c1 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -350,10 +350,11 @@ public class Constants { * a client. */ public static enum RpcRequest { - // Order is important here. anything above LIST_SETTINGS requires + // Order is important here. anything after LIST_SETTINGS requires // administrator privileges and web.allowRpcManagement. - CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, LIST_SETTINGS, - CREATE_REPOSITORY, FORK_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY, + CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, + FORK_REPOSITORY, LIST_SETTINGS, + CREATE_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY, LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER, LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM, LIST_REPOSITORY_MEMBERS, SET_REPOSITORY_MEMBERS, LIST_REPOSITORY_TEAMS, SET_REPOSITORY_TEAMS, diff --git a/src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java b/src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java deleted file mode 100644 index 122bb3ba..00000000 --- a/src/main/java/com/gitblit/models/UserRepositoryCompositeModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gitblit.models; - -/* - * 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. - */ - - -import com.gitblit.utils.StringUtils; - -import java.io.Serializable; - -public class UserRepositoryCompositeModel implements Serializable { - - private static final long serialVersionUID = 1L; - - public UserModel userModel; - public RepositoryModel repositoryModel; - - public UserModel getUserModel() { - return userModel; - } - - public void setUserModel(UserModel userModel) { - this.userModel = userModel; - } - - public RepositoryModel getRepositoryModel() { - return repositoryModel; - } - - public void setRepositoryModel(RepositoryModel repositoryModel) { - this.repositoryModel = repositoryModel; - } - -} \ No newline at end of file diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java index 80c50714..b3016ad6 100644 --- a/src/main/java/com/gitblit/servlet/RpcServlet.java +++ b/src/main/java/com/gitblit/servlet/RpcServlet.java @@ -27,7 +27,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.gitblit.models.*; import org.eclipse.jgit.lib.Repository; import com.gitblit.Constants; @@ -36,6 +35,12 @@ import com.gitblit.GitBlitException; import com.gitblit.IStoredSettings; import com.gitblit.Keys; import com.gitblit.manager.IGitblit; +import com.gitblit.models.RefModel; +import com.gitblit.models.RegistrantAccessPermission; +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.ServerSettings; +import com.gitblit.models.TeamModel; +import com.gitblit.models.UserModel; import com.gitblit.utils.DeepCopier; import com.gitblit.utils.HttpUtils; import com.gitblit.utils.JGitUtils; @@ -53,7 +58,7 @@ public class RpcServlet extends JsonServlet { private static final long serialVersionUID = 1L; - public static final int PROTOCOL_VERSION = 7; + public static final int PROTOCOL_VERSION = 8; private IStoredSettings settings; @@ -191,22 +196,31 @@ public class RpcServlet extends JsonServlet { response.setStatus(failureCode); } } else if (RpcRequest.FORK_REPOSITORY.equals(reqType)) { - // fork repository - UserRepositoryCompositeModel userRepositoryCompositeModel = deserialize(request, response, - UserRepositoryCompositeModel.class); - RepositoryModel repoModel = userRepositoryCompositeModel.getRepositoryModel(); - UserModel userModel = userRepositoryCompositeModel.getUserModel(); - try { - if (repoModel != null && userModel != null) { - gitblit.fork(repoModel, userModel); - } else { - System.out.println("Non existing user model or repo model"); - response.setStatus(failureCode); - } - - } catch (GitBlitException e) { - response.setStatus(failureCode); - } + // fork repository + RepositoryModel origin = gitblit.getRepositoryModel(objectName); + if (origin == null) { + // failed to find repository, error is logged by the repository manager + response.setStatus(failureCode); + } else { + if (user == null || !user.canFork(origin)) { + logger.error("User {} is not permitted to fork '{}'!", + user == null ? "anonymous" : user.username, objectName); + response.setStatus(failureCode); + } else { + try { + // fork the origin + RepositoryModel fork = gitblit.fork(origin, user); + if (fork == null) { + logger.error("Failed to fork repository '{}'!", objectName); + response.setStatus(failureCode); + } else { + logger.info("User {} has forked '{}'!", user.username, objectName); + } + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } + } } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) { // edit repository RepositoryModel model = deserialize(request, response, RepositoryModel.class); diff --git a/src/main/java/com/gitblit/utils/RpcUtils.java b/src/main/java/com/gitblit/utils/RpcUtils.java index 904461c8..82202154 100644 --- a/src/main/java/com/gitblit/utils/RpcUtils.java +++ b/src/main/java/com/gitblit/utils/RpcUtils.java @@ -25,7 +25,16 @@ import java.util.Map; import com.gitblit.Constants; import com.gitblit.Constants.RpcRequest; import com.gitblit.GitBlitException.UnknownRequestException; -import com.gitblit.models.*; +import com.gitblit.models.FederationModel; +import com.gitblit.models.FederationProposal; +import com.gitblit.models.FederationSet; +import com.gitblit.models.FeedModel; +import com.gitblit.models.RegistrantAccessPermission; +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.ServerSettings; +import com.gitblit.models.ServerStatus; +import com.gitblit.models.TeamModel; +import com.gitblit.models.UserModel; import com.google.gson.reflect.TypeToken; /** @@ -195,20 +204,16 @@ public class RpcUtils { } /** - * Create a fork of an already existing repo + * Create a fork of a repository. * * @param repository - * @param user * @return true if the action succeeded * @throws IOException */ - public static boolean forkRpository(RepositoryModel repository, UserModel user, String serverUrl, + public static boolean forkRepository(RepositoryModel repository, String serverUrl, String account, char[] password) throws IOException { - UserRepositoryCompositeModel userRepositoryCompositeModel = new UserRepositoryCompositeModel(); - userRepositoryCompositeModel.setRepositoryModel(repository); - userRepositoryCompositeModel.setUserModel(user); - return doAction(RpcRequest.FORK_REPOSITORY, null, userRepositoryCompositeModel, serverUrl, account, password); + return doAction(RpcRequest.FORK_REPOSITORY, repository.name, null, serverUrl, account, password); } diff --git a/src/site/rpc.mkd b/src/site/rpc.mkd index b86fd9ad..2e502e2c 100644 --- a/src/site/rpc.mkd +++ b/src/site/rpc.mkd @@ -57,9 +57,10 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The Gitblit v0.8.02 Gitblit v0.9.0 - v1.0.03 Gitblit v1.1.04 -Gitblit v1.2.0+5 -Gitblit v1.3.1+6 -Gitblit v1.4.0+7 +Gitblit v1.2.05 +Gitblit v1.3.16 +Gitblit v1.4.07 +Gitblit v1.6.08 @@ -81,6 +82,7 @@ Use *SET_REPOSITORY_TEAM_PERMISSIONS* instead. LIST_BRANCHES--1-Map<String, List<String>> LIST_SETTINGS--1-ServerSettings (basic keys) GET_USERuser name-6-UserModel +FORK_REPOSITORYrepository name-8-- web.enableRpcManagement=true CREATE_REPOSITORYrepository nameadmin1RepositoryModel- EDIT_REPOSITORYrepository nameadmin1RepositoryModel- diff --git a/src/test/config/test-users.conf b/src/test/config/test-users.conf index 4e00903b..1d01f846 100644 --- a/src/test/config/test-users.conf +++ b/src/test/config/test-users.conf @@ -6,6 +6,7 @@ role = "#notfederated" [user "sampleuser"] password = sampleuser + cookie = 6e07ed42149fc166206319faffdfba2e2ec82e43 accountType = LOCAL role = "#none" [team "admins"] diff --git a/src/test/java/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java index 943153de..51b4671b 100644 --- a/src/test/java/com/gitblit/tests/RpcTests.java +++ b/src/test/java/com/gitblit/tests/RpcTests.java @@ -191,12 +191,6 @@ public class RpcTests extends GitblitUnitTest { assertEquals(AccessRestrictionType.VIEW, retrievedRepository.accessRestriction); assertEquals(AuthorizationControl.AUTHENTICATED, retrievedRepository.authorizationControl); - //fork repo - UserModel userModel = new UserModel("garbageUser"); - assertTrue("Failed to create Fork Repository!", - RpcUtils.forkRpository(model, userModel, url, account, password.toCharArray())); - - // rename and change access restriciton String originalName = model.name; model.name = "garbagerepo2.git"; @@ -403,4 +397,67 @@ public class RpcTests extends GitblitUnitTest { assertNotNull(branches); assertTrue(branches.size() > 0); } + + @Test + public void testFork() throws Exception { + // test forking by an administrator + // admins are all-powerful and can fork the unforakable :) + testFork(account, password, true, true); + testFork(account, password, false, true); + + // test forking by a permitted normal user + UserModel forkUser = new UserModel("forkuser"); + forkUser.password = forkUser.username; + forkUser.canFork = true; + RpcUtils.deleteUser(forkUser, url, account, password.toCharArray()); + RpcUtils.createUser(forkUser, url, account, password.toCharArray()); + testFork(forkUser.username, forkUser.password, true, true); + testFork(forkUser.username, forkUser.password, false, false); + RpcUtils.deleteUser(forkUser, url, account, password.toCharArray()); + + // test forking by a non-permitted normal user + UserModel noForkUser = new UserModel("noforkuser"); + noForkUser.password = noForkUser.username; + noForkUser.canFork = false; + RpcUtils.deleteUser(noForkUser, url, account, password.toCharArray()); + RpcUtils.createUser(noForkUser, url, account, password.toCharArray()); + testFork(forkUser.username, forkUser.password, true, false); + testFork(forkUser.username, forkUser.password, false, false); + RpcUtils.deleteUser(noForkUser, url, account, password.toCharArray()); + } + + private void testFork(String forkAcct, String forkAcctPassword, boolean allowForks, boolean expectSuccess) throws Exception { + // test does not exist + RepositoryModel dne = new RepositoryModel(); + dne.name = "doesNotExist.git"; + assertFalse(String.format("Successfully forked %s!", dne.name), + RpcUtils.forkRepository(dne, url, forkAcct, forkAcctPassword.toCharArray())); + + // delete any previous fork + RepositoryModel fork = findRepository(String.format("~%s/helloworld.git", forkAcct)); + if (fork != null) { + RpcUtils.deleteRepository(fork, url, account, password.toCharArray()); + } + + // update the origin to allow forks or not + RepositoryModel origin = findRepository("helloworld.git"); + origin.allowForks = allowForks; + RpcUtils.updateRepository(origin.name, origin, url, account, password.toCharArray()); + + // fork the repository + if (expectSuccess) { + assertTrue(String.format("Failed to fork %s!", origin.name), + RpcUtils.forkRepository(origin, url, forkAcct, forkAcctPassword.toCharArray())); + } else { + assertFalse(String.format("Successfully forked %s!", origin.name), + RpcUtils.forkRepository(origin, url, forkAcct, forkAcctPassword.toCharArray())); + } + + // attempt another fork + assertFalse(String.format("Successfully forked %s!", origin.name), + RpcUtils.forkRepository(origin, url, forkAcct, forkAcctPassword.toCharArray())); + + // delete the fork repository + RpcUtils.deleteRepository(fork, url, account, password.toCharArray()); + } } diff --git a/src/test/java/com/gitblit/tests/Test.java b/src/test/java/com/gitblit/tests/Test.java deleted file mode 100644 index 275c6b4c..00000000 --- a/src/test/java/com/gitblit/tests/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gitblit.tests; - -/** - * Created with IntelliJ IDEA. - * User: manisha - * Date: 3/21/14 - * Time: 12:03 PM - * To change this template use File | Settings | File Templates. - */ -public @interface Test { -} -- cgit v1.2.3 From 311ae949236e19894c575f619dc45f82d979424f Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 8 May 2014 11:17:39 -0400 Subject: Restore tabbed formatting to make diffs to develop useful --- src/main/java/com/gitblit/servlet/RpcServlet.java | 718 +++++++++++----------- 1 file changed, 360 insertions(+), 358 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java index b3016ad6..b8cdfb04 100644 --- a/src/main/java/com/gitblit/servlet/RpcServlet.java +++ b/src/main/java/com/gitblit/servlet/RpcServlet.java @@ -56,374 +56,376 @@ import dagger.ObjectGraph; */ public class RpcServlet extends JsonServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public static final int PROTOCOL_VERSION = 8; + public static final int PROTOCOL_VERSION = 8; - private IStoredSettings settings; + private IStoredSettings settings; - private IGitblit gitblit; + private IGitblit gitblit; - @Override - protected void inject(ObjectGraph dagger) { - this.settings = dagger.get(IStoredSettings.class); - this.gitblit = dagger.get(IGitblit.class); - } + @Override + protected void inject(ObjectGraph dagger) { + this.settings = dagger.get(IStoredSettings.class); + this.gitblit = dagger.get(IGitblit.class); + } - /** - * Processes an rpc request. - * - * @param request - * @param response - * @throws javax.servlet.ServletException - * @throws java.io.IOException - */ - @Override - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - RpcRequest reqType = RpcRequest.fromName(request.getParameter("req")); - String objectName = request.getParameter("name"); - logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, - request.getRemoteAddr())); + /** + * Processes an rpc request. + * + * @param request + * @param response + * @throws javax.servlet.ServletException + * @throws java.io.IOException + */ + @Override + protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, + IOException { + RpcRequest reqType = RpcRequest.fromName(request.getParameter("req")); + String objectName = request.getParameter("name"); + logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, request.getRemoteAddr())); - UserModel user = (UserModel) request.getUserPrincipal(); + UserModel user = (UserModel) request.getUserPrincipal(); - boolean allowManagement = user != null && user.canAdmin() - && settings.getBoolean(Keys.web.enableRpcManagement, false); + boolean allowManagement = user != null && user.canAdmin() + && settings.getBoolean(Keys.web.enableRpcManagement, false); - boolean allowAdmin = user != null && user.canAdmin() - && settings.getBoolean(Keys.web.enableRpcAdministration, false); + boolean allowAdmin = user != null && user.canAdmin() + && settings.getBoolean(Keys.web.enableRpcAdministration, false); - Object result = null; - if (RpcRequest.GET_PROTOCOL.equals(reqType)) { - // Return the protocol version - result = PROTOCOL_VERSION; - } else if (RpcRequest.LIST_REPOSITORIES.equals(reqType)) { - // Determine the Gitblit clone url - String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); - if (StringUtils.isEmpty(gitblitUrl)) { - gitblitUrl = HttpUtils.getGitblitURL(request); - } - StringBuilder sb = new StringBuilder(); - sb.append(gitblitUrl); - sb.append(Constants.R_PATH); - sb.append("{0}"); - String cloneUrl = sb.toString(); + Object result = null; + if (RpcRequest.GET_PROTOCOL.equals(reqType)) { + // Return the protocol version + result = PROTOCOL_VERSION; + } else if (RpcRequest.LIST_REPOSITORIES.equals(reqType)) { + // Determine the Gitblit clone url + String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); + if (StringUtils.isEmpty(gitblitUrl)) { + gitblitUrl = HttpUtils.getGitblitURL(request); + } + StringBuilder sb = new StringBuilder(); + sb.append(gitblitUrl); + sb.append(Constants.R_PATH); + sb.append("{0}"); + String cloneUrl = sb.toString(); - // list repositories - List list = gitblit.getRepositoryModels(user); - Map repositories = new HashMap(); - for (RepositoryModel model : list) { - String url = MessageFormat.format(cloneUrl, model.name); - repositories.put(url, model); - } - result = repositories; - } else if (RpcRequest.LIST_BRANCHES.equals(reqType)) { - // list all local branches in all repositories accessible to user - Map> localBranches = new HashMap>(); - List models = gitblit.getRepositoryModels(user); - for (RepositoryModel model : models) { - if (!model.hasCommits) { - // skip empty repository - continue; - } - if (model.isCollectingGarbage) { - // skip garbage collecting repository - logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", model.name)); - continue; - } - // get local branches - Repository repository = gitblit.getRepository(model.name); - List refs = JGitUtils.getLocalBranches(repository, false, -1); - if (model.showRemoteBranches) { - // add remote branches if repository displays them - refs.addAll(JGitUtils.getRemoteBranches(repository, false, -1)); - } - if (refs.size() > 0) { - List branches = new ArrayList(); - for (RefModel ref : refs) { - branches.add(ref.getName()); - } - localBranches.put(model.name, branches); - } - repository.close(); - } - result = localBranches; - } else if (RpcRequest.GET_USER.equals(reqType)) { - if (StringUtils.isEmpty(objectName)) { - if (UserModel.ANONYMOUS.equals(user)) { - response.sendError(forbiddenCode); - } else { - // return the current user, reset credentials - UserModel requestedUser = DeepCopier.copy(user); - result = requestedUser; - } - } else { - if (user.canAdmin() || objectName.equals(user.username)) { - // return the specified user - UserModel requestedUser = gitblit.getUserModel(objectName); - if (requestedUser == null) { - response.setStatus(failureCode); - } else { - result = requestedUser; - } - } else { - response.sendError(forbiddenCode); - } - } - } else if (RpcRequest.LIST_USERS.equals(reqType)) { - // list users - List names = gitblit.getAllUsernames(); - List users = new ArrayList(); - for (String name : names) { - users.add(gitblit.getUserModel(name)); - } - result = users; - } else if (RpcRequest.LIST_TEAMS.equals(reqType)) { - // list teams - List names = gitblit.getAllTeamNames(); - List teams = new ArrayList(); - for (String name : names) { - teams.add(gitblit.getTeamModel(name)); - } - result = teams; - } else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) { - // create repository - RepositoryModel model = deserialize(request, response, RepositoryModel.class); - try { - gitblit.updateRepositoryModel(model.name, model, true); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.FORK_REPOSITORY.equals(reqType)) { - // fork repository - RepositoryModel origin = gitblit.getRepositoryModel(objectName); - if (origin == null) { - // failed to find repository, error is logged by the repository manager - response.setStatus(failureCode); - } else { - if (user == null || !user.canFork(origin)) { - logger.error("User {} is not permitted to fork '{}'!", - user == null ? "anonymous" : user.username, objectName); - response.setStatus(failureCode); - } else { - try { - // fork the origin - RepositoryModel fork = gitblit.fork(origin, user); - if (fork == null) { - logger.error("Failed to fork repository '{}'!", objectName); - response.setStatus(failureCode); - } else { - logger.info("User {} has forked '{}'!", user.username, objectName); - } - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } - } - } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) { - // edit repository - RepositoryModel model = deserialize(request, response, RepositoryModel.class); - // name specifies original repository name in event of rename - String repoName = objectName; - if (repoName == null) { - repoName = model.name; - } - try { - gitblit.updateRepositoryModel(repoName, model, false); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) { - // delete repository - RepositoryModel model = deserialize(request, response, RepositoryModel.class); - gitblit.deleteRepositoryModel(model); - } else if (RpcRequest.CREATE_USER.equals(reqType)) { - // create user - UserModel model = deserialize(request, response, UserModel.class); - try { - gitblit.addUser(model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.EDIT_USER.equals(reqType)) { - // edit user - UserModel model = deserialize(request, response, UserModel.class); - // name parameter specifies original user name in event of rename - String username = objectName; - if (username == null) { - username = model.username; - } - try { - gitblit.reviseUser(username, model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.DELETE_USER.equals(reqType)) { - // delete user - UserModel model = deserialize(request, response, UserModel.class); - if (!gitblit.deleteUser(model.username)) { - response.setStatus(failureCode); - } - } else if (RpcRequest.CREATE_TEAM.equals(reqType)) { - // create team - TeamModel model = deserialize(request, response, TeamModel.class); - try { - gitblit.addTeam(model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.EDIT_TEAM.equals(reqType)) { - // edit team - TeamModel model = deserialize(request, response, TeamModel.class); - // name parameter specifies original team name in event of rename - String teamname = objectName; - if (teamname == null) { - teamname = model.name; - } - try { - gitblit.reviseTeam(teamname, model); - } catch (GitBlitException e) { - response.setStatus(failureCode); - } - } else if (RpcRequest.DELETE_TEAM.equals(reqType)) { - // delete team - TeamModel model = deserialize(request, response, TeamModel.class); - if (!gitblit.deleteTeam(model.name)) { - response.setStatus(failureCode); - } - } else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) { - // get repository members - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getRepositoryUsers(model); - } else if (RpcRequest.SET_REPOSITORY_MEMBERS.equals(reqType)) { - // rejected since 1.2.0 - response.setStatus(failureCode); - } else if (RpcRequest.LIST_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { - // get repository member permissions - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getUserAccessPermissions(model); - } else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { - // set the repository permissions for the specified users - RepositoryModel model = gitblit.getRepositoryModel(objectName); - Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); - result = gitblit.setUserAccessPermissions(model, permissions); - } else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) { - // get repository teams - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getRepositoryTeams(model); - } else if (RpcRequest.SET_REPOSITORY_TEAMS.equals(reqType)) { - // rejected since 1.2.0 - response.setStatus(failureCode); - } else if (RpcRequest.LIST_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { - // get repository team permissions - RepositoryModel model = gitblit.getRepositoryModel(objectName); - result = gitblit.getTeamAccessPermissions(model); - } else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { - // set the repository permissions for the specified teams - RepositoryModel model = gitblit.getRepositoryModel(objectName); - Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); - result = gitblit.setTeamAccessPermissions(model, permissions); - } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) { - // return the list of federation registrations - if (allowAdmin) { - result = gitblit.getFederationRegistrations(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_FEDERATION_RESULTS.equals(reqType)) { - // return the list of federation result registrations - if (allowAdmin && gitblit.canFederate()) { - result = gitblit.getFederationResultRegistrations(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) { - // return the list of federation proposals - if (allowAdmin && gitblit.canFederate()) { - result = gitblit.getPendingFederationProposals(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) { - // return the list of federation sets - if (allowAdmin && gitblit.canFederate()) { - String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); - if (StringUtils.isEmpty(gitblitUrl)) { - gitblitUrl = HttpUtils.getGitblitURL(request); - } - result = gitblit.getFederationSets(gitblitUrl); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) { - // return the server's settings - ServerSettings serverSettings = gitblit.getSettingsModel(); - if (allowAdmin) { - // return all settings - result = serverSettings; - } else { - // anonymous users get a few settings to allow browser launching - List keys = new ArrayList(); - keys.add(Keys.web.siteName); - keys.add(Keys.web.mountParameters); - keys.add(Keys.web.syndicationEntries); + // list repositories + List list = gitblit.getRepositoryModels(user); + Map repositories = new HashMap(); + for (RepositoryModel model : list) { + String url = MessageFormat.format(cloneUrl, model.name); + repositories.put(url, model); + } + result = repositories; + } else if (RpcRequest.LIST_BRANCHES.equals(reqType)) { + // list all local branches in all repositories accessible to user + Map> localBranches = new HashMap>(); + List models = gitblit.getRepositoryModels(user); + for (RepositoryModel model : models) { + if (!model.hasCommits) { + // skip empty repository + continue; + } + if (model.isCollectingGarbage) { + // skip garbage collecting repository + logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", + model.name)); + continue; + } + // get local branches + Repository repository = gitblit.getRepository(model.name); + List refs = JGitUtils.getLocalBranches(repository, false, -1); + if (model.showRemoteBranches) { + // add remote branches if repository displays them + refs.addAll(JGitUtils.getRemoteBranches(repository, false, -1)); + } + if (refs.size() > 0) { + List branches = new ArrayList(); + for (RefModel ref : refs) { + branches.add(ref.getName()); + } + localBranches.put(model.name, branches); + } + repository.close(); + } + result = localBranches; + } else if (RpcRequest.GET_USER.equals(reqType)) { + if (StringUtils.isEmpty(objectName)) { + if (UserModel.ANONYMOUS.equals(user)) { + response.sendError(forbiddenCode); + } else { + // return the current user, reset credentials + UserModel requestedUser = DeepCopier.copy(user); + result = requestedUser; + } + } else { + if (user.canAdmin() || objectName.equals(user.username)) { + // return the specified user + UserModel requestedUser = gitblit.getUserModel(objectName); + if (requestedUser == null) { + response.setStatus(failureCode); + } else { + result = requestedUser; + } + } else { + response.sendError(forbiddenCode); + } + } + } else if (RpcRequest.LIST_USERS.equals(reqType)) { + // list users + List names = gitblit.getAllUsernames(); + List users = new ArrayList(); + for (String name : names) { + users.add(gitblit.getUserModel(name)); + } + result = users; + } else if (RpcRequest.LIST_TEAMS.equals(reqType)) { + // list teams + List names = gitblit.getAllTeamNames(); + List teams = new ArrayList(); + for (String name : names) { + teams.add(gitblit.getTeamModel(name)); + } + result = teams; + } else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) { + // create repository + RepositoryModel model = deserialize(request, response, RepositoryModel.class); + try { + gitblit.updateRepositoryModel(model.name, model, true); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.FORK_REPOSITORY.equals(reqType)) { + // fork repository + RepositoryModel origin = gitblit.getRepositoryModel(objectName); + if (origin == null) { + // failed to find repository, error is logged by the repository + // manager + response.setStatus(failureCode); + } else { + if (user == null || !user.canFork(origin)) { + logger.error("User {} is not permitted to fork '{}'!", user == null ? "anonymous" : user.username, + objectName); + response.setStatus(failureCode); + } else { + try { + // fork the origin + RepositoryModel fork = gitblit.fork(origin, user); + if (fork == null) { + logger.error("Failed to fork repository '{}'!", objectName); + response.setStatus(failureCode); + } else { + logger.info("User {} has forked '{}'!", user.username, objectName); + } + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } + } + } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) { + // edit repository + RepositoryModel model = deserialize(request, response, RepositoryModel.class); + // name specifies original repository name in event of rename + String repoName = objectName; + if (repoName == null) { + repoName = model.name; + } + try { + gitblit.updateRepositoryModel(repoName, model, false); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) { + // delete repository + RepositoryModel model = deserialize(request, response, RepositoryModel.class); + gitblit.deleteRepositoryModel(model); + } else if (RpcRequest.CREATE_USER.equals(reqType)) { + // create user + UserModel model = deserialize(request, response, UserModel.class); + try { + gitblit.addUser(model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.EDIT_USER.equals(reqType)) { + // edit user + UserModel model = deserialize(request, response, UserModel.class); + // name parameter specifies original user name in event of rename + String username = objectName; + if (username == null) { + username = model.username; + } + try { + gitblit.reviseUser(username, model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.DELETE_USER.equals(reqType)) { + // delete user + UserModel model = deserialize(request, response, UserModel.class); + if (!gitblit.deleteUser(model.username)) { + response.setStatus(failureCode); + } + } else if (RpcRequest.CREATE_TEAM.equals(reqType)) { + // create team + TeamModel model = deserialize(request, response, TeamModel.class); + try { + gitblit.addTeam(model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.EDIT_TEAM.equals(reqType)) { + // edit team + TeamModel model = deserialize(request, response, TeamModel.class); + // name parameter specifies original team name in event of rename + String teamname = objectName; + if (teamname == null) { + teamname = model.name; + } + try { + gitblit.reviseTeam(teamname, model); + } catch (GitBlitException e) { + response.setStatus(failureCode); + } + } else if (RpcRequest.DELETE_TEAM.equals(reqType)) { + // delete team + TeamModel model = deserialize(request, response, TeamModel.class); + if (!gitblit.deleteTeam(model.name)) { + response.setStatus(failureCode); + } + } else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) { + // get repository members + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getRepositoryUsers(model); + } else if (RpcRequest.SET_REPOSITORY_MEMBERS.equals(reqType)) { + // rejected since 1.2.0 + response.setStatus(failureCode); + } else if (RpcRequest.LIST_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { + // get repository member permissions + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getUserAccessPermissions(model); + } else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) { + // set the repository permissions for the specified users + RepositoryModel model = gitblit.getRepositoryModel(objectName); + Collection permissions = deserialize(request, response, + RpcUtils.REGISTRANT_PERMISSIONS_TYPE); + result = gitblit.setUserAccessPermissions(model, permissions); + } else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) { + // get repository teams + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getRepositoryTeams(model); + } else if (RpcRequest.SET_REPOSITORY_TEAMS.equals(reqType)) { + // rejected since 1.2.0 + response.setStatus(failureCode); + } else if (RpcRequest.LIST_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { + // get repository team permissions + RepositoryModel model = gitblit.getRepositoryModel(objectName); + result = gitblit.getTeamAccessPermissions(model); + } else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) { + // set the repository permissions for the specified teams + RepositoryModel model = gitblit.getRepositoryModel(objectName); + Collection permissions = deserialize(request, response, + RpcUtils.REGISTRANT_PERMISSIONS_TYPE); + result = gitblit.setTeamAccessPermissions(model, permissions); + } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) { + // return the list of federation registrations + if (allowAdmin) { + result = gitblit.getFederationRegistrations(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_FEDERATION_RESULTS.equals(reqType)) { + // return the list of federation result registrations + if (allowAdmin && gitblit.canFederate()) { + result = gitblit.getFederationResultRegistrations(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) { + // return the list of federation proposals + if (allowAdmin && gitblit.canFederate()) { + result = gitblit.getPendingFederationProposals(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) { + // return the list of federation sets + if (allowAdmin && gitblit.canFederate()) { + String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); + if (StringUtils.isEmpty(gitblitUrl)) { + gitblitUrl = HttpUtils.getGitblitURL(request); + } + result = gitblit.getFederationSets(gitblitUrl); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) { + // return the server's settings + ServerSettings serverSettings = gitblit.getSettingsModel(); + if (allowAdmin) { + // return all settings + result = serverSettings; + } else { + // anonymous users get a few settings to allow browser launching + List keys = new ArrayList(); + keys.add(Keys.web.siteName); + keys.add(Keys.web.mountParameters); + keys.add(Keys.web.syndicationEntries); - if (allowManagement) { - // keys necessary for repository and/or user management - keys.add(Keys.realm.minPasswordLength); - keys.add(Keys.realm.passwordStorage); - keys.add(Keys.federation.sets); - } - // build the settings - ServerSettings managementSettings = new ServerSettings(); - for (String key : keys) { - managementSettings.add(serverSettings.get(key)); - } - if (allowManagement) { - managementSettings.pushScripts = serverSettings.pushScripts; - } - result = managementSettings; - } - } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) { - // update settings on the server - if (allowAdmin) { - Map map = deserialize(request, response, - RpcUtils.SETTINGS_TYPE); - gitblit.updateSettings(map); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.LIST_STATUS.equals(reqType)) { - // return the server's status information - if (allowAdmin) { - result = gitblit.getStatus(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.CLEAR_REPOSITORY_CACHE.equals(reqType)) { - // clear the repository list cache - if (allowManagement) { - gitblit.resetRepositoryListCache(); - } else { - response.sendError(notAllowedCode); - } - } else if (RpcRequest.REINDEX_TICKETS.equals(reqType)) { - if (allowManagement) { - if (StringUtils.isEmpty(objectName)) { - // reindex all tickets - gitblit.getTicketService().reindex(); - } else { - // reindex tickets in a specific repository - RepositoryModel model = gitblit.getRepositoryModel(objectName); - gitblit.getTicketService().reindex(model); - } - } else { - response.sendError(notAllowedCode); - } - } + if (allowManagement) { + // keys necessary for repository and/or user management + keys.add(Keys.realm.minPasswordLength); + keys.add(Keys.realm.passwordStorage); + keys.add(Keys.federation.sets); + } + // build the settings + ServerSettings managementSettings = new ServerSettings(); + for (String key : keys) { + managementSettings.add(serverSettings.get(key)); + } + if (allowManagement) { + managementSettings.pushScripts = serverSettings.pushScripts; + } + result = managementSettings; + } + } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) { + // update settings on the server + if (allowAdmin) { + Map map = deserialize(request, response, RpcUtils.SETTINGS_TYPE); + gitblit.updateSettings(map); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.LIST_STATUS.equals(reqType)) { + // return the server's status information + if (allowAdmin) { + result = gitblit.getStatus(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.CLEAR_REPOSITORY_CACHE.equals(reqType)) { + // clear the repository list cache + if (allowManagement) { + gitblit.resetRepositoryListCache(); + } else { + response.sendError(notAllowedCode); + } + } else if (RpcRequest.REINDEX_TICKETS.equals(reqType)) { + if (allowManagement) { + if (StringUtils.isEmpty(objectName)) { + // reindex all tickets + gitblit.getTicketService().reindex(); + } else { + // reindex tickets in a specific repository + RepositoryModel model = gitblit.getRepositoryModel(objectName); + gitblit.getTicketService().reindex(model); + } + } else { + response.sendError(notAllowedCode); + } + } - // send the result of the request - serialize(response, result); - } + // send the result of the request + serialize(response, result); + } } -- cgit v1.2.3 From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001 From: Gerard Smyth Date: Tue, 1 Apr 2014 12:29:01 +0100 Subject: Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored. --- src/main/java/com/gitblit/Constants.java | 21 ++++ .../com/gitblit/servlet/SyndicationServlet.java | 135 ++++++++++++++------- src/main/java/com/gitblit/utils/JGitUtils.java | 48 +++++++- 3 files changed, 159 insertions(+), 45 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index c8ce83c1..2007c0a8 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -402,6 +402,27 @@ public class Constants { } } + /** + * Enumeration of the feed content object types. + */ + public static enum FeedContentObjectType { + COMMIT, TAG; + + public static FeedContentObjectType forName(String name) { + for (FeedContentObjectType type : values()) { + if (type.name().equalsIgnoreCase(name)) { + return type; + } + } + return COMMIT; + } + + @Override + public String toString() { + return name().toLowerCase(); + } + } + /** * The types of objects that can be indexed and queried. */ diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java index 24def995..9650ee3a 100644 --- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java +++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java @@ -163,6 +163,15 @@ public class SyndicationServlet extends DaggerServlet { searchType = type; } } + + Constants.FeedContentObjectType objectType = Constants.FeedContentObjectType.COMMIT; + if (!StringUtils.isEmpty(request.getParameter("ot"))) { + Constants.FeedContentObjectType type = Constants.FeedContentObjectType.forName(request.getParameter("ot")); + if (type != null) { + objectType = type; + } + } + int length = settings.getInteger(Keys.web.syndicationEntries, 25); if (StringUtils.isEmpty(objectId)) { objectId = org.eclipse.jgit.lib.Constants.HEAD; @@ -214,14 +223,7 @@ public class SyndicationServlet extends DaggerServlet { boolean mountParameters = settings.getBoolean(Keys.web.mountParameters, true); - String urlPattern; - if (mountParameters) { - // mounted parameters - urlPattern = "{0}/commit/{1}/{2}"; - } else { - // parameterized parameters - urlPattern = "{0}/commit/?r={1}&h={2}"; - } + String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null); if (StringUtils.isEmpty(gitblitUrl)) { gitblitUrl = HttpUtils.getGitblitURL(request); @@ -247,47 +249,92 @@ public class SyndicationServlet extends DaggerServlet { feedDescription = model.description; } - List commits; - if (StringUtils.isEmpty(searchString)) { - // standard log/history lookup - commits = JGitUtils.getRevLog(repository, objectId, offset, length); + if (objectType == Constants.FeedContentObjectType.TAG) { + + String urlPattern; + if (mountParameters) { + // mounted parameters + urlPattern = "{0}/tag/{1}/{2}"; + } else { + // parameterized parameters + urlPattern = "{0}/tag/?r={1}&h={2}"; + } + + List tags = JGitUtils.getTags(repository, false, length, offset); + + for (RefModel tag : tags) { + FeedEntryModel entry = new FeedEntryModel(); + entry.title = tag.getName(); + entry.author = tag.getAuthorIdent().getName(); + entry.link = MessageFormat.format(urlPattern, gitblitUrl, + StringUtils.encodeURL(model.name.replace('/', fsc)), tag.getObjectId().getName()); + entry.published = tag.getDate(); + entry.contentType = "text/html"; + entry.content = tag.getFullMessage(); + entry.repository = model.name; + entry.branch = objectId; + + entry.tags = new ArrayList(); + + // add tag id and referenced commit id + entry.tags.add("tag:" + tag.getObjectId().getName()); + entry.tags.add("commit:" + tag.getReferencedObjectId().getName()); + + entries.add(entry); + } } else { - // repository search - commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType, - offset, length); - } - Map> allRefs = JGitUtils.getAllRefs(repository, model.showRemoteBranches); - BugtraqProcessor processor = new BugtraqProcessor(settings); - - // convert RevCommit to SyndicatedEntryModel - for (RevCommit commit : commits) { - FeedEntryModel entry = new FeedEntryModel(); - entry.title = commit.getShortMessage(); - entry.author = commit.getAuthorIdent().getName(); - entry.link = MessageFormat.format(urlPattern, gitblitUrl, - StringUtils.encodeURL(model.name.replace('/', fsc)), commit.getName()); - entry.published = commit.getCommitterIdent().getWhen(); - entry.contentType = "text/html"; - String message = processor.processCommitMessage(repository, model, commit.getFullMessage()); - entry.content = message; - entry.repository = model.name; - entry.branch = objectId; - entry.tags = new ArrayList(); - - // add commit id and parent commit ids - entry.tags.add("commit:" + commit.getName()); - for (RevCommit parent : commit.getParents()) { - entry.tags.add("parent:" + parent.getName()); + + String urlPattern; + if (mountParameters) { + // mounted parameters + urlPattern = "{0}/commit/{1}/{2}"; + } else { + // parameterized parameters + urlPattern = "{0}/commit/?r={1}&h={2}"; } - // add refs to tabs list - List refs = allRefs.get(commit.getId()); - if (refs != null && refs.size() > 0) { - for (RefModel ref : refs) { - entry.tags.add("ref:" + ref.getName()); + List commits; + if (StringUtils.isEmpty(searchString)) { + // standard log/history lookup + commits = JGitUtils.getRevLog(repository, objectId, offset, length); + } else { + // repository search + commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType, + offset, length); + } + Map> allRefs = JGitUtils.getAllRefs(repository, model.showRemoteBranches); + BugtraqProcessor processor = new BugtraqProcessor(settings); + + // convert RevCommit to SyndicatedEntryModel + for (RevCommit commit : commits) { + FeedEntryModel entry = new FeedEntryModel(); + entry.title = commit.getShortMessage(); + entry.author = commit.getAuthorIdent().getName(); + entry.link = MessageFormat.format(urlPattern, gitblitUrl, + StringUtils.encodeURL(model.name.replace('/', fsc)), commit.getName()); + entry.published = commit.getCommitterIdent().getWhen(); + entry.contentType = "text/html"; + String message = processor.processCommitMessage(repository, model, commit.getFullMessage()); + entry.content = message; + entry.repository = model.name; + entry.branch = objectId; + entry.tags = new ArrayList(); + + // add commit id and parent commit ids + entry.tags.add("commit:" + commit.getName()); + for (RevCommit parent : commit.getParents()) { + entry.tags.add("parent:" + parent.getName()); + } + + // add refs to tabs list + List refs = allRefs.get(commit.getId()); + if (refs != null && refs.size() > 0) { + for (RefModel ref : refs) { + entry.tags.add("ref:" + ref.getName()); + } } + entries.add(entry); } - entries.add(entry); } } diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java index 190872a7..da51ea98 100644 --- a/src/main/java/com/gitblit/utils/JGitUtils.java +++ b/src/main/java/com/gitblit/utils/JGitUtils.java @@ -1667,6 +1667,24 @@ public class JGitUtils { return getRefs(repository, Constants.R_TAGS, fullName, maxCount); } + /** + * Returns the list of tags in the repository. If repository does not exist + * or is empty, an empty list is returned. + * + * @param repository + * @param fullName + * if true, /refs/tags/yadayadayada is returned. If false, + * yadayadayada is returned. + * @param maxCount + * if < 0, all tags are returned + * @param offset + * if maxCount provided sets the starting point of the records to return + * @return list of tags + */ + public static List getTags(Repository repository, boolean fullName, int maxCount, int offset) { + return getRefs(repository, Constants.R_TAGS, fullName, maxCount, offset); + } + /** * Returns the list of local branches in the repository. If repository does * not exist or is empty, an empty list is returned. @@ -1748,6 +1766,27 @@ public class JGitUtils { */ private static List getRefs(Repository repository, String refs, boolean fullName, int maxCount) { + return getRefs(repository, refs, fullName, maxCount, 0); + } + + /** + * Returns a list of references in the repository matching "refs". If the + * repository is null or empty, an empty list is returned. + * + * @param repository + * @param refs + * if unspecified, all refs are returned + * @param fullName + * if true, /refs/something/yadayadayada is returned. If false, + * yadayadayada is returned. + * @param maxCount + * if < 0, all references are returned + * @param offset + * if maxCount provided sets the starting point of the records to return + * @return list of references + */ + private static List getRefs(Repository repository, String refs, boolean fullName, + int maxCount, int offset) { List list = new ArrayList(); if (maxCount == 0) { return list; @@ -1771,7 +1810,14 @@ public class JGitUtils { Collections.sort(list); Collections.reverse(list); if (maxCount > 0 && list.size() > maxCount) { - list = new ArrayList(list.subList(0, maxCount)); + if (offset < 0) { + offset = 0; + } + int endIndex = offset + maxCount; + if (endIndex > list.size()) { + endIndex = list.size(); + } + list = new ArrayList(list.subList(offset, endIndex)); } } catch (IOException e) { error(e, repository, "{0} failed to retrieve {1}", refs); -- cgit v1.2.3 From 9ff0c16b05cb0eb7c3cc63eda763b0f75d84853c Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 8 May 2014 13:09:08 -0400 Subject: Change enum name and unit test RSS tag queries --- releases.moxie | 2 + src/main/java/com/gitblit/Constants.java | 6 +-- .../com/gitblit/servlet/SyndicationServlet.java | 6 +-- .../java/com/gitblit/utils/SyndicationUtils.java | 57 ++++++++++++++++++++++ src/site/rpc.mkd | 1 + .../com/gitblit/tests/SyndicationUtilsTest.java | 36 +++++++++++++- 6 files changed, 101 insertions(+), 7 deletions(-) (limited to 'src/main/java') diff --git a/releases.moxie b/releases.moxie index 228fc7e6..96a0ae91 100644 --- a/releases.moxie +++ b/releases.moxie @@ -13,9 +13,11 @@ r24: { changes: ~ additions: - Add FORK_REPOSITORY RPC request type (issue-371, pr-161, ticket-65) + - Add object type (ot) parameter for RSS queries to retrieve tag details (pr-165, ticket-66) dependencyChanges: ~ contributors: - Manisha Gayathri + - Gerard Smyth } # diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index 2007c0a8..95eb944a 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -405,11 +405,11 @@ public class Constants { /** * Enumeration of the feed content object types. */ - public static enum FeedContentObjectType { + public static enum FeedObjectType { COMMIT, TAG; - public static FeedContentObjectType forName(String name) { - for (FeedContentObjectType type : values()) { + public static FeedObjectType forName(String name) { + for (FeedObjectType type : values()) { if (type.name().equalsIgnoreCase(name)) { return type; } diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java index 9650ee3a..631df781 100644 --- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java +++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java @@ -164,9 +164,9 @@ public class SyndicationServlet extends DaggerServlet { } } - Constants.FeedContentObjectType objectType = Constants.FeedContentObjectType.COMMIT; + Constants.FeedObjectType objectType = Constants.FeedObjectType.COMMIT; if (!StringUtils.isEmpty(request.getParameter("ot"))) { - Constants.FeedContentObjectType type = Constants.FeedContentObjectType.forName(request.getParameter("ot")); + Constants.FeedObjectType type = Constants.FeedObjectType.forName(request.getParameter("ot")); if (type != null) { objectType = type; } @@ -249,7 +249,7 @@ public class SyndicationServlet extends DaggerServlet { feedDescription = model.description; } - if (objectType == Constants.FeedContentObjectType.TAG) { + if (objectType == Constants.FeedObjectType.TAG) { String urlPattern; if (mountParameters) { diff --git a/src/main/java/com/gitblit/utils/SyndicationUtils.java b/src/main/java/com/gitblit/utils/SyndicationUtils.java index 2ee1cf69..93e9321a 100644 --- a/src/main/java/com/gitblit/utils/SyndicationUtils.java +++ b/src/main/java/com/gitblit/utils/SyndicationUtils.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; import com.gitblit.Constants; +import com.gitblit.Constants.FeedObjectType; import com.gitblit.GitBlitException; import com.gitblit.models.FeedEntryModel; import com.sun.syndication.feed.synd.SyndCategory; @@ -137,6 +138,59 @@ public class SyndicationUtils { */ public static List readFeed(String url, String repository, String branch, int numberOfEntries, int page, String username, char[] password) throws IOException { + return readFeed(url, repository, branch, FeedObjectType.COMMIT, numberOfEntries, + page, username, password); + } + + /** + * Reads tags from the specified repository. + * + * @param url + * the url of the Gitblit server + * @param repository + * the repository name + * @param branch + * the branch name (optional) + * @param numberOfEntries + * the number of entries to retrieve. if <= 0 the server default + * is used. + * @param page + * 0-indexed. used to paginate the results. + * @param username + * @param password + * @return a list of SyndicationModel entries + * @throws {@link IOException} + */ + public static List readTags(String url, String repository, + int numberOfEntries, int page, String username, char[] password) throws IOException { + return readFeed(url, repository, null, FeedObjectType.TAG, numberOfEntries, + page, username, password); + } + + /** + * Reads a Gitblit RSS feed. + * + * @param url + * the url of the Gitblit server + * @param repository + * the repository name + * @param branch + * the branch name (optional) + * @param objectType + * the object type to return (optional, COMMIT assummed) + * @param numberOfEntries + * the number of entries to retrieve. if <= 0 the server default + * is used. + * @param page + * 0-indexed. used to paginate the results. + * @param username + * @param password + * @return a list of SyndicationModel entries + * @throws {@link IOException} + */ + private static List readFeed(String url, String repository, String branch, + FeedObjectType objectType, int numberOfEntries, int page, String username, + char[] password) throws IOException { // build feed url List parameters = new ArrayList(); if (numberOfEntries > 0) { @@ -148,6 +202,9 @@ public class SyndicationUtils { if (!StringUtils.isEmpty(branch)) { parameters.add("h=" + branch); } + if (objectType != null) { + parameters.add("ot=" + objectType.name()); + } return readFeed(url, parameters, repository, branch, username, password); } diff --git a/src/site/rpc.mkd b/src/site/rpc.mkd index 2e502e2c..302084fb 100644 --- a/src/site/rpc.mkd +++ b/src/site/rpc.mkd @@ -32,6 +32,7 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The url parameterdefaultdescription standard query repositoryrequiredrepository name is part of the url (see examples below) +ot=optional
      default: COMMITobject type to return in results. COMMIT or TAG h=optional
      default: HEADstarting branch, ref, or commit id l=optional
      default: web.syndicationEntriesmaximum return count pg=optional
      default: 0page number for paging
      (offset into history = pagenumber*maximum return count) diff --git a/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java b/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java index d206bbdb..b4bb044f 100644 --- a/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java +++ b/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java @@ -21,7 +21,10 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import com.gitblit.Constants.SearchType; @@ -30,6 +33,20 @@ import com.gitblit.utils.SyndicationUtils; public class SyndicationUtilsTest extends GitblitUnitTest { + private static final AtomicBoolean started = new AtomicBoolean(false); + + @BeforeClass + public static void startGitblit() throws Exception { + started.set(GitBlitSuite.startGitblit()); + } + + @AfterClass + public static void stopGitblit() throws Exception { + if (started.get()) { + GitBlitSuite.stopGitblit(); + } + } + @Test public void testSyndication() throws Exception { List entries = new ArrayList(); @@ -60,7 +77,7 @@ public class SyndicationUtilsTest extends GitblitUnitTest { } @Test - public void testFeedRead() throws Exception { + public void testFeedReadCommits() throws Exception { Set links = new HashSet(); for (int i = 0; i < 2; i++) { List feed = SyndicationUtils.readFeed(GitBlitSuite.url, "ticgit.git", @@ -76,6 +93,23 @@ public class SyndicationUtilsTest extends GitblitUnitTest { assertEquals("Feed pagination failed", 10, links.size()); } + @Test + public void testFeedReadTags() throws Exception { + Set links = new HashSet(); + for (int i = 0; i < 2; i++) { + List feed = SyndicationUtils.readTags(GitBlitSuite.url, "test/gitective.git", + 5, i, GitBlitSuite.account, GitBlitSuite.password.toCharArray()); + assertTrue(feed != null); + assertTrue(feed.size() > 0); + assertEquals(5, feed.size()); + for (FeedEntryModel entry : feed) { + links.add(entry.link); + } + } + // confirm we have 10 unique tags + assertEquals("Feed pagination failed", 10, links.size()); + } + @Test public void testSearchFeedRead() throws Exception { List feed = SyndicationUtils -- cgit v1.2.3 From 99b43dffe86b635e97f625157083cee37ee921bf Mon Sep 17 00:00:00 2001 From: peto268 Date: Sat, 26 Apr 2014 14:08:31 +0200 Subject: Added option to disable deleting of non empty repositories through the user interface --- src/main/distrib/data/gitblit.properties | 5 ++++ .../wicket/panels/ProjectRepositoryPanel.java | 30 +++++++++++++++++----- .../gitblit/wicket/panels/RepositoriesPanel.java | 28 +++++++++++++++----- 3 files changed, 50 insertions(+), 13 deletions(-) (limited to 'src/main/java') diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 3215094e..30e97896 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -766,6 +766,11 @@ web.authenticateAdminPages = true # SINCE 0.5.0 web.allowCookieAuthentication = true +# Allow deleting of non empty repositories through the user interface. +# +# SINCE 1.6.0 +web.allowDeletingNonEmptyRepositories = true + # Config file for storing project metadata # # SINCE 1.2.0 diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java index a0f8ac48..2c84ac06 100644 --- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java @@ -145,20 +145,36 @@ public class ProjectRepositoryPanel extends BasePanel { @Override public void onClick() { - if (app().repositories().deleteRepositoryModel(entry)) { + // refresh the model + RepositoryModel model = app().repositories().getRepositoryModel(entry.name); + if (isDeleteAllowed(model) && + app().repositories().deleteRepositoryModel(model)) { // redirect to the owning page - if (entry.isPersonalRepository()) { - setResponsePage(getPage().getClass(), WicketUtils.newUsernameParameter(entry.projectPath.substring(1))); + if (model.isPersonalRepository()) { + setResponsePage(getPage().getClass(), WicketUtils.newUsernameParameter(model.projectPath.substring(1))); } else { - setResponsePage(getPage().getClass(), WicketUtils.newProjectParameter(entry.projectPath)); + setResponsePage(getPage().getClass(), WicketUtils.newProjectParameter(model.projectPath)); } } else { - error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), entry)); + error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), model)); } } + + @Override + public boolean isEnabled() { + return isDeleteAllowed(entry); + } + + private boolean isDeleteAllowed( + final RepositoryModel model) { + return app().settings().getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true) + || !model.hasCommits; + } }; - deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( - localizer.getString("gb.deleteRepository", parent), entry))); + if (deleteLink.isEnabled()) { + deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( + localizer.getString("gb.deleteRepository", parent), entry))); + } repositoryLinks.add(deleteLink); } } else { diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java index be5d960b..40cd77e6 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java @@ -334,20 +334,36 @@ public class RepositoriesPanel extends BasePanel { @Override public void onClick() { - if (app().repositories().deleteRepositoryModel(entry)) { + // refresh the model + RepositoryModel model = app().repositories().getRepositoryModel(entry.name); + if (isDeleteAllowed(model) && + app().repositories().deleteRepositoryModel(model)) { if (dp instanceof SortableRepositoriesProvider) { - info(MessageFormat.format(getString("gb.repositoryDeleted"), entry)); - ((SortableRepositoriesProvider) dp).remove(entry); + info(MessageFormat.format(getString("gb.repositoryDeleted"), model)); + ((SortableRepositoriesProvider) dp).remove(model); } else { setResponsePage(getPage().getClass(), getPage().getPageParameters()); } } else { - error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), entry)); + error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), model)); } } + + @Override + public boolean isEnabled() { + return isDeleteAllowed(entry); + } + + private boolean isDeleteAllowed( + final RepositoryModel model) { + return app().settings().getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true) + || !model.hasCommits; + } }; - deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( - getString("gb.deleteRepository"), entry))); + if (deleteLink.isEnabled()) { + deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( + getString("gb.deleteRepository"), entry))); + } repositoryLinks.add(deleteLink); row.add(repositoryLinks); } else if (showOwner) { -- cgit v1.2.3 From 07ddbb3a490ef40426c234c75bce91a851ced975 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Thu, 8 May 2014 21:13:12 +0200 Subject: Add option to explicitly specify the use of STARTTLS Required for servers that use STARTTLS without SMTPS such as Office 365 --- src/main/distrib/data/gitblit.properties | 5 +++++ src/main/java/com/gitblit/service/MailService.java | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src/main/java') diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 3215094e..fd30b6d7 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -1410,6 +1410,11 @@ mail.debug = false # use SMTPs flag mail.smtps = false +# use STARTTLS flag +# +# SINCE 1.6.0 +mail.starttls = false + # if your smtp server requires authentication, supply the credentials here # # SINCE 0.6.0 diff --git a/src/main/java/com/gitblit/service/MailService.java b/src/main/java/com/gitblit/service/MailService.java index 4759d177..ae9727fc 100644 --- a/src/main/java/com/gitblit/service/MailService.java +++ b/src/main/java/com/gitblit/service/MailService.java @@ -68,6 +68,7 @@ public class MailService implements Runnable { final String mailUser = settings.getString(Keys.mail.username, null); final String mailPassword = settings.getString(Keys.mail.password, null); final boolean smtps = settings.getBoolean(Keys.mail.smtps, false); + final boolean starttls = settings.getBoolean(Keys.mail.starttls, false); boolean authenticate = !StringUtils.isEmpty(mailUser) && !StringUtils.isEmpty(mailPassword); String server = settings.getString(Keys.mail.server, ""); if (StringUtils.isEmpty(server)) { @@ -86,6 +87,7 @@ public class MailService implements Runnable { props.setProperty("mail.smtp.port", String.valueOf(port)); props.setProperty("mail.smtp.auth", String.valueOf(authenticate)); props.setProperty("mail.smtp.auths", String.valueOf(authenticate)); + props.setProperty("mail.smtp.starttls.enable", String.valueOf(starttls)); if (isGMail || smtps) { props.setProperty("mail.smtp.starttls.enable", "true"); -- cgit v1.2.3 From db040113c4c3b450b535360624baa6053599ad43 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 9 May 2014 08:00:14 -0400 Subject: Add confirm milestone deletion prompt --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 2 ++ .../java/com/gitblit/wicket/pages/EditMilestonePage.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index d0c2d48c..12430ade 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -676,6 +676,8 @@ gb.myTickets = my tickets gb.yourAssignedTickets = assigned to you gb.newMilestone = new milestone gb.editMilestone = edit milestone +gb.deleteMilestone = Delete milestone \"{0}\"? +gb.milestoneDeleteFailed = Failed to delete milestone ''{0}''! gb.notifyChangedOpenTickets = send notification for changed open tickets gb.overdue = overdue gb.openMilestones = open milestones diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java index d6f58e7b..4ed77d83 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java @@ -15,6 +15,7 @@ */ package com.gitblit.wicket.pages; +import java.text.MessageFormat; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -30,6 +31,7 @@ import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -41,6 +43,7 @@ import com.gitblit.tickets.TicketMilestone; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation; /** * Page for creating a new milestone. @@ -157,11 +160,12 @@ public class EditMilestonePage extends RepositoryPage { cancel.setDefaultFormProcessing(false); form.add(cancel); - Button delete = new Button("delete") { + Link delete = new Link("delete") { + private static final long serialVersionUID = 1L; @Override - public void onSubmit() { + public void onClick() { UserModel currentUser = GitBlitWebSession.get().getUser(); String createdBy = currentUser.username; boolean notify = notificationModel.getObject(); @@ -169,11 +173,14 @@ public class EditMilestonePage extends RepositoryPage { if (app().tickets().deleteMilestone(getRepositoryModel(), oldName, createdBy, notify)) { setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName)); } else { - // TODO error processing + error(MessageFormat.format(getString("gb.milestoneDeleteFailed"), oldName)); } } }; - delete.setDefaultFormProcessing(false); + + delete.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( + getString("gb.deleteMilestone"), oldName))); + form.add(delete); } -- cgit v1.2.3 From b4ed66fda03d83fd281ca9cbeae0a1c7785489e4 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 9 May 2014 07:57:14 -0400 Subject: Move delete repository function into the edit page --- releases.moxie | 5 ++- src/main/distrib/data/gitblit.properties | 2 +- .../java/com/gitblit/manager/GitblitManager.java | 5 +++ .../com/gitblit/manager/IRepositoryManager.java | 9 ++++ .../com/gitblit/manager/RepositoryManager.java | 17 ++++++++ .../gitblit/wicket/pages/EditRepositoryPage.html | 2 +- .../gitblit/wicket/pages/EditRepositoryPage.java | 34 +++++++++++++++ .../wicket/panels/ProjectRepositoryPanel.html | 9 ---- .../wicket/panels/ProjectRepositoryPanel.java | 50 +--------------------- .../gitblit/wicket/panels/RepositoriesPanel.html | 4 -- .../gitblit/wicket/panels/RepositoriesPanel.java | 49 +-------------------- 11 files changed, 74 insertions(+), 112 deletions(-) (limited to 'src/main/java') diff --git a/releases.moxie b/releases.moxie index 96a0ae91..a5cfed95 100644 --- a/releases.moxie +++ b/releases.moxie @@ -10,7 +10,8 @@ r24: { text: ~ security: ~ fixes: ~ - changes: ~ + changes: + - Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67) additions: - Add FORK_REPOSITORY RPC request type (issue-371, pr-161, ticket-65) - Add object type (ot) parameter for RSS queries to retrieve tag details (pr-165, ticket-66) @@ -18,6 +19,8 @@ r24: { contributors: - Manisha Gayathri - Gerard Smyth + settings: + - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' } } # diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 30e97896..ab5311ce 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -766,7 +766,7 @@ web.authenticateAdminPages = true # SINCE 0.5.0 web.allowCookieAuthentication = true -# Allow deleting of non empty repositories through the user interface. +# Allow deletion of non-empty repositories. This is enforced for all delete vectors. # # SINCE 1.6.0 web.allowDeletingNonEmptyRepositories = true diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java index 2782e724..16c71ba6 100644 --- a/src/main/java/com/gitblit/manager/GitblitManager.java +++ b/src/main/java/com/gitblit/manager/GitblitManager.java @@ -1014,6 +1014,11 @@ public class GitblitManager implements IGitblit { repositoryManager.updateConfiguration(r, repository); } + @Override + public boolean canDelete(RepositoryModel model) { + return repositoryManager.canDelete(model); + } + @Override public boolean deleteRepositoryModel(RepositoryModel model) { return repositoryManager.deleteRepositoryModel(model); diff --git a/src/main/java/com/gitblit/manager/IRepositoryManager.java b/src/main/java/com/gitblit/manager/IRepositoryManager.java index 69177f1e..f5cf03fa 100644 --- a/src/main/java/com/gitblit/manager/IRepositoryManager.java +++ b/src/main/java/com/gitblit/manager/IRepositoryManager.java @@ -338,6 +338,15 @@ public interface IRepositoryManager extends IManager { */ void updateConfiguration(Repository r, RepositoryModel repository); + /** + * Returns true if the repository can be deleted. + * + * @param model + * @return true if the repository can be deleted + * @since 1.6.0 + */ + boolean canDelete(RepositoryModel model); + /** * Deletes the repository from the file system and removes the repository * permission from all repository users. diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java index 7351eb97..c141f088 100644 --- a/src/main/java/com/gitblit/manager/RepositoryManager.java +++ b/src/main/java/com/gitblit/manager/RepositoryManager.java @@ -1532,6 +1532,17 @@ public class RepositoryManager implements IRepositoryManager { } } + /** + * Returns true if the repository can be deleted. + * + * @return true if the repository can be deleted + */ + @Override + public boolean canDelete(RepositoryModel repository) { + return settings.getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true) + || !repository.hasCommits; + } + /** * Deletes the repository from the file system and removes the repository * permission from all repository users. @@ -1553,6 +1564,12 @@ public class RepositoryManager implements IRepositoryManager { */ @Override public boolean deleteRepository(String repositoryName) { + RepositoryModel repository = getRepositoryModel(repositoryName); + if (!canDelete(repository)) { + logger.warn("Attempt to delete {} rejected!", repositoryName); + return false; + } + try { close(repositoryName); // clear the repository cache diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html index f82ac3d5..b7a1976f 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -112,7 +112,7 @@
      -
       
      +
         
      diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java index cd0da5f4..412c0ecc 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java @@ -42,6 +42,7 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.form.RadioChoice; import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.CompoundPropertyModel; @@ -68,6 +69,7 @@ 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.BasePanel.JavascriptEventConfirmation; import com.gitblit.wicket.panels.BulletListPanel; import com.gitblit.wicket.panels.RegistrantPermissionsPanel; @@ -614,6 +616,38 @@ public class EditRepositoryPage extends RootSubPage { cancel.setDefaultFormProcessing(false); form.add(cancel); + // the user can delete if deletions are allowed AND the user is an admin or the personal owner + // assigned ownership is not sufficient to allow deletion + boolean canDelete = !isCreate && app().repositories().canDelete(repositoryModel) + && (user.canAdmin() || user.isMyPersonalRepository(repositoryModel.name)); + + Link delete = new Link("delete") { + + private static final long serialVersionUID = 1L; + + @Override + public void onClick() { + RepositoryModel latestModel = app().repositories().getRepositoryModel(repositoryModel.name); + boolean canDelete = app().repositories().canDelete(latestModel); + if (canDelete) { + if (app().repositories().deleteRepositoryModel(latestModel)) { + info(MessageFormat.format(getString("gb.repositoryDeleted"), latestModel)); + setResponsePage(RepositoriesPage.class); + } else { + error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), latestModel)); + } + } else { + error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), latestModel)); + } + } + }; + + if (canDelete) { + delete.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( + getString("gb.deleteRepository"), repositoryModel))); + } + form.add(delete.setVisible(canDelete)); + add(form); } diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html index d5a87d3f..33345a0a 100644 --- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html @@ -5,15 +5,6 @@ lang="en"> - - - - | - | [edit] - | [delete] - - - diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java index 2c84ac06..8630d201 100644 --- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java @@ -15,7 +15,6 @@ */ package com.gitblit.wicket.panels; -import java.text.MessageFormat; import java.util.Map; import org.apache.wicket.Component; @@ -24,7 +23,6 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.ExternalLink; -import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Fragment; import com.gitblit.Constants.AccessRestrictionType; @@ -129,54 +127,10 @@ public class ProjectRepositoryPanel extends BasePanel { user = UserModel.ANONYMOUS; } Fragment repositoryLinks; - boolean showOwner = entry.isOwner(user.username); - // owner of personal repository gets admin powers - boolean showAdmin = isAdmin || entry.isUsersPersonalRepository(user.username); - - if (showAdmin || showOwner) { - repositoryLinks = new Fragment("repositoryLinks", showAdmin ? "repositoryAdminLinks" - : "repositoryOwnerLinks", this); + if (user.canAdmin(entry)) { + repositoryLinks = new Fragment("repositoryLinks", "repositoryOwnerLinks", this); repositoryLinks.add(new BookmarkablePageLink("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name))); - if (showAdmin) { - Link deleteLink = new Link("deleteRepository") { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick() { - // refresh the model - RepositoryModel model = app().repositories().getRepositoryModel(entry.name); - if (isDeleteAllowed(model) && - app().repositories().deleteRepositoryModel(model)) { - // redirect to the owning page - if (model.isPersonalRepository()) { - setResponsePage(getPage().getClass(), WicketUtils.newUsernameParameter(model.projectPath.substring(1))); - } else { - setResponsePage(getPage().getClass(), WicketUtils.newProjectParameter(model.projectPath)); - } - } else { - error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), model)); - } - } - - @Override - public boolean isEnabled() { - return isDeleteAllowed(entry); - } - - private boolean isDeleteAllowed( - final RepositoryModel model) { - return app().settings().getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true) - || !model.hasCommits; - } - }; - if (deleteLink.isEnabled()) { - deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( - localizer.getString("gb.deleteRepository", parent), entry))); - } - repositoryLinks.add(deleteLink); - } } else { repositoryLinks = new Fragment("repositoryLinks", "repositoryUserLinks", this); } diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html index 0cf3ef29..c3ec2e27 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html @@ -42,10 +42,6 @@
      - - [edit] | [delete] - - [edit] diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java index 40cd77e6..54e2aab9 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java @@ -15,7 +15,6 @@ */ package com.gitblit.wicket.panels; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -320,53 +319,7 @@ public class RepositoriesPanel extends BasePanel { WicketUtils.setHtmlTooltip(lastChangeLabel, getString("gb.author") + ": " + entry.lastChangeAuthor); } - boolean showOwner = user != null && entry.isOwner(user.username); - boolean myPersonalRepository = showOwner && entry.isUsersPersonalRepository(user.username); - if (showAdmin || myPersonalRepository) { - Fragment repositoryLinks = new Fragment("repositoryLinks", - "repositoryAdminLinks", this); - repositoryLinks.add(new BookmarkablePageLink("editRepository", - EditRepositoryPage.class, WicketUtils - .newRepositoryParameter(entry.name))); - Link deleteLink = new Link("deleteRepository") { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick() { - // refresh the model - RepositoryModel model = app().repositories().getRepositoryModel(entry.name); - if (isDeleteAllowed(model) && - app().repositories().deleteRepositoryModel(model)) { - if (dp instanceof SortableRepositoriesProvider) { - info(MessageFormat.format(getString("gb.repositoryDeleted"), model)); - ((SortableRepositoriesProvider) dp).remove(model); - } else { - setResponsePage(getPage().getClass(), getPage().getPageParameters()); - } - } else { - error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), model)); - } - } - - @Override - public boolean isEnabled() { - return isDeleteAllowed(entry); - } - - private boolean isDeleteAllowed( - final RepositoryModel model) { - return app().settings().getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true) - || !model.hasCommits; - } - }; - if (deleteLink.isEnabled()) { - deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format( - getString("gb.deleteRepository"), entry))); - } - repositoryLinks.add(deleteLink); - row.add(repositoryLinks); - } else if (showOwner) { + if (user != null && user.canAdmin(entry)) { Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryOwnerLinks", this); repositoryLinks.add(new BookmarkablePageLink("editRepository", -- cgit v1.2.3 From 9e7b14b651cf3812718d33665529de919c05795d Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 15 May 2014 08:10:20 -0400 Subject: Redesign the EmptyRepositoryPage --- releases.moxie | 1 + .../gitblit/wicket/pages/EmptyRepositoryPage.html | 87 +++++++++++---------- .../gitblit/wicket/pages/EmptyRepositoryPage.java | 17 ++-- .../wicket/pages/EmptyRepositoryPage_es.html | 88 +++++++++++---------- .../wicket/pages/EmptyRepositoryPage_ko.html | 91 +++++++++++----------- .../wicket/pages/EmptyRepositoryPage_nl.html | 87 +++++++++++---------- .../wicket/pages/EmptyRepositoryPage_pl.html | 86 ++++++++++---------- .../wicket/pages/EmptyRepositoryPage_pt_BR.html | 86 ++++++++++---------- .../wicket/pages/EmptyRepositoryPage_zh_CN.html | 89 ++++++++++----------- .../com/gitblit/wicket/pages/RepositoryPage.java | 33 ++++---- .../java/com/gitblit/wicket/pages/create_git.md | 6 ++ .../java/com/gitblit/wicket/pages/existing_git.md | 2 + 12 files changed, 347 insertions(+), 326 deletions(-) create mode 100644 src/main/java/com/gitblit/wicket/pages/create_git.md create mode 100644 src/main/java/com/gitblit/wicket/pages/existing_git.md (limited to 'src/main/java') diff --git a/releases.moxie b/releases.moxie index 86896d35..c0c243a8 100644 --- a/releases.moxie +++ b/releases.moxie @@ -20,6 +20,7 @@ r24: { - BARNUM: Create ticket/N instead of topic/N for pt start N (ticket-61) - Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67) - Update the Korean translation (pr-184, ticket-69) + - Overhaul the EmptyRepositoryPage (ticket-73) additions: - Add My Tickets page (issue-215, ticket-15) - Added CRUD functionality for Ticket Milestones (ticket-17) diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html index c5f9bc95..ebd513ad 100644 --- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html @@ -7,52 +7,53 @@
      -

      Empty Repository

      -

      -
      -
      -
      - [repository] is an empty repository and can not be viewed by Gitblit. -

      - Please push some commits to -

      -
      - After you have pushed commits you may refresh this page to view your repository. -
      -
      -
      +
      +
      +
      +

      Empty Repository

      +
      + [repository] is an empty repository and can not be viewed by Gitblit. +

      + Please push some commits to +
      + After you have pushed commits you may refresh this page to view your repository. +
      -

      Git Command-Line Syntax

      - If you do not have a local Git repository, then you should clone this repository, commit some files, and then push your commits back to Gitblit. -

      - 
      
-		
      
-		If you already have a local Git repository with commits, then you may add this repository as a remote and push to it.
-		
      
-		
      
-		
      
-		If your repository is meant to be kept in sync with an upstream repository, then you may add it.
-		
      
-		
      
-		
      
-		
      Learn Git
      
-		If you are unsure how to use this information, consider reviewing the Git Community Book or Pro Git for a better understanding on how to use Git.
-		
      
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+	
+	
      
+		
      Learn Git
      
+		
      If you are unsure how to use this information, consider reviewing the Git Community Book for a better understanding on how to use Git.
      
+
 		
      Open Source Git Clients
      
-		
        
-			
      • Git - the official, command-line Git
        • 
-			
      • TortoiseGit - Windows file explorer integration (requires official, command-line Git)
        • 
-			
      • Eclipse/EGit - Git for the Eclipse IDE (based on JGit, like Gitblit)
        • 
-			
      • Git Extensions - C# frontend for Git that features Windows Explorer and Visual Studio integration
        • 
-			
      • GitX-dev - a Mac OS X Git client
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      Gitthe official, command-line Git
      TortoiseGitWindows file explorer integration (requires official, command-line Git)
      Eclipse/EGitGit for the Eclipse IDE (based on JGit, like Gitblit)
      Git ExtensionsC# frontend for Git that features Windows Explorer and Visual Studio integration
      GitX-deva Mac OS X Git client
      
+
 		
      Commercial/Closed-Source Git Clients
      
-		
        
-			
      • SmartGit/Hg - A Java Git and Mercurial client for Windows, Mac, and Linux
        • 
-			
      • SourceTree - A free Git and Mercurial client for Windows & Mac
        • 
-			
      • Tower - a Mac OS X Git client
        • 
-		
      
+		
+		
+			
+			
+			
+		
+		
      SmartGit/HgA Java Git and Mercurial client for Windows, Mac, and Linux
      SourceTreeA free Git and Mercurial client for Windows & Mac
      Towera Mac OS X Git client
      
+	
      
+
      
+
      
+
      
 
      
       	
 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 00bac634..b3c52436 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -15,7 +15,6 @@
  */
 package com.gitblit.wicket.pages;
 
-import java.text.MessageFormat;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -32,7 +31,7 @@ import com.gitblit.wicket.GitblitRedirectException;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.RepositoryUrlPanel;
 
-public class EmptyRepositoryPage extends RootPage {
+public class EmptyRepositoryPage extends RepositoryPage {
 
 	public EmptyRepositoryPage(PageParameters params) {
 		super(params);
@@ -50,8 +49,6 @@ public class EmptyRepositoryPage extends RootPage {
 			throw new GitblitRedirectException(SummaryPage.class, params);
 		}
 
-		setupPage(repositoryName, getString("gb.emptyRepository"));
-
 		UserModel user = GitBlitWebSession.get().getUser();
 		if (user == null) {
 			user = UserModel.ANONYMOUS;
@@ -62,15 +59,17 @@ public class EmptyRepositoryPage extends RootPage {
 		RepositoryUrl primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0);
 		String url = primaryUrl != null ? primaryUrl.url : "";
 
+		String createSyntax = readResource("create_git.md").replace("${primaryUrl}", url);
+		String existingSyntax = readResource("existing_git.md").replace("${primaryUrl}", url);
+
 		add(new Label("repository", repositoryName));
 		add(new RepositoryUrlPanel("pushurl", false, user, repository));
-		add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url)));
-		add(new Label("remoteSyntax", MessageFormat.format("git remote add origin {0}\ngit push -u origin --all\ngit push -u origin --tags", url)));
-		add(new Label("upstreamSyntax", "git remote add upstream "));
+		add(new Label("createSyntax", createSyntax));
+		add(new Label("existingSyntax", existingSyntax));
 	}
 
 	@Override
-	protected Class getRootNavPageClass() {
-		return RepositoriesPage.class;
+	protected String getPageName() {
+		return getString("gb.summary");
 	}
 }
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
index f98cb050..0f168bff 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
@@ -9,52 +9,54 @@
 
 
 
      
-		
      Repositorio Vacío
      
-		
      
-		
      
-			
      
-				
      
-					[repository] es un repositorio vacío y no puede ser visto en Gitblit.
-					
      
-					Por favor, empuja algunas consignas a 
-					
      
-					
      
-					Después de empujar tus consignas puedes refrescar ésta página para ver tu repositorio.
-				
      
-			
      
-		
      
+
      
+
      
+
      	
+	
      Repositorio Vacío
      
+	
      
+		[repository] es un repositorio vacío y no puede ser visto en Gitblit.
+		
      		
+		Por favor, empuja algunas consignas a 
+		
      
+		Después de empujar tus consignas puedes refrescar ésta página para ver tu repositorio.
+	
      
 		
-		
      Sintaxis de la Línea de Comandos de Git
      
-		Si no tienes un repositiorio local Git, puedes clonar éste, consignar algunos archivos, y después empujar las consignas de vuelta a Gitblit.
-		
      
-		
      
-		
      
-		Si ya tienes un repositorio local Git con algunas consignas, puedes añadir éste como remoto y empujar desde allí.
-		
      
-		
      
-		Si el repositorio está pensado para mantenerse sincronizado con otro repositorio corriente-arriba, entonces puedes añadirlo.
-		
      
-		
      
-		
      
-		
      Aprender sobre Git
      
-		Si no estás seguro de como usar esta información, échale un vistazo al Libro de la cominidad Git o Pro Git para una mejor compresión de como usar Git.
-		
      
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+
+	
      
+		
      Aprender sobre Git
      
+		
      Si no estás seguro de como usar esta información, échale un vistazo al Libro de la cominidad Git para una mejor compresión de como usar Git.
      
+
 		
      Clientes Git de Código abierto.
      
-		
        
-			
      • Git - El Git oficial en línea de comandos
        • 
-			
      • TortoiseGit - Explorador de archivos integrado en Windows (necesita Git oficial en línea de comandos)
        • 
-			
      • Eclipse/EGit - Git para el IDE de Eclipse (basado en JGit, como Gitblit)
        • 
-			
      • Git Extensions - Interfaz de usuario gráfico Git en C# con integración en IE y en Visual Studio
        • 
-			
      • GitX-dev - Cliente Git para Mac OS X
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      GitEl Git oficial en línea de comandos
      TortoiseGitExplorador de archivos integrado en Windows (necesita Git oficial en línea de comandos)
      Eclipse/EGitGit para el IDE de Eclipse (basado en JGit, como Gitblit)
      Git ExtensionsInterfaz de usuario gráfico Git en C# con integración en IE y en Visual Studio
      GitX-devCliente Git para Mac OS X
      
+
 		
      Clientes Git comerciales
      
-		
        
-			
      • SmartGit/Hg - aplicación Java (necesita Git oficial en línea de comandos)
        • 
-			
      • SourceTree - Un cliente Git gratuito para Mac, Mercurial, y SVN
        • 
-			
      • Tower - Cliente Git para Mac OS X
        • 
-		
      
-
      		
+		
+		
+			
+			
+			
+		
+		
      SmartGit/Hgaplicación Java (necesita Git oficial en línea de comandos)
      SourceTreeUn cliente Git gratuito para Mac, Mercurial, y SVN
      TowerCliente Git para Mac OS X
      
+	
      
+
      
+
      
+
      
+
      
 	
 
 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
index 4027f0e3..bd1f4f5f 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
@@ -7,55 +7,54 @@
 
 
 
      
-		
      비어있는 저장소
      
-		
      
-		
      
-			
      
-				
      
-					[repository] 저장소는 비어 있어서 Gitblit 에서 볼 수 없습니다.
-					
      
-					이 Git url 에 커밋해 주세요. 
-					
      
-					
      
-					After you have pushed commits you may refresh this page to view your repository.
-				
      
-			
      
-		
      
+
      
+
      
+
      	
+	
      비어있는 저장소
      
+	
      
+		[repository] 저장소는 비어 있어서 Gitblit 에서 볼 수 없습니다.
+		
      		
+		이 Git url 에 커밋해 주세요. 
+		
      
+		After you have pushed commits you may refresh this page to view your repository.
+	
      
+		
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+
+	
      
+		
      Git 배우기
      
+		
      만약 사용법에 자신이 없다면, Git 사용법을 더 잘 이해하기 위해 
+			 Git Community Book 또는 을 볼 것을 고려해 보세요.
      
 
-		
      
-		
      Git 명령어
      
-		로컬 Git 저장소가 없다면, 이 저장소를 클론(clone) 한 후, 몇 파일을 커밋하고, 그 커밋을 Gitblit 에 푸시(push) 하세요.
-		
      
-		
      
-		
      
-		만약 커밋된 로컬 Git 저장소가 있다면, 다음과 같이 저장소에 리모트를 추가하고 푸시(push)할 수 있습니다.
-		
      
-		
      
-		If your repository is meant to be kept in sync with an upstream repository, then you may add it.
-		
      
-		
      
-		
      
-		
      Git 배우기
      
-		만약 사용법에 자신이 없다면, Git 사용법을 더 잘 이해하기 위해 
-		 Git Community Book 또는 
-		 Pro Git, 
-		 Pro Git 한글 을 볼 것을 고려해 보세요.
-		
      
 		
      오픈소스 Git 클라이언트
      
-		
        
-			
      • Git - 명령어 기반 공식 Git
        • 
-			
      • TortoiseGit - 윈도의 파일 탐색기에 통합된 UI 클라이언트 (명령어 기반 공식 Git 필요)
        • 
-			
      • Eclipse/EGit - 이클립스 IDE 플러그인 (Gitblit 과 같은 JGit 기반)
        • 
-			
      • Git Extensions - C# frontend for Git that features Windows Explorer and Visual Studio integration
        • 
-			
      • GitX-dev - a Mac OS X Git client
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      Git명령어 기반 공식 Git
      TortoiseGit윈도의 파일 탐색기에 통합된 UI 클라이언트 (명령어 기반 공식 Git 필요)
      Eclipse/EGit이클립스 IDE 플러그인 (Gitblit 과 같은 JGit 기반)
      Git ExtensionsC# frontend for Git that features Windows Explorer and Visual Studio integration
      GitX-deva Mac OS X Git client
      
+
 		
      유료 Git 클라이언트
      
-		
        
-			
      • SmartGit/Hg - 자바 어플리케이션 (명령어 기반 공식 Git 필요)
        • 
-			
      • SourceTree - A free Mac Client for Git, Mercurial, and SVN
        • 
-			
      • Tower - a Mac OS X Git client
        • 
-		
      
+		
+		
+			
+			
+			
+		
+		
      SmartGit/Hg자바 어플리케이션 (명령어 기반 공식 Git 필요)
      SourceTreeA free Git and Mercurial client for Windows & Mac
      Towera Mac OS X Git client
      
+	
      
+
      
+
      
+
      
 
      
       	
 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
index 1fc3fe8d..dd58ed46 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
@@ -7,52 +7,53 @@
 
 
 
      
-	
      Lege Repository
      
-	
      
-		
      
-			
      
-				
      
-					[repository] is een lege repository en kan niet bekeken worden door Gitblit.
-					
      		
-					Push alstublieft een paar commits naar 
-					
      
-					
      
-					Nadat u een commits gepushed heeft, kunt u deze pagina verversen om uw repository te bekijken.
-				
      
-			
      
-		
      
+
      
+
      
+
      	
+	
      Lege Repository
      
+	
      
+		[repository] is een lege repository en kan niet bekeken worden door Gitblit.
+		
      		
+		Push alstublieft een paar commits naar 
+		
      
+		Nadat u een commits gepushed heeft, kunt u deze pagina verversen om uw repository te bekijken.
+	
      
 		
-		
      Git Command-Line Syntax
      
-		Als u geen lokale Git repository heeft, kunt u deze repository clonen, er bestanden naar committen en dan uw commits terug pushen naar Gitblit.
-		
      
-		
      
-		
      
-		Als u al een lokale Git repository met commits heeft, kunt u deze repository als een remote toevoegen en er naar pushen.
-		
      
-		
      
-		
      
-		Indien uw repository bedoeld is om synchroon gehouden te worden met een upstream repository, dan kunt u deze toevoegen.
-		
      
-		
      
-		
      
-		
      Leer Git
      
-		Als u niet goed weet wat u met deze informatie aan moet, raden we u aan om het Git Community Book of Pro Git te bestuderen voor een beter begrip over hoe u Git kunt gebruiken.
-		
      
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+
+	
      
+		
      Leer Git
      
+		
      Als u niet goed weet wat u met deze informatie aan moet, raden we u aan om het Git Community Book te bestuderen voor een beter begrip over hoe u Git kunt gebruiken.
      
+
 		
      Open Source Git Clients
      
-		
        
-			
      • Git - de officiele, command-line Git
        • 
-			
      • TortoiseGit - Windows bestandsverkenner ingetratie (officiele command-line Git is wel nodig)
        • 
-			
      • Eclipse/EGit - Git voor de Eclipse IDE (gebaseerd op JGit, zoals Gitblit)
        • 
-			
      • Git Extensions - C# frontend voor Git met Windows Explorer en Visual Studio integratie
        • 
-			
      • GitX-dev - een Mac OS X Git client
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      Gitde officiele, command-line Git
      TortoiseGitWindows bestandsverkenner ingetratie (officiele command-line Git is wel nodig)
      Eclipse/EGitGit voor de Eclipse IDE (gebaseerd op JGit, zoals Gitblit)
      Git ExtensionsC# frontend voor Git met Windows Explorer en Visual Studio integratie
      GitX-deveen Mac OS X Git client
      
+
 		
      Commercial/Closed-Source Git Clients
      
-		
        
-			
      • SmartGit/Hg - Een Java Git, Mercurial, en SVN client applicatie (officiele command-line Git is wel nodig)
        • 
-			
      • SourceTree - Een gratis Mac Client voor Git, Mercurial, en SVN
        • 
-			
      • Tower - een Mac OS X Git client
        • 
-		
      
+		
+		
+			
+			
+			
+		
+		
      SmartGit/HgEen Java Git, Mercurial, en SVN client applicatie (officiele command-line Git is wel nodig)
      SourceTreeEen gratis Mac Client voor Git en Mercurial
      Towereen Mac OS X Git client
      
+	
      
+
      
+
      
+
      
 
      
       	
 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
index 3f9db908..dd0f4a5d 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
@@ -9,51 +9,53 @@
 
 
 
      
-		
      Puste repozytorium
      
-		
      
-		
      
-			
      
-				
      
-					[repository] jest pustym repozytorium i nie może być zaprezentowane przez Gitblit.
-					
      
-					Wgraj, poprzez push, dowolne zmiany do lokalizacji 
-					
      
-					
      
-					Po wgraniu zmian odśwież stronę, aby podejrzeć repozytorium.
-				
      
-			
      
-		
      
+
      
+
      
+
      	
+	
      Puste repozytorium
      
+	
      
+		[repository] jest pustym repozytorium i nie może być zaprezentowane przez Gitblit.
+		
      		
+		Wgraj, poprzez push, dowolne zmiany do lokalizacji 
+		
      
+		Po wgraniu zmian odśwież stronę, aby podejrzeć repozytorium.
+	
      
 		
-		
      Składnia linii poleceń GITa
      
-		Jeśli nie posiadasz lokalnego repozytorium GITa to sklonuj to repozytorium, wgraj dowolne pliki, a następnie wyślij poprzez push zmiany na Gitblit.
-		
      
-		
      
-		
      
-		Gdy posiadasz lokalne repozytorium GITa z dowolnymi zmianami, to możesz dodać to repozytorium jako remote i wysłać do niego zmiany poprzez push.
-		
      
-		
      
-		If your repository is meant to be kept in sync with an upstream repository, then you may add it.
-		
      
-		
      
-		
      
-		
      Nauka GITa
      
-		Jeżeli powyższe informacje są dla Ciebie niezrozumiałe, zapoznaj się z książką Pro Git - Wersja PL dla lepszego zrozumienia, jak poprawnie używać GITa.
-		
      
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+
+	
      
+		
      Nauka GITa
      
+		
      Jeżeli powyższe informacje są dla Ciebie niezrozumiałe, zapoznaj się z książką Pro Git - Wersja PL dla lepszego zrozumienia, jak poprawnie używać GITa.
      
+
 		
      Darmowi klienci GITa
      
-		
        
-			
      • Git - Oficjalny klient, dostępny przez linię poleceń
        • 
-			
      • TortoiseGit - Rozszerzenie eksploratora Windows (wymaga oficjalnego, dostępnego przez linię poleceń klienta)
        • 
-			
      • Eclipse/EGit - GIT dla edytora Eclipse (oparty o JGit, podobnie jak Gitblit)
        • 
-			
      • Git Extensions - napisana w C# fasada na GIT, udostępniająca integrację dla Windows Explorer oraz Visual Studio
        • 
-			
      • GitX-dev - klient GIT na Mac OS X
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      GitOficjalny klient, dostępny przez linię poleceń
      TortoiseGitRozszerzenie eksploratora Windows (wymaga oficjalnego, dostępnego przez linię poleceń klienta)
      Eclipse/EGitGIT dla edytora Eclipse (oparty o JGit, podobnie jak Gitblit)
      Git Extensionsnapisana w C# fasada na GIT, udostępniająca integrację dla Windows Explorer oraz Visual Studio
      GitX-devklient GIT na Mac OS X
      
+
 		
      Komercyjni klienci GITa
      
-		
        
-			
      • SmartGit/Hg - aplikacja napisana w Javie (wymaga oficjalnego, dostępnego przez linię poleceń klienta)
        • 
-			
      • SourceTree - darmowy klient GIT, Mercurial i SVN na Mac OS X
        • 
-			
      • Tower - klient GIT na Mac OS X
        • 
-		
      
+		
+		
+			
+			
+			
+		
+		
      SmartGit/Hgaplikacja napisana w Javie (wymaga oficjalnego, dostępnego przez linię poleceń klienta)
      SourceTreedarmowy klient GIT, Mercurial i SVN na Mac OS X
      Towerklient GIT na Mac OS X
      
+	
      
+
      
+
      
+
      
 
      
       	
 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
index 351fe872..0182d87e 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
@@ -7,51 +7,53 @@
 
 
 
      
-	
      Repositório Vazio
      
-	
      
-		
      
-			
      
-				
      
-					[repository] é um repositório vazio e não pode ser visualizado pelo Gitblit.
-					
      		
-					Por favor faça o push de alguns commits para 
-					
      
-					
      
-					Depois de ter feito push você poderá atualizar esta página para visualizar seu repositório.
-				
      
-			
      
-		
      
+
      
+
      
+
      	
+	
      Repositório Vazio
      
+	
      
+		[repository] é um repositório vazio e não pode ser visualizado pelo Gitblit.
+		
      		
+		Por favor faça o push de alguns commits para 
+		
      
+		Depois de ter feito push você poderá atualizar esta página para visualizar seu repositório.
+	
      
 		
-		
      Sintaxe dos comandos do Git
      
-		Se você ainda não tem um repositório local do Git, então você deve primeiro clonar este repositório, fazer commit de alguns arquivos e então fazer push desses commits para o Gitblit.
-		
      
-		
      
-		
      
-		Se você já tem um repositório Git local com alguns commits, então você deve adicionar este repositório como uma referência remota e então fazer push.
-		
      
-		
      
-		If your repository is meant to be kept in sync with an upstream repository, then you may add it.
-		
      
-		
      
-		
      
-		
      Aprenda Git
      
-		Se você estiver com dúvidas sobre como ultilizar essas informações, uma sugestão seria dar uma olhada no livro Git Community Book ou Pro Git para entender melhor como usar o Git.
-		
      
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+
+	
      
+		
      Aprenda Git
      
+		
      Se você estiver com dúvidas sobre como ultilizar essas informações, uma sugestão seria dar uma olhada no livro Git Community Book para entender melhor como usar o Git.
      
+
 		
      Alguns clients do Git que são Open Source
      
-		
        
-			
      • Git - o Git oficial através de linhas de comando
        • 
-			
      • TortoiseGit - Faz integração do Explorer do Windows com o Git (por isso requer o Git Oficial)
        • 
-			
      • Eclipse/EGit - Git para a IDE Eclipse (baseada no JGit, como o Gitblit)
        • 
-			
      • Git Extensions - Interface (em C#) para o Git cuja a característica é a integração com o Windows Explorer e o Visual Studio
        • 
-			
      • GitX-dev - um Cliente do Git para Mac OS X
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      Gito Git oficial através de linhas de comando
      TortoiseGitFaz integração do Explorer do Windows com o Git (por isso requer o Git Oficial)
      Eclipse/EGitGit para a IDE Eclipse (baseada no JGit, como o Gitblit)
      Git ExtensionsInterface (em C#) para o Git cuja a característica é a integração com o Windows Explorer e o Visual Studio
      GitX-devum Cliente do Git para Mac OS X
      
+
 		
      Clients do Git proprietários ou com Código Proprietário
      
-		
        
-			
      • SmartGit/Hg - Aplicação Client (em Java) para Git, Mercurial, e SVN (por isso requer o Git Oficial)
        • 
-			
      • SourceTree - Client gratuito para o Mac que suporta Git, Mercurial e SVN
        • 
-			
      • Tower - um Cliente do Git para Mac OS X
        • 
-		
      
+		
+		
+			
+			
+			
+		
+		
      SmartGit/HgAplicação Client (em Java) para Git e Mercurial (por isso requer o Git Oficial)
      SourceTreeClient gratuito para o Mac que suporta Git e Mercurial
      Towerum Cliente do Git para Mac OS X
      
+	
      
+
      
+
      
+
      
 
      
       	
 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
index 955b4312..151abc42 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
@@ -7,53 +7,54 @@
 
 
 
      
-	
      空版本库
      
-	
      
-		
      
-			
      
-				
      
-					[repository] 版本库目前为空。
-                    Gitblit 无法查看。
-					
      		
-					请往此网址进行推送 
-					
      
-					
      
-					当你推送完毕后你可以 刷新 此页面重新查看您的版本库。
-				
      
-			
      
-		
      
+
      
+
      
+
      	
+	
      空版本库
      
+	
      
+		[repository] 版本库目前为空。
+		Gitblit 无法查看。
+		
      		
+		请往此网址进行推送 
+		
      
+		当你推送完毕后你可以 刷新 此页面重新查看您的版本库。
+	
      
 		
-		
      Git 命令行格式
      
-		如果您没有本地 Git 版本库, 您可以克隆此版本库, 提交一些文件, 然后将您的提交推送回Gitblit。
-		
      
-		
      
-		
      
-		如果您已经有一个本地的提交过的版本库, 那么您可以将此版本库加为远程
-        版本库，并进行推送。
-		
      
-		
      
-		If your repository is meant to be kept in sync with an upstream repository, then you may add it.
-		
      
-		
      
-		
      
-		
      学习 Git
      
-		如果您不明白这些信息什么意思, 您可以参考 Git Community Book 或者 Pro Git 去更加深入的学习 Git 的用法。
-		
      
+	
      Create a new repository on the command-line
      
+
+	
      
+
+	
      Push an existing repository from the command-line
      
+
+	
      
+
+	
      
+		
      学习 Git
      
+		
      如果您不明白这些信息什么意思, 您可以参考 Git Community Book 去更加深入的学习 Git 的用法。
      
+
 		
      开源 Git 客户端
      
-		
        
-			
      • Git - 官方, 命令行版本 Git
        • 
-			
      • TortoiseGit - 与 Windows 资源管理器集成 (需要官方, 命令行 Git 的支持)
        • 
-			
      • Eclipse/EGit - Git for the Eclipse IDE (基于 JGit, 类似 Gitblit)
        • 
-			
      • Git Extensions - C# 版本的 Git 前端，与 Windows 资源管理器和 Visual Studio 集成
        • 
-			
      • GitX-dev - Mac OS X Git 客户端
        • 			
-		
      
-		
      
+		
+		
+			
+			
+			
+			
+			
+					
+		
      Git官方, 命令行版本 Git
      TortoiseGit与 Windows 资源管理器集成 (需要官方, 命令行 Git 的支持)
      Eclipse/EGitGit for the Eclipse IDE (基于 JGit, 类似 Gitblit)
      Git ExtensionsC# 版本的 Git 前端，与 Windows 资源管理器和 Visual Studio 集成
      GitX-devMac OS X Git 客户端
      
+
 		
      商业/闭源 Git 客户端
      
-		
        
-			
      • SmartGit/Hg - Java 版本的支持 Git, Mercurial 和 SVN 客户端应用 (需要官方, 命令行 Git 的支持)
        • 
-			
      • SourceTree - 免费的 Mac Git Mercurial 以及 SVN 客户端, Mercurial, and SVN
        • 
-			
      • Tower - Mac OS X Git 客户端
        • 
-		
      
+		
+		
+			
+			
+			
+		
+		
      SmartGit/HgJava 版本的支持 Git, Mercurial 和 SVN 客户端应用 (需要官方, 命令行 Git 的支持)
      SourceTree免费的 Mac Git Mercurial 以及 SVN 客户端 and Mercurial
      TowerMac OS X Git 客户端
      
+	
      
+
      
+
      
+
      
 
      
       	
 
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index a0c9ce01..fcf659af 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -108,7 +108,7 @@ public abstract class RepositoryPage extends RootPage {
 			error(MessageFormat.format(getString("gb.repositoryNotSpecifiedFor"), getPageName()), true);
 		}
 
-		if (!getRepositoryModel().hasCommits) {
+		if (!getRepositoryModel().hasCommits && getClass() != EmptyRepositoryPage.class) {
 			throw new RestartResponseException(EmptyRepositoryPage.class, params);
 		}
 
@@ -148,6 +148,16 @@ public abstract class RepositoryPage extends RootPage {
 			}
 		}
 
+		showAdmin = false;
+		if (app().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
+			boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
+			showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
+		} else {
+			showAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
+		}
+		isOwner = GitBlitWebSession.get().isLoggedIn()
+				&& (getRepositoryModel().isOwner(GitBlitWebSession.get().getUsername()));
+
 		// register the available navigation links for this page and user
 		List navLinks = registerNavLinks();
 
@@ -195,9 +205,14 @@ public abstract class RepositoryPage extends RootPage {
 			navLinks.add(new PageNavLink("gb.summary", SummaryPage.class, params));
 		} else {
 			navLinks.add(new PageNavLink("gb.summary", SummaryPage.class, params));
-//			pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
+			//			pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
 			navLinks.add(new PageNavLink("gb.reflog", ReflogPage.class, params));
 		}
+
+		if (!model.hasCommits) {
+			return navLinks;
+		}
+
 		navLinks.add(new PageNavLink("gb.commits", LogPage.class, params));
 		navLinks.add(new PageNavLink("gb.tree", TreePage.class, params));
 		if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(model) || app().tickets().hasTickets(model))) {
@@ -229,16 +244,6 @@ public abstract class RepositoryPage extends RootPage {
 			navLinks.addAll(ext.getNavLinks(user, model));
 		}
 
-		// Conditionally add edit link
-		showAdmin = false;
-		if (app().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
-			boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
-			showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
-		} else {
-			showAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
-		}
-		isOwner = GitBlitWebSession.get().isLoggedIn()
-				&& (model.isOwner(GitBlitWebSession.get().getUsername()));
 		return navLinks;
 	}
 
@@ -311,7 +316,7 @@ public abstract class RepositoryPage extends RootPage {
 		}
 
 		// (un)star link allows a user to star a repository
-		if (user.isAuthenticated) {
+		if (user.isAuthenticated && model.hasCommits) {
 			PageParameters starParams = DeepCopier.copy(getPageParameters());
 			starParams.put(PARAM_STAR, !user.getPreferences().isStarredRepository(model.name));
 			String toggleStarUrl = getRequestCycle().urlFor(getClass(), starParams).toString();
@@ -338,7 +343,7 @@ public abstract class RepositoryPage extends RootPage {
 		} else {
 			String fork = app().repositories().getFork(user.username, model.name);
 			boolean hasFork = fork != null;
-			boolean canFork = user.canFork(model);
+			boolean canFork = user.canFork(model) && model.hasCommits;
 
 			if (hasFork || !canFork) {
 				// user not allowed to fork or fork already exists or repo forbids forking
diff --git a/src/main/java/com/gitblit/wicket/pages/create_git.md b/src/main/java/com/gitblit/wicket/pages/create_git.md
new file mode 100644
index 00000000..309ac675
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/create_git.md
@@ -0,0 +1,6 @@
+    touch README.md
+    git init
+    git add README.md
+    git commit -m "first commit"
+    git remote add origin ${primaryUrl}
+    git push -u origin master
diff --git a/src/main/java/com/gitblit/wicket/pages/existing_git.md b/src/main/java/com/gitblit/wicket/pages/existing_git.md
new file mode 100644
index 00000000..0a6fad9a
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/existing_git.md
@@ -0,0 +1,2 @@
+    git remote add origin ${primaryUrl}
+    git push -u origin master
-- 
cgit v1.2.3


From c58ecd545d07f42701fafc79eeb6322a3379bb09 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 15 May 2014 08:10:53 -0400
Subject: Prohibit ticket updates for empty repositories

---
 src/main/java/com/gitblit/tickets/ITicketService.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/tickets/ITicketService.java b/src/main/java/com/gitblit/tickets/ITicketService.java
index a6a7a75a..668d0bcc 100644
--- a/src/main/java/com/gitblit/tickets/ITicketService.java
+++ b/src/main/java/com/gitblit/tickets/ITicketService.java
@@ -251,6 +251,7 @@ public abstract class ITicketService {
 	 */
 	public boolean isAcceptingTicketUpdates(RepositoryModel repository) {
 		return isReady()
+				&& repository.hasCommits
 				&& repository.isBare
 				&& !repository.isFrozen
 				&& !repository.isMirror;
-- 
cgit v1.2.3


From 51c923705de3c466faa002146a0b544991bf4b22 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 15 May 2014 08:11:39 -0400
Subject: Remove the edit link and the rss feed link from the repositories
 panel

---
 .../gitblit/wicket/panels/RepositoriesPanel.html   | 20 +-----
 .../gitblit/wicket/panels/RepositoriesPanel.java   | 74 +---------------------
 2 files changed, 4 insertions(+), 90 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
index c3ec2e27..9ac525ad 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -42,10 +42,6 @@
 		
      	
 	
 
-	
-		[edit]
-	
-
 	
 		
 			
@@ -56,8 +52,7 @@
 			Owner
 			
 			Last Change
-			
-			
+			
 		
 	
 	
@@ -71,8 +66,7 @@
 			Owner
 			
 			Last Change
-			
-			
+			
 		
 	
 	
@@ -87,15 +81,7 @@
         [repository owner]
         
         [last change]
-        [repository size]
-        
-        	
-        		
-				
-					
-				
-			
-						
+        [repository size]
 	
 	
 
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index 54e2aab9..d8e23bea 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -31,7 +31,6 @@ 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.link.ExternalLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.repeater.Item;
@@ -46,7 +45,6 @@ import com.gitblit.Keys;
 import com.gitblit.models.ProjectModel;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
-import com.gitblit.servlet.SyndicationServlet;
 import com.gitblit.utils.ArrayUtils;
 import com.gitblit.utils.ModelUtils;
 import com.gitblit.utils.StringUtils;
@@ -140,12 +138,11 @@ public class RepositoriesPanel extends BasePanel {
 				Collections.sort(subModels);
 				groupedModels.addAll(subModels);
 			}
-			dp = new RepositoriesProvider(groupedModels);
+			dp = new ListDataProvider(groupedModels);
 		} else {
 			dp = new SortableRepositoriesProvider(models);
 		}
 
-		final String baseUrl = WicketUtils.getGitblitURL(getRequest());
 		final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true);
 
 		DataView dataView = new DataView("row", dp) {
@@ -319,18 +316,6 @@ public class RepositoriesPanel extends BasePanel {
 					WicketUtils.setHtmlTooltip(lastChangeLabel, getString("gb.author") + ": " + entry.lastChangeAuthor);
 				}
 
-				if (user != null && user.canAdmin(entry)) {
-					Fragment repositoryLinks = new Fragment("repositoryLinks",
-							"repositoryOwnerLinks", this);
-					repositoryLinks.add(new BookmarkablePageLink("editRepository",
-							EditRepositoryPage.class, WicketUtils
-									.newRepositoryParameter(entry.name)));
-					row.add(repositoryLinks);
-				} else {
-					row.add(new Label("repositoryLinks"));
-				}
-				row.add(new ExternalLink("syndication", SyndicationServlet.asLink(baseUrl,
-						entry.name, null, 0)).setVisible(linksActive));
 				WicketUtils.setAlternatingBackground(item, counter);
 				counter++;
 			}
@@ -387,59 +372,6 @@ public class RepositoriesPanel extends BasePanel {
 		};
 	}
 
-	private static class RepositoriesProvider extends ListDataProvider {
-
-		private static final long serialVersionUID = 1L;
-
-		public RepositoriesProvider(List list) {
-			super(list);
-		}
-
-		@Override
-		public List getData() {
-			return super.getData();
-		}
-
-		public void remove(RepositoryModel model) {
-			int index = getData().indexOf(model);
-			RepositoryModel groupModel = null;
-			if (index == (getData().size() - 1)) {
-				// last element
-				if (index > 0) {
-					// previous element is group header, then this is last
-					// repository in group. remove group too.
-					if (getData().get(index - 1) instanceof GroupRepositoryModel) {
-						groupModel = getData().get(index - 1);
-					}
-				}
-			} else if (index < (getData().size() - 1)) {
-				// not last element. check next element for group match.
-				if (getData().get(index - 1) instanceof GroupRepositoryModel
-						&& getData().get(index + 1) instanceof GroupRepositoryModel) {
-					// repository is sandwiched by group headers so this
-					// repository is the only element in the group. remove
-					// group.
-					groupModel = getData().get(index - 1);
-				}
-			}
-
-			if (groupModel == null) {
-				// Find the group and decrement the count
-				for (int i = index; i >= 0; i--) {
-					if (getData().get(i) instanceof GroupRepositoryModel) {
-						((GroupRepositoryModel) getData().get(i)).count--;
-						break;
-					}
-				}
-			} else {
-				// Remove the group header
-				getData().remove(groupModel);
-			}
-
-			getData().remove(model);
-		}
-	}
-
 	private static class SortableRepositoriesProvider extends SortableDataProvider {
 
 		private static final long serialVersionUID = 1L;
@@ -451,10 +383,6 @@ public class RepositoriesPanel extends BasePanel {
 			setSort(SortBy.date.name(), false);
 		}
 
-		public void remove(RepositoryModel model) {
-			list.remove(model);
-		}
-
 		@Override
 		public int size() {
 			if (list == null) {
-- 
cgit v1.2.3


From 88730095c09fc5b9822a25aff919ca32f2a54508 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 15 May 2014 13:28:49 -0400
Subject: Process bugtraq links in the ticket description and comments

---
 releases.moxie                                         | 1 +
 src/main/java/com/gitblit/wicket/pages/TicketPage.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/releases.moxie b/releases.moxie
index 7c12f30b..049a2826 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -22,6 +22,7 @@ r24: {
     - Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67)
     - Update the Korean translation (pr-184, ticket-69)
     - Overhaul the EmptyRepositoryPage (ticket-73)
+    - Process bugtraq links in the ticket description and comments (ticket-78)
     additions:
     - Add My Tickets page (issue-215, ticket-15)
     - Added CRUD functionality for Ticket Milestones (ticket-17)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index c066f24d..c8ec2f8c 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -278,7 +278,8 @@ public class TicketPage extends RepositoryPage {
 		if (StringUtils.isEmpty(ticket.body)) {
 			desc = getString("gb.noDescriptionGiven");
 		} else {
-			desc = MarkdownUtils.transformGFM(app().settings(), ticket.body, ticket.repository);
+			String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);
+			desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);
 		}
 		add(new Label("ticketDescription", desc).setEscapeModelStrings(false));
 
@@ -685,7 +686,8 @@ public class TicketPage extends RepositoryPage {
 						/*
 						 * COMMENT
 						 */
-						String comment = MarkdownUtils.transformGFM(app().settings(), entry.comment.text, repositoryName);
+						String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, entry.comment.text);
+						String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);
 						Fragment frag = new Fragment("entry", "commentFragment", this);
 						Label commentIcon = new Label("commentIcon");
 						if (entry.comment.src == CommentSource.Email) {
-- 
cgit v1.2.3


From c59584f08d46de4a1b9515f4fd1535426ce603b3 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 15 May 2014 17:14:41 -0400
Subject: Add startup/shutdown LifeCycle extension point

---
 releases.moxie                                     |  3 +-
 .../com/gitblit/extensions/LifeCycleListener.java  | 43 ++++++++++++++++++++++
 .../java/com/gitblit/servlet/GitblitContext.java   | 20 ++++++++++
 src/site/plugins_extensions.mkd                    | 31 +++++++++++++++-
 4 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/gitblit/extensions/LifeCycleListener.java

(limited to 'src/main/java')

diff --git a/releases.moxie b/releases.moxie
index 049a2826..718e79c5 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -14,7 +14,6 @@ r24: {
     - Fix failure to generate SSH server keys on ARM (issue-426, ticket-70)
     - Fix flotr2 chart generation failure if a label contained a single-quote (ticket-77)
     changes:
-    - Added extension points for top nav links, root-level pages, repository nav links, user menu links, and http request filters (ticket-23)
     - Split the pages servlet into a raw servlet and a pages servlet. All raw links now use the raw servlet (issue-413, ticket-49)
     - Drop deprecated --set-upstream syntax for -u (ticket-59)
     - BARNUM: Prune deleted branches on fetch (git fetch -p) (ticket-60)
@@ -27,9 +26,11 @@ r24: {
     - Add My Tickets page (issue-215, ticket-15)
     - Added CRUD functionality for Ticket Milestones (ticket-17)
     - Implemented Ticket migration tool to move between backends (ticket-19)
+    - Added extension points for top nav links, root-level pages, repository nav links, user menu links, and http request filters (ticket-23)
     - Add FORK_REPOSITORY RPC request type (issue-371, pr-161, ticket-65)
     - Add object type (ot) parameter for RSS queries to retrieve tag details (pr-165, ticket-66)
     - Add setting to allow STARTTLS without requiring SMTPS (pr-183)
+    - Added an extension point for monitoring onStartup and onShutdown (ticket-79)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
     contributors:
diff --git a/src/main/java/com/gitblit/extensions/LifeCycleListener.java b/src/main/java/com/gitblit/extensions/LifeCycleListener.java
new file mode 100644
index 00000000..84c7348d
--- /dev/null
+++ b/src/main/java/com/gitblit/extensions/LifeCycleListener.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 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.extensions;
+
+import ro.fortsoft.pf4j.ExtensionPoint;
+
+/**
+ * Extension point to allow plugins to listen to major Gitblit lifecycle events.
+ *
+ * @author James Moger
+ * @since 1.6.0
+ */
+public abstract class LifeCycleListener implements ExtensionPoint {
+
+	/**
+	 * Called after all internal managers have been started.
+	 * This may be useful for reporting "server is ready" to a monitoring system.
+	 *
+	 * @since 1.6.0
+	 */
+	public abstract void onStartup();
+
+	/**
+	 * Called when the servlet container is gracefully shutting-down the webapp.
+	 * This is called before the internal managers are stopped.
+	 *
+	 *  @since 1.6.0
+	 */
+	public abstract void onShutdown();
+}
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index ebe2cc2b..110e553c 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -38,6 +38,7 @@ import com.gitblit.IStoredSettings;
 import com.gitblit.Keys;
 import com.gitblit.WebXmlSettings;
 import com.gitblit.dagger.DaggerContext;
+import com.gitblit.extensions.LifeCycleListener;
 import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblit;
@@ -191,6 +192,15 @@ public class GitblitContext extends DaggerContext {
 		logger.info("");
 		logger.info("All managers started.");
 		logger.info("");
+
+		IPluginManager pluginManager = injector.get(IPluginManager.class);
+		for (LifeCycleListener listener : pluginManager.getExtensions(LifeCycleListener.class)) {
+			try {
+				listener.onStartup();
+			} catch (Throwable t) {
+				logger.error(null, t);
+			}
+		}
 	}
 
 	private String lookupBaseFolderFromJndi() {
@@ -225,6 +235,16 @@ public class GitblitContext extends DaggerContext {
 	@Override
 	protected void destroyContext(ServletContext context) {
 		logger.info("Gitblit context destroyed by servlet container.");
+
+		IPluginManager pluginManager = getManager(IPluginManager.class);
+		for (LifeCycleListener listener : pluginManager.getExtensions(LifeCycleListener.class)) {
+			try {
+				listener.onShutdown();
+			} catch (Throwable t) {
+				logger.error(null, t);
+			}
+		}
+
 		for (IManager manager : managers) {
 			logger.debug("stopping {}", manager.getClass().getSimpleName());
 			manager.stop();
diff --git a/src/site/plugins_extensions.mkd b/src/site/plugins_extensions.mkd
index 7bf63c17..99b6400f 100644
--- a/src/site/plugins_extensions.mkd
+++ b/src/site/plugins_extensions.mkd
@@ -54,7 +54,7 @@ public class ExamplePlugin extends GitblitPlugin {
 }
 
 /**
- * You can also create Webapp plugins that register mounted pages.
+ * You can also create Webapp plugins that register pages.
  */
 public class ExampleWicketPlugin extends GitblitWicketPlugin {
     @Override
@@ -285,3 +285,32 @@ public class MyNavLink extends NavLinkExtension {
     }
 }
 ```
+
+### Lifecycle Listener
+
+*SINCE 1.6.0*
+
+You can provide a lifecycle listener to be notified when Gitblit has completely started and just before Gitblit is gracefully terminated.
+
+```java
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import ro.fortsoft.pf4j.Extension;
+import com.gitblit.extensions.LifeCycleListener;
+
+@Extension
+public class MyLifeCycleListener extends LifeCycleListener {
+
+    final Logger log = LoggerFactory.getLogger(getClass());
+    
+    @Override
+    public void onStartup() {
+    	log.info("Gitblit is Ready!!");
+    }
+
+    @Override
+    public void onShutdown() {
+    	log.info("Gitblit is Going Down!!");
+    }
+}
+```
\ No newline at end of file
-- 
cgit v1.2.3


From d07b16755045eeb28f3802e610c67325481ad5bf Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 22 May 2014 17:26:21 -0400
Subject: Correct usage of bugtraq processor

---
 src/main/java/com/gitblit/wicket/pages/TicketPage.java       | 6 +++---
 src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index c8ec2f8c..c282695b 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -278,7 +278,7 @@ public class TicketPage extends RepositoryPage {
 		if (StringUtils.isEmpty(ticket.body)) {
 			desc = getString("gb.noDescriptionGiven");
 		} else {
-			String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);
+			String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.body);
 			desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);
 		}
 		add(new Label("ticketDescription", desc).setEscapeModelStrings(false));
@@ -507,7 +507,7 @@ public class TicketPage extends RepositoryPage {
 			add(new Label("ticketTopic").setVisible(false));
 		} else {
 			// process the topic using the bugtraq config to link things
-			String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);
+			String topic = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.topic);
 			add(new Label("ticketTopic", topic).setEscapeModelStrings(false));
 		}
 
@@ -686,7 +686,7 @@ public class TicketPage extends RepositoryPage {
 						/*
 						 * COMMENT
 						 */
-						String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, entry.comment.text);
+						String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, entry.comment.text);
 						String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);
 						Fragment frag = new Fragment("entry", "commentFragment", this);
 						Label commentIcon = new Label("commentIcon");
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index ab763b8f..1ca483ce 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -123,7 +123,7 @@ public class TicketListPanel extends BasePanel {
 					public void populateItem(final Item labelItem) {
 						BugtraqProcessor btp  = new BugtraqProcessor(app().settings());
 						Repository db = app().repositories().getRepository(repository.name);
-						String content = btp.processPlainCommitMessage(db, repository.name, labelItem.getModelObject());
+						String content = btp.processText(db, repository.name, labelItem.getModelObject());
 						db.close();
 						Label label = new Label("label", content);
 						label.setEscapeModelStrings(false);
-- 
cgit v1.2.3


From fd8cea4761b5382f23d06ed52608d1f556c4dbe5 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 22 May 2014 17:31:30 -0400
Subject: Render GFM links using Markdown, not direct HTML

---
 src/main/java/com/gitblit/utils/MarkdownUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/utils/MarkdownUtils.java b/src/main/java/com/gitblit/utils/MarkdownUtils.java
index da0db79d..2ebfdb26 100644
--- a/src/main/java/com/gitblit/utils/MarkdownUtils.java
+++ b/src/main/java/com/gitblit/utils/MarkdownUtils.java
@@ -136,7 +136,7 @@ public class MarkdownUtils {
 		String canonicalUrl = settings.getString(Keys.web.canonicalUrl, "https://localhost:8443");
 
 		// emphasize and link mentions
-		String mentionReplacement = String.format(" **@$1**", canonicalUrl);
+		String mentionReplacement = String.format(" **[@$1](%1s/user/$1)**", canonicalUrl);
 		text = text.replaceAll("\\s@([A-Za-z0-9-_]+)", mentionReplacement);
 
 		// link ticket refs
@@ -146,7 +146,7 @@ public class MarkdownUtils {
 		// link commit shas
 		int shaLen = settings.getInteger(Keys.web.shortCommitIdLength, 6);
 		String commitPattern = MessageFormat.format("\\s([A-Fa-f0-9]'{'{0}'}')([A-Fa-f0-9]'{'{1}'}')", shaLen, 40 - shaLen);
-		String commitReplacement = String.format(" $1", canonicalUrl, repositoryName);
+		String commitReplacement = String.format(" [`$1`](%1$s/commit?r=%2$s&h=$1$2)", canonicalUrl, repositoryName);
 		text = text.replaceAll(commitPattern, commitReplacement);
 
 		String html = transformMarkdown(text);
-- 
cgit v1.2.3


From d62d883423c4f13e9514c203d2f0b14e4715df7f Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Fri, 23 May 2014 09:01:28 -0400
Subject: Tag server-side merges when incremental push tags are enabled

---
 releases.moxie                                     |   2 +
 .../java/com/gitblit/git/GitblitReceivePack.java   | 144 ++++++++++++---------
 .../java/com/gitblit/git/PatchsetReceivePack.java  |   8 +-
 3 files changed, 93 insertions(+), 61 deletions(-)

(limited to 'src/main/java')

diff --git a/releases.moxie b/releases.moxie
index afd1d8e8..1ca462ea 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -34,6 +34,7 @@ r24: {
     - Add object type (ot) parameter for RSS queries to retrieve tag details (pr-165, ticket-66)
     - Add setting to allow STARTTLS without requiring SMTPS (pr-183)
     - Added an extension point for monitoring onStartup and onShutdown (ticket-79)
+    - Tag server-side merges when incremental push tags are enabled (issue-432, ticket-85)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
     contributors:
@@ -45,6 +46,7 @@ r24: {
     - Berke Viktor
     - Marcus Hunger
     - Matthias Cullmann
+    - Emmeran Seehuber
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
     - { name: 'mail.starttls', defaultValue: 'false' }
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePack.java b/src/main/java/com/gitblit/git/GitblitReceivePack.java
index b4449f06..34bbea27 100644
--- a/src/main/java/com/gitblit/git/GitblitReceivePack.java
+++ b/src/main/java/com/gitblit/git/GitblitReceivePack.java
@@ -331,6 +331,43 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 			return;
 		}
 
+		logRefChange(commands);
+		updateIncrementalPushTags(commands);
+		updateGitblitRefLog(commands);
+
+		// check for updates pushed to the BranchTicketService branch
+		// if the BranchTicketService is active it will reindex, as appropriate
+		for (ReceiveCommand cmd : commands) {
+			if (Result.OK.equals(cmd.getResult())
+					&& BranchTicketService.BRANCH.equals(cmd.getRefName())) {
+				rp.getRepository().fireEvent(new ReceiveCommandEvent(repository, cmd));
+			}
+		}
+
+		// call post-receive plugins
+		for (ReceiveHook hook : gitblit.getExtensions(ReceiveHook.class)) {
+			try {
+				hook.onPostReceive(this, commands);
+			} catch (Exception e) {
+				LOGGER.error("Failed to execute extension", e);
+			}
+		}
+
+		// run Groovy hook scripts
+		Set scripts = new LinkedHashSet();
+		scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));
+		if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {
+			scripts.addAll(repository.postReceiveScripts);
+		}
+		runGroovy(commands, scripts);
+	}
+
+	/**
+	 * Log the ref changes in the container log.
+	 *
+	 * @param commands
+	 */
+	protected void logRefChange(Collection commands) {
 		boolean isRefCreationOrDeletion = false;
 
 		// log ref changes
@@ -362,76 +399,65 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 		if (isRefCreationOrDeletion) {
 			gitblit.resetRepositoryCache(repository.name);
 		}
+	}
 
-		if (repository.useIncrementalPushTags) {
-			// tag each pushed branch tip
-			String emailAddress = user.emailAddress == null ? rp.getRefLogIdent().getEmailAddress() : user.emailAddress;
-			PersonIdent userIdent = new PersonIdent(user.getDisplayName(), emailAddress);
-
-			for (ReceiveCommand cmd : commands) {
-				if (!cmd.getRefName().startsWith(Constants.R_HEADS)) {
-					// only tag branch ref changes
-					continue;
-				}
-
-				if (!ReceiveCommand.Type.DELETE.equals(cmd.getType())
-						&& ReceiveCommand.Result.OK.equals(cmd.getResult())) {
-					String objectId = cmd.getNewId().getName();
-					String branch = cmd.getRefName().substring(Constants.R_HEADS.length());
-					// get translation based on the server's locale setting
-					String template = Translation.get("gb.incrementalPushTagMessage");
-					String msg = MessageFormat.format(template, branch);
-					String prefix;
-					if (StringUtils.isEmpty(repository.incrementalPushTagPrefix)) {
-						prefix = settings.getString(Keys.git.defaultIncrementalPushTagPrefix, "r");
-					} else {
-						prefix = repository.incrementalPushTagPrefix;
-					}
-
-					JGitUtils.createIncrementalRevisionTag(
-							rp.getRepository(),
-							objectId,
-							userIdent,
-							prefix,
-							"0",
-							msg);
-				}
-			}
+	/**
+	 * Optionally update the incremental push tags.
+	 *
+	 * @param commands
+	 */
+	protected void updateIncrementalPushTags(Collection commands) {
+		if (!repository.useIncrementalPushTags) {
+			return;
 		}
 
-		// update push log
-		try {
-			RefLogUtils.updateRefLog(user, rp.getRepository(), commands);
-			LOGGER.debug(MessageFormat.format("{0} push log updated", repository.name));
-		} catch (Exception e) {
-			LOGGER.error(MessageFormat.format("Failed to update {0} pushlog", repository.name), e);
-		}
+		// tag each pushed branch tip
+		String emailAddress = user.emailAddress == null ? getRefLogIdent().getEmailAddress() : user.emailAddress;
+		PersonIdent userIdent = new PersonIdent(user.getDisplayName(), emailAddress);
 
-		// check for updates pushed to the BranchTicketService branch
-		// if the BranchTicketService is active it will reindex, as appropriate
 		for (ReceiveCommand cmd : commands) {
-			if (Result.OK.equals(cmd.getResult())
-					&& BranchTicketService.BRANCH.equals(cmd.getRefName())) {
-				rp.getRepository().fireEvent(new ReceiveCommandEvent(repository, cmd));
+			if (!cmd.getRefName().startsWith(Constants.R_HEADS)) {
+				// only tag branch ref changes
+				continue;
 			}
-		}
 
-		// call post-receive plugins
-		for (ReceiveHook hook : gitblit.getExtensions(ReceiveHook.class)) {
-			try {
-				hook.onPostReceive(this, commands);
-			} catch (Exception e) {
-				LOGGER.error("Failed to execute extension", e);
+			if (!ReceiveCommand.Type.DELETE.equals(cmd.getType())
+					&& ReceiveCommand.Result.OK.equals(cmd.getResult())) {
+				String objectId = cmd.getNewId().getName();
+				String branch = cmd.getRefName().substring(Constants.R_HEADS.length());
+				// get translation based on the server's locale setting
+				String template = Translation.get("gb.incrementalPushTagMessage");
+				String msg = MessageFormat.format(template, branch);
+				String prefix;
+				if (StringUtils.isEmpty(repository.incrementalPushTagPrefix)) {
+					prefix = settings.getString(Keys.git.defaultIncrementalPushTagPrefix, "r");
+				} else {
+					prefix = repository.incrementalPushTagPrefix;
+				}
+
+				JGitUtils.createIncrementalRevisionTag(
+						getRepository(),
+						objectId,
+						userIdent,
+						prefix,
+						"0",
+						msg);
 			}
 		}
+	}
 
-		// run Groovy hook scripts
-		Set scripts = new LinkedHashSet();
-		scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));
-		if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {
-			scripts.addAll(repository.postReceiveScripts);
+	/**
+	 * Update Gitblit's internal reflog.
+	 *
+	 * @param commands
+	 */
+	protected void updateGitblitRefLog(Collection commands) {
+		try {
+			RefLogUtils.updateRefLog(user, getRepository(), commands);
+			LOGGER.debug(MessageFormat.format("{0} reflog updated", repository.name));
+		} catch (Exception e) {
+			LOGGER.error(MessageFormat.format("Failed to update {0} reflog", repository.name), e);
 		}
-		runGroovy(commands, scripts);
 	}
 
 	/** Execute commands to update references. */
diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
index f7412a34..9e55524d 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -1202,11 +1202,15 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 		if (ticket != null) {
 			ticketNotifier.queueMailing(ticket);
 
-			// update the reflog with the merge
 			if (oldRef != null) {
 				ReceiveCommand cmd = new ReceiveCommand(oldRef.getObjectId(),
 						ObjectId.fromString(mergeResult.sha), oldRef.getName());
-				RefLogUtils.updateRefLog(user, getRepository(), Arrays.asList(cmd));
+				cmd.setResult(Result.OK);
+				List commands = Arrays.asList(cmd);
+
+				logRefChange(commands);
+				updateIncrementalPushTags(commands);
+				updateGitblitRefLog(commands);
 			}
 
 			// call patchset hooks
-- 
cgit v1.2.3


From b5e11d843b83261376552dd6fc26d346c82402a4 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Fri, 23 May 2014 11:39:06 -0400
Subject: Do not directly link to the EmptyRepositoryPage

---
 .../java/com/gitblit/wicket/panels/RepositoriesPanel.java     | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index d8e23bea..dd208e23 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -52,7 +52,6 @@ import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.pages.BasePage;
 import com.gitblit.wicket.pages.EditRepositoryPage;
-import com.gitblit.wicket.pages.EmptyRepositoryPage;
 import com.gitblit.wicket.pages.ProjectPage;
 import com.gitblit.wicket.pages.RepositoriesPage;
 import com.gitblit.wicket.pages.SummaryPage;
@@ -204,15 +203,7 @@ public class RepositoriesPanel extends BasePanel {
 				swatch.setVisible(showSwatch);
 
 				if (linksActive) {
-					Class linkPage;
-					if (entry.hasCommits) {
-						// repository has content
-						linkPage = SummaryPage.class;
-					} else {
-						// new/empty repository OR proposed repository
-						linkPage = EmptyRepositoryPage.class;
-					}
-
+					Class linkPage = SummaryPage.class;
 					PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
 					row.add(new LinkPanel("repositoryName", "list", repoName, linkPage, pp));
 					row.add(new LinkPanel("repositoryDescription", "list", entry.description,
-- 
cgit v1.2.3


From fb9cd5968346045e1129406ca54639075316a396 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 29 May 2014 12:40:35 -0400
Subject: Add setting to control thread pool size for default work queue

---
 releases.moxie                                         | 2 ++
 src/main/distrib/data/gitblit.properties               | 6 ++++++
 src/main/java/com/gitblit/manager/ServicesManager.java | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/releases.moxie b/releases.moxie
index 34f855bc..4332238d 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -38,6 +38,7 @@ r24: {
     - Add setting to allow STARTTLS without requiring SMTPS (pr-183)
     - Added an extension point for monitoring onStartup and onShutdown (ticket-79)
     - Tag server-side merges when incremental push tags are enabled (issue-432, ticket-85)
+    - Add setting to control default thread pool size for miscellaneous background tasks (ticket-92)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
     contributors:
@@ -53,6 +54,7 @@ r24: {
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
     - { name: 'mail.starttls', defaultValue: 'false' }
+    - { name: 'execution.defaultThreadPoolSize', defaultValue: '1' }
 }
 
 #
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 7d74c281..b27395c3 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -613,6 +613,12 @@ plugins.folder = ${baseFolder}/plugins
 # SINCE 1.5.0
 plugins.registry = http://plugins.gitblit.com/plugins.json
 
+# Number of threads used to handle miscellaneous tasks in the background.
+#
+# SINCE 1.6.0
+# RESTART REQUIRED
+execution.defaultThreadPoolSize = 1
+
 #
 # Groovy Integration
 #
diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index b1c97ba4..755d8bac 100644
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -80,8 +80,9 @@ public class ServicesManager implements IManager {
 	public ServicesManager(IGitblit gitblit) {
 		this.settings = gitblit.getSettings();
 		this.gitblit = gitblit;
+		int defaultThreadPoolSize = settings.getInteger(Keys.execution.defaultThreadPoolSize, 1);
 		this.idGenerator = new IdGenerator();
-		this.workQueue = new WorkQueue(idGenerator, 1);
+		this.workQueue = new WorkQueue(idGenerator, defaultThreadPoolSize);
 	}
 
 	@Override
-- 
cgit v1.2.3


From 0047fbba99b804d268a66ed7504a568596de6168 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Tue, 27 May 2014 18:13:30 -0400
Subject: Simplified repository creation with a NewRepositoryPage

---
 .gitmodules                                        |   3 +
 build.xml                                          |   6 +
 releases.moxie                                     |   2 +
 src/main/distrib/data/gitblit.properties           |   5 +
 src/main/distrib/data/gitignore                    |   1 +
 src/main/java/com/gitblit/Constants.java           |   8 +
 .../java/com/gitblit/servlet/GitblitContext.java   |  16 +
 .../java/com/gitblit/wicket/GitBlitWebApp.java     |  10 +
 .../com/gitblit/wicket/GitBlitWebApp.properties    |  17 +-
 .../gitblit/wicket/pages/EditRepositoryPage.java   |  16 +-
 .../gitblit/wicket/pages/NewRepositoryPage.html    |  98 ++++
 .../gitblit/wicket/pages/NewRepositoryPage.java    | 493 +++++++++++++++++++++
 .../java/com/gitblit/wicket/pages/RootPage.java    |   2 +-
 .../java/com/gitblit/wicket/pages/UserPage.java    |   4 +-
 .../wicket/panels/FilterableRepositoryList.java    |   3 +-
 .../gitblit/wicket/panels/RepositoriesPanel.java   |   5 +-
 16 files changed, 674 insertions(+), 15 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 src/main/distrib/data/gitignore
 create mode 100644 src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
 create mode 100644 src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java

(limited to 'src/main/java')

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..01eaa2c8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/main/distrib/data/gitignore"]
+	path = src/main/distrib/data/gitignore
+	url = https://github.com/github/gitignore.git
diff --git a/build.xml b/build.xml
index f45c4ca9..be6f1dd2 100644
--- a/build.xml
+++ b/build.xml
@@ -919,6 +919,12 @@
 					
 				
 			
+			
+			
+									
+					
+				
+			
       
 	
 	
diff --git a/releases.moxie b/releases.moxie
index 4332238d..5aa207fa 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -36,6 +36,7 @@ r24: {
     - Add FORK_REPOSITORY RPC request type (issue-371, pr-161, ticket-65)
     - Add object type (ot) parameter for RSS queries to retrieve tag details (pr-165, ticket-66)
     - Add setting to allow STARTTLS without requiring SMTPS (pr-183)
+    - Simplified repository creation, offer simple README generation, and insertion of a pre-defined .gitignore file (ticket-76)
     - Added an extension point for monitoring onStartup and onShutdown (ticket-79)
     - Tag server-side merges when incremental push tags are enabled (issue-432, ticket-85)
     - Add setting to control default thread pool size for miscellaneous background tasks (ticket-92)
@@ -55,6 +56,7 @@ r24: {
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
     - { name: 'mail.starttls', defaultValue: 'false' }
     - { name: 'execution.defaultThreadPoolSize', defaultValue: '1' }
+    - { name: 'git.gitignoreFolder', defaultValue: '${baseFolder}/gitignore' }
 }
 
 #
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 6f55a3eb..d5623cd5 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -271,6 +271,11 @@ git.defaultIncrementalPushTagPrefix = r
 # SINCE 1.4.0
 git.createRepositoriesShared = false
 
+# Directory for gitignore templates used during repository creation.
+#
+# SINCE 1.6.0
+git.gitignoreFolder = ${baseFolder}/gitignore
+
 # Enable JGit-based garbage collection. (!!EXPERIMENTAL!!)
 #
 # USE AT YOUR OWN RISK!
diff --git a/src/main/distrib/data/gitignore b/src/main/distrib/data/gitignore
new file mode 160000
index 00000000..097db81c
--- /dev/null
+++ b/src/main/distrib/data/gitignore
@@ -0,0 +1 @@
+Subproject commit 097db81c08b138dea7cb031eb18eeb16afe44bdf
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 95eb944a..3e307537 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -122,6 +122,14 @@ public class Constants {
 
 	public static final String R_TICKETS_PATCHSETS = "refs/tickets/";
 
+	public static final String R_MASTER = "refs/heads/master";
+
+	public static final String MASTER = "master";
+
+	public static final String R_DEVELOP = "refs/heads/develop";
+
+	public static final String DEVELOP = "develop";
+
 	public static String getVersion() {
 		String v = Constants.class.getPackage().getImplementationVersion();
 		if (v == null) {
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index 110e553c..50f22d5a 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -372,6 +372,22 @@ public class GitblitContext extends DaggerContext {
 			}
 		}
 
+		// Copy the included gitignore files to the configured gitignore folder
+		String gitignorePath = webxmlSettings.getString(Keys.git.gitignoreFolder, "gitignore");
+		File localGitignores = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, base, gitignorePath);
+		if (!localGitignores.exists()) {
+			File warGitignores = new File(contextFolder, "/WEB-INF/data/gitignore");
+			if (!warGitignores.equals(localGitignores)) {
+				try {
+					com.gitblit.utils.FileUtils.copy(localGitignores, warGitignores.listFiles());
+				} catch (IOException e) {
+					logger.error(MessageFormat.format(
+							"Failed to copy included .gitignore files from {0} to {1}",
+							warGitignores, localGitignores));
+				}
+			}
+		}
+
 		// merge the WebXmlSettings into the runtime settings (for backwards-compatibilty)
 		runtimeSettings.merge(webxmlSettings);
 
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index 7291d039..f63ff3d9 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -57,6 +57,7 @@ import com.gitblit.wicket.pages.ComparePage;
 import com.gitblit.wicket.pages.DocPage;
 import com.gitblit.wicket.pages.DocsPage;
 import com.gitblit.wicket.pages.EditMilestonePage;
+import com.gitblit.wicket.pages.EditRepositoryPage;
 import com.gitblit.wicket.pages.EditTicketPage;
 import com.gitblit.wicket.pages.ExportTicketPage;
 import com.gitblit.wicket.pages.FederationRegistrationPage;
@@ -71,6 +72,7 @@ import com.gitblit.wicket.pages.MetricsPage;
 import com.gitblit.wicket.pages.MyDashboardPage;
 import com.gitblit.wicket.pages.MyTicketsPage;
 import com.gitblit.wicket.pages.NewMilestonePage;
+import com.gitblit.wicket.pages.NewRepositoryPage;
 import com.gitblit.wicket.pages.NewTicketPage;
 import com.gitblit.wicket.pages.OverviewPage;
 import com.gitblit.wicket.pages.PatchPage;
@@ -92,6 +94,8 @@ public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {
 
 	private final Class homePageClass = MyDashboardPage.class;
 
+	private final Class newRepositoryPageClass = NewRepositoryPage.class;
+
 	private final Map cacheablePages = new HashMap();
 
 	private final IStoredSettings settings;
@@ -207,6 +211,8 @@ public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {
 		mount("/proposal", ReviewProposalPage.class, "t");
 		mount("/registration", FederationRegistrationPage.class, "u", "n");
 
+		mount("/new", NewRepositoryPage.class);
+		mount("/edit", EditRepositoryPage.class, "r");
 		mount("/activity", ActivityPage.class, "r", "h");
 		mount("/lucene", LuceneSearchPage.class);
 		mount("/project", ProjectPage.class, "p");
@@ -262,6 +268,10 @@ public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {
 		return homePageClass;
 	}
 
+	public Class getNewRepositoryPage() {
+		return newRepositoryPageClass;
+	}
+
 	/* (non-Javadoc)
 	 * @see com.gitblit.wicket.Webapp#isCacheablePage(java.lang.String)
 	 */
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 12430ade..ac589558 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -685,4 +685,19 @@ gb.closedMilestones = closed milestones
 gb.administration = administration
 gb.plugins = plugins
 gb.extensions = extensions
-
+gb.anonymous = Anonymous
+gb.anonymousRepoDescription = Anyone can see, clone, and push to this repository.
+gb.public = Public
+gb.publicRepoDescription = Anyone can see and clone this repository. You choose who can push.
+gb.protected = Protected
+gb.protectedRepoDescription = Anyone can see this repository. You choose who can clone and push.
+gb.private = Private
+gb.privateRepoDescription = You choose who can see, clone, and push to this repository.
+gb.initialCommit = Initial Commit
+gb.initialCommitDescription = This will allow you to git clone this repository immediately. Skip this step if you have already run git init locally.
+gb.initWithReadme = Include a README
+gb.initWithReadmeDescription = This will generate a simple README document for your repository.
+gb.initWithGitignore = Include a .gitignore file
+gb.initWithGitignoreDescription = This will insert a config file that instructs your Git clients to ignore files or directories that match defined patterns.
+gb.initWithGitflow = Include a .gitflow file
+gb.initWithGitflowDescription = This will generate a config file which guides Git clients in setting up Gitflow branches.
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index 412c0ecc..c18cd514 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -429,11 +429,7 @@ public class EditRepositoryPage extends RootSubPage {
 					return;
 				}
 				setRedirect(false);
-				if (isCreate) {
-					setResponsePage(RepositoriesPage.class);
-				} else {
-					setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));
-				}
+				setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));
 			}
 		};
 
@@ -632,7 +628,15 @@ public class EditRepositoryPage extends RootSubPage {
 				if (canDelete) {
 					if (app().repositories().deleteRepositoryModel(latestModel)) {
 						info(MessageFormat.format(getString("gb.repositoryDeleted"), latestModel));
-						setResponsePage(RepositoriesPage.class);
+						if (latestModel.isPersonalRepository()) {
+							// redirect to user's profile page
+							String prefix = app().settings().getString(Keys.git.userRepositoryPrefix, "~");
+							String username = latestModel.projectPath.substring(prefix.length());
+							setResponsePage(UserPage.class, WicketUtils.newUsernameParameter(username));
+						} else {
+							// redirect to server repositories page
+							setResponsePage(RepositoriesPage.class);
+						}
 					} else {
 						error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), latestModel));
 					}
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
new file mode 100644
index 00000000..e9f12027
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
@@ -0,0 +1,98 @@
+
+ 
+
+
+
+	
      
+
      
+	
      
+
+		
+			
+				
+					
+					
+					
+				
+				
+					
+					
+					
+				
+			
+		
      /  
      
+		
+		
      
+			
      
+			
+		
      
+		
+		
      
+		
+		
+			
      
+				
      
+					
+					 
+				
      
+				
      
+					
      
+					
+				
      
+			
      
+		      
+		
+		
      
+		
+		
      
+		
      
+			
      
+		
      
+		
+		
      
+			
      
+				
+			
      
+			
      
+				
      
+				
      
+			
      
+		
      
+		
+		
      
+			
+			
      
+				
+			
      
+			
      
+				
+				
      
+			
      
+		
      
+		
+		
      
+			
      
+				
+			
      
+			
      
+				
      
+				
      
+				
      
+
      
+
      
+
+	
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
new file mode 100644
index 00000000..b0cc3e95
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -0,0 +1,493 @@
+/*
+ * Copyright 2014 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.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.Radio;
+import org.apache.wicket.markup.html.form.RadioGroup;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.dircache.DirCacheBuilder;
+import org.eclipse.jgit.dircache.DirCacheEntry;
+import org.eclipse.jgit.lib.CommitBuilder;
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.RefUpdate.Result;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+
+import com.gitblit.Constants;
+import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AuthorizationControl;
+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.FileUtils;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.wicket.WicketUtils;
+
+public class NewRepositoryPage extends RootSubPage {
+
+	private final RepositoryModel repositoryModel;
+	private RadioGroup permissionGroup;
+	private IModel addReadmeModel;
+	private Model gitignoreModel;
+	private IModel addGitflowModel;
+	private IModel addGitignoreModel;
+
+	public NewRepositoryPage() {
+		// create constructor
+		super();
+		repositoryModel = new RepositoryModel();
+
+		setupPage(getString("gb.newRepository"), "");
+
+		setStatelessHint(false);
+		setOutputMarkupId(true);
+	}
+
+	@Override
+	protected boolean requiresPageMap() {
+		return true;
+	}
+
+	@Override
+	protected Class getRootNavPageClass() {
+		return RepositoriesPage.class;
+	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+
+		CompoundPropertyModel rModel = new CompoundPropertyModel<>(repositoryModel);
+		Form form = new Form("editForm", rModel) {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void onSubmit() {
+
+				// confirm a repository name was entered
+				if (StringUtils.isEmpty(repositoryModel.name)) {
+					error(getString("gb.pleaseSetRepositoryName"));
+					return;
+				}
+
+				String project = repositoryModel.projectPath;
+				String fullName = (project + "/" + repositoryModel.name).trim();
+				fullName = fullName.replace('\\', '/');
+				fullName = fullName.replace("//", "/");
+				if (fullName.charAt(0) == '/') {
+					fullName = fullName.substring(1);
+				}
+				if (fullName.endsWith("/")) {
+					fullName = fullName.substring(0, fullName.length() - 1);
+				}
+
+				try {
+					if (fullName.contains("../")) {
+						error(getString("gb.illegalRelativeSlash"));
+						return;
+					}
+					if (fullName.contains("/../")) {
+						error(getString("gb.illegalRelativeSlash"));
+						return;
+					}
+
+					// confirm valid characters in repository name
+					Character c = StringUtils.findInvalidCharacter(fullName);
+					if (c != null) {
+						error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),
+								c));
+						return;
+					}
+
+					repositoryModel.name = fullName;
+					repositoryModel.projectPath = null;
+
+					Permission permisison = permissionGroup.getModelObject();
+					repositoryModel.accessRestriction = permisison.type;
+					repositoryModel.authorizationControl = AuthorizationControl.NAMED;
+
+					repositoryModel.owners = new ArrayList();
+					repositoryModel.owners.add(GitBlitWebSession.get().getUsername());
+
+					// setup branch defaults
+					boolean useGitFlow = addGitflowModel.getObject();
+
+					repositoryModel.HEAD = Constants.R_MASTER;
+					repositoryModel.mergeTo = Constants.MASTER;
+					if (useGitFlow) {
+						// tickets normally merge to develop unless they are hotfixes
+						repositoryModel.mergeTo = Constants.DEVELOP;
+					}
+
+					repositoryModel.allowForks = app().settings().getBoolean(Keys.web.allowForking, true);
+
+					// optionally generate an initial commit
+					boolean addReadme = addReadmeModel.getObject();
+					String gitignore = null;
+					boolean addGitignore = addGitignoreModel.getObject();
+					if (addGitignore) {
+						gitignore = gitignoreModel.getObject();
+						if (StringUtils.isEmpty(gitignore)) {
+							throw new GitBlitException("Please select a .gitignore file");
+						}
+					}
+
+					// init the repository
+					app().gitblit().updateRepositoryModel(repositoryModel.name, repositoryModel, true);
+
+					// optionally create an initial commit
+					initialCommit(repositoryModel, addReadme, gitignore, useGitFlow);
+
+				} catch (GitBlitException e) {
+					error(e.getMessage());
+
+					// restore project and name fields on error condition
+					repositoryModel.projectPath = StringUtils.getFirstPathElement(fullName);
+					if (!StringUtils.isEmpty(repositoryModel.projectPath)) {
+						repositoryModel.name = fullName.substring(repositoryModel.projectPath.length() + 1);
+					}
+					return;
+				}
+				setRedirect(true);
+				setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(fullName));
+			}
+		};
+
+		GitBlitWebSession session = GitBlitWebSession.get();
+		UserModel user = session.getUser();
+
+		// build project list for repository destination
+		String defaultProject = null;
+		List projects = new ArrayList();
+
+		if (user.canAdmin()) {
+			String main = app().settings().getString(Keys.web.repositoryRootGroupName, "main");
+			projects.add(main);
+			defaultProject = main;
+		}
+
+		if (user.canCreate()) {
+			projects.add(user.getPersonalPath());
+			if (defaultProject == null) {
+				// only prefer personal namespace if default is not already set
+				defaultProject = user.getPersonalPath();
+			}
+		}
+
+		repositoryModel.projectPath = defaultProject;
+
+		// do not let the browser pre-populate these fields
+		form.add(new SimpleAttributeModifier("autocomplete", "off"));
+
+		form.add(new DropDownChoice("projectPath", projects));
+		form.add(new TextField("name"));
+		form.add(new TextField("description"));
+
+		Permission anonymousPermission = new Permission(getString("gb.anonymous"), getString("gb.anonymousRepoDescription"), "blank.png", AccessRestrictionType.NONE);
+		Permission publicPermission = new Permission(getString("gb.public"), getString("gb.publicRepoDescription"), "lock_go_16x16.png", AccessRestrictionType.PUSH);
+		Permission protectedPermission = new Permission(getString("gb.protected"), getString("gb.protectedRepoDescription"), "lock_pull_16x16.png", AccessRestrictionType.CLONE);
+		Permission privatePermission = new Permission(getString("gb.private"), getString("gb.privateRepoDescription"), "shield_16x16.png", AccessRestrictionType.VIEW);
+
+		List permissions = new ArrayList();
+		if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
+			permissions.add(anonymousPermission);
+		}
+		permissions.add(publicPermission);
+		permissions.add(protectedPermission);
+		permissions.add(privatePermission);
+
+		// determine default permission selection
+		AccessRestrictionType defaultRestriction = AccessRestrictionType.fromName(
+				app().settings().getString(Keys.git.defaultAccessRestriction, AccessRestrictionType.PUSH.name()));
+		if (AccessRestrictionType.NONE == defaultRestriction) {
+			defaultRestriction = AccessRestrictionType.PUSH;
+		}
+
+		Permission defaultPermission = publicPermission;
+		for (Permission permission : permissions) {
+			if (permission.type == defaultRestriction) {
+				defaultPermission = permission;
+			}
+		}
+
+		permissionGroup = new RadioGroup<>("permissionsGroup", new Model(defaultPermission));
+		form.add(permissionGroup);
+
+		ListView permissionsList = new ListView("permissions", permissions) {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void populateItem(ListItem item) {
+				Permission p = item.getModelObject();
+				item.add(new Radio("radio", item.getModel()));
+				item.add(WicketUtils.newImage("image",  p.image));
+				item.add(new Label("name", p.name));
+				item.add(new Label("description", p.description));
+			}
+		};
+		permissionGroup.add(permissionsList);
+
+		//
+		// initial commit options
+		//
+
+		// add README
+		addReadmeModel = Model.of(false);
+		form.add(new CheckBox("addReadme", addReadmeModel));
+
+		// add .gitignore
+		File gitignoreDir = app().runtime().getFileOrFolder(Keys.git.gitignoreFolder, "${baseFolder}/gitignore");
+		File [] files = gitignoreDir.listFiles();
+		if (files == null) {
+			files = new File[0];
+		}
+		List gitignores = new ArrayList();
+		for (File file : files) {
+			if (file.isFile() && file.getName().endsWith(".gitignore")) {
+				gitignores.add(StringUtils.stripFileExtension(file.getName()));
+			}
+		}
+		Collections.sort(gitignores);
+		gitignoreModel = Model.of("");
+		final DropDownChoice gitignoreChoice = new DropDownChoice("gitignore", gitignoreModel, gitignores);
+		gitignoreChoice.setOutputMarkupId(true);
+		form.add(gitignoreChoice.setEnabled(false));
+
+		addGitignoreModel = Model.of(false);
+		final CheckBox gitignoreCheckbox = new CheckBox("addGitignore", addGitignoreModel);
+		form.add(gitignoreCheckbox);
+
+		gitignoreCheckbox.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void onUpdate(AjaxRequestTarget target) {
+				gitignoreChoice.setEnabled(addGitignoreModel.getObject());
+				target.addComponent(gitignoreChoice);
+			}
+		});
+
+		// TODO add .gitflow
+		addGitflowModel = Model.of(false);
+		form.add(new CheckBox("addGitflow", addGitflowModel));
+
+		form.add(new Button("create"));
+
+		add(form);
+	}
+
+	/**
+	 * Prepare the initial commit for the repository.
+	 *
+	 * @param repository
+	 * @param addReadme
+	 * @param gitignore
+	 * @param addGitFlow
+	 * @return true if an initial commit was created
+	 */
+	protected boolean initialCommit(RepositoryModel repository, boolean addReadme, String gitignore,
+			boolean addGitFlow) {
+		boolean initialCommit = addReadme || !StringUtils.isEmpty(gitignore) || addGitFlow;
+		if (!initialCommit) {
+			return false;
+		}
+
+		// build an initial commit
+		boolean success = false;
+		Repository db = app().repositories().getRepository(repositoryModel.name);
+		ObjectInserter odi = db.newObjectInserter();
+		try {
+
+			UserModel user = GitBlitWebSession.get().getUser();
+			PersonIdent author = new PersonIdent(user.getDisplayName(), user.emailAddress);
+
+			DirCache newIndex = DirCache.newInCore();
+			DirCacheBuilder indexBuilder = newIndex.builder();
+
+			if (addReadme) {
+				// insert a README
+				String title = StringUtils.stripDotGit(StringUtils.getLastPathElement(repositoryModel.name));
+				String description = repositoryModel.description == null ? "" : repositoryModel.description;
+				String readme = String.format("## %s\n\n%s\n\n", title, description);
+				byte [] bytes = readme.getBytes(Constants.ENCODING);
+
+				DirCacheEntry entry = new DirCacheEntry("README.md");
+				entry.setLength(bytes.length);
+				entry.setLastModified(System.currentTimeMillis());
+				entry.setFileMode(FileMode.REGULAR_FILE);
+				entry.setObjectId(odi.insert(org.eclipse.jgit.lib.Constants.OBJ_BLOB, bytes));
+
+				indexBuilder.add(entry);
+			}
+
+			if (!StringUtils.isEmpty(gitignore)) {
+				// insert a .gitignore file
+				File dir = app().runtime().getFileOrFolder(Keys.git.gitignoreFolder, "${baseFolder}/gitignore");
+				File file = new File(dir, gitignore + ".gitignore");
+				if (file.exists() && file.length() > 0) {
+					byte [] bytes = FileUtils.readContent(file);
+					if (!ArrayUtils.isEmpty(bytes)) {
+						DirCacheEntry entry = new DirCacheEntry(".gitignore");
+						entry.setLength(bytes.length);
+						entry.setLastModified(System.currentTimeMillis());
+						entry.setFileMode(FileMode.REGULAR_FILE);
+						entry.setObjectId(odi.insert(org.eclipse.jgit.lib.Constants.OBJ_BLOB, bytes));
+
+						indexBuilder.add(entry);
+					}
+				}
+			}
+
+			if (addGitFlow) {
+				// insert a .gitflow file
+				Config config = new Config();
+				config.setString("gitflow", null, "masterBranch", Constants.MASTER);
+				config.setString("gitflow", null, "developBranch", Constants.DEVELOP);
+				config.setString("gitflow", null, "featureBranchPrefix", "feature/");
+				config.setString("gitflow", null, "releaseBranchPrefix", "release/");
+				config.setString("gitflow", null, "hotfixBranchPrefix", "hotfix/");
+				config.setString("gitflow", null, "supportBranchPrefix", "support/");
+				config.setString("gitflow", null, "versionTagPrefix", "");
+
+				byte [] bytes = config.toText().getBytes(Constants.ENCODING);
+
+				DirCacheEntry entry = new DirCacheEntry(".gitflow");
+				entry.setLength(bytes.length);
+				entry.setLastModified(System.currentTimeMillis());
+				entry.setFileMode(FileMode.REGULAR_FILE);
+				entry.setObjectId(odi.insert(org.eclipse.jgit.lib.Constants.OBJ_BLOB, bytes));
+
+				indexBuilder.add(entry);
+			}
+
+			indexBuilder.finish();
+
+			if (newIndex.getEntryCount() == 0) {
+				// nothing to commit
+				return false;
+			}
+
+			ObjectId treeId = newIndex.writeTree(odi);
+
+			// Create a commit object
+			CommitBuilder commit = new CommitBuilder();
+			commit.setAuthor(author);
+			commit.setCommitter(author);
+			commit.setEncoding(Constants.ENCODING);
+			commit.setMessage("Initial commit");
+			commit.setTreeId(treeId);
+
+			// Insert the commit into the repository
+			ObjectId commitId = odi.insert(commit);
+			odi.flush();
+
+			// set the branch refs
+			RevWalk revWalk = new RevWalk(db);
+			try {
+				// set the master branch
+				RevCommit revCommit = revWalk.parseCommit(commitId);
+				RefUpdate masterRef = db.updateRef(Constants.R_MASTER);
+				masterRef.setNewObjectId(commitId);
+				masterRef.setRefLogMessage("commit: " + revCommit.getShortMessage(), false);
+				Result masterRC = masterRef.update();
+				switch (masterRC) {
+				case NEW:
+					success = true;
+					break;
+				default:
+					success = false;
+				}
+
+				if (addGitFlow) {
+					// set the develop branch for git-flow
+					RefUpdate developRef = db.updateRef(Constants.R_DEVELOP);
+					developRef.setNewObjectId(commitId);
+					developRef.setRefLogMessage("commit: " + revCommit.getShortMessage(), false);
+					Result developRC = developRef.update();
+					switch (developRC) {
+					case NEW:
+						success = true;
+						break;
+					default:
+						success = false;
+					}
+				}
+			} finally {
+				revWalk.release();
+			}
+		} catch (UnsupportedEncodingException e) {
+			logger().error(null, e);
+		} catch (IOException e) {
+			logger().error(null, e);
+		} finally {
+			odi.release();
+			db.close();
+		}
+		return success;
+	}
+
+	private static class Permission implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		final String name;
+		final String description;
+		final String image;
+		final AccessRestrictionType type;
+
+		Permission(String name, String description, String img, AccessRestrictionType type) {
+			this.name = name;
+			this.description = description;
+			this.image = img;
+			this.type = type;
+		}
+	}
+}
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index a2f3a497..b1c3639d 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -607,7 +607,7 @@ public abstract class RootPage extends BasePage {
 			List standardItems = new ArrayList();
 			standardItems.add(new MenuDivider());
 			if (user.canAdmin() || user.canCreate()) {
-				standardItems.add(new PageLinkMenuItem("gb.newRepository", EditRepositoryPage.class));
+				standardItems.add(new PageLinkMenuItem("gb.newRepository", app().getNewRepositoryPage()));
 			}
 			standardItems.add(new PageLinkMenuItem("gb.myProfile", UserPage.class,
 					WicketUtils.newUsernameParameter(user.username)));
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 6cb791eb..29b49b33 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -30,8 +30,8 @@ import org.eclipse.jgit.lib.PersonIdent;
 
 import com.gitblit.Keys;
 import com.gitblit.models.Menu.ParameterMenuItem;
-import com.gitblit.models.NavLink.DropDownPageMenuNavLink;
 import com.gitblit.models.NavLink;
+import com.gitblit.models.NavLink.DropDownPageMenuNavLink;
 import com.gitblit.models.ProjectModel;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
@@ -95,7 +95,7 @@ public class UserPage extends RootPage {
 		UserModel sessionUser = GitBlitWebSession.get().getUser();
 		if (sessionUser != null && user.canCreate() && sessionUser.equals(user)) {
 			// user can create personal repositories
-			add(new BookmarkablePageLink("newRepository", EditRepositoryPage.class));
+			add(new BookmarkablePageLink("newRepository", app().getNewRepositoryPage()));
 		} else {
 			add(new Label("newRepository").setVisible(false));
 		}
diff --git a/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java b/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java
index 45b0bab1..4433b043 100644
--- a/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java
+++ b/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java
@@ -33,7 +33,6 @@ import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.freemarker.FreemarkerPanel;
 import com.gitblit.wicket.ng.NgController;
-import com.gitblit.wicket.pages.EditRepositoryPage;
 
 /**
  * A client-side filterable rich repository list which uses Freemarker, Wicket,
@@ -98,7 +97,7 @@ public class FilterableRepositoryList extends BasePanel {
 		}
 
 		if (allowCreate) {
-			panel.add(new LinkPanel(ngList + "Button", "btn btn-mini", getString("gb.newRepository"), EditRepositoryPage.class));
+			panel.add(new LinkPanel(ngList + "Button", "btn btn-mini", getString("gb.newRepository"), app().getNewRepositoryPage()));
 		} else {
 			panel.add(new Label(ngList + "Button").setVisible(false));
 		}
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index dd208e23..8573e1a6 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -51,7 +51,6 @@ import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.pages.BasePage;
-import com.gitblit.wicket.pages.EditRepositoryPage;
 import com.gitblit.wicket.pages.ProjectPage;
 import com.gitblit.wicket.pages.RepositoriesPage;
 import com.gitblit.wicket.pages.SummaryPage;
@@ -87,12 +86,12 @@ public class RepositoriesPanel extends BasePanel {
 					setResponsePage(RepositoriesPage.class);
 				}
 			}.setVisible(app().settings().getBoolean(Keys.git.cacheRepositoryList, true)));
-			managementLinks.add(new BookmarkablePageLink("newRepository", EditRepositoryPage.class));
+			managementLinks.add(new BookmarkablePageLink("newRepository", app().getNewRepositoryPage()));
 			add(managementLinks);
 		} else if (showManagement && user != null && user.canCreate()) {
 			// user can create personal repositories
 			managementLinks = new Fragment("managementPanel", "personalLinks", this);
-			managementLinks.add(new BookmarkablePageLink("newRepository", EditRepositoryPage.class));
+			managementLinks.add(new BookmarkablePageLink("newRepository", app().getNewRepositoryPage()));
 			add(managementLinks);
 		} else {
 			// user has no management permissions
-- 
cgit v1.2.3


From 8845b9aff37ee1cdc538ed4247933f7e3c06a49e Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 29 May 2014 21:19:59 -0400
Subject: Inlcude authorization control and revise the string resources

---
 .../com/gitblit/wicket/GitBlitWebApp.properties    | 14 +++---
 .../gitblit/wicket/pages/NewRepositoryPage.java    | 53 ++++++++++++++++++----
 2 files changed, 52 insertions(+), 15 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index ac589558..3fd5a3ac 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -685,12 +685,14 @@ gb.closedMilestones = closed milestones
 gb.administration = administration
 gb.plugins = plugins
 gb.extensions = extensions
-gb.anonymous = Anonymous
-gb.anonymousRepoDescription = Anyone can see, clone, and push to this repository.
-gb.public = Public
-gb.publicRepoDescription = Anyone can see and clone this repository. You choose who can push.
-gb.protected = Protected
-gb.protectedRepoDescription = Anyone can see this repository. You choose who can clone and push.
+gb.anonymousPush = Anonymous Pushes
+gb.anonymousPushDescription = Anyone can see, clone, and push to this repository.
+gb.pushRestrictedAuthenticated = Restrict Pushes (Authenticated)
+gb.pushRestrictedAuthenticatedDescription = Anyone can see and clone this repository. All authenticated users can push.
+gb.pushRestrictedNamed = Restrict Pushes (Named)
+gb.pushRestrictedNamedDescription = Anyone can see and clone this repository. You choose who can push.
+gb.cloneRestricted = Restrict Clones & Pushes
+gb.cloneRestrictedDescription = Anyone can see this repository. You choose who can clone and push.
 gb.private = Private
 gb.privateRepoDescription = You choose who can see, clone, and push to this repository.
 gb.initialCommit = Initial Commit
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index b0cc3e95..a423ae62 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -148,9 +148,9 @@ public class NewRepositoryPage extends RootSubPage {
 					repositoryModel.name = fullName;
 					repositoryModel.projectPath = null;
 
-					Permission permisison = permissionGroup.getModelObject();
-					repositoryModel.accessRestriction = permisison.type;
-					repositoryModel.authorizationControl = AuthorizationControl.NAMED;
+					Permission permission = permissionGroup.getModelObject();
+					repositoryModel.authorizationControl = permission.control;
+					repositoryModel.accessRestriction = permission.type;
 
 					repositoryModel.owners = new ArrayList();
 					repositoryModel.owners.add(GitBlitWebSession.get().getUsername());
@@ -229,15 +229,41 @@ public class NewRepositoryPage extends RootSubPage {
 		form.add(new TextField("name"));
 		form.add(new TextField("description"));
 
-		Permission anonymousPermission = new Permission(getString("gb.anonymous"), getString("gb.anonymousRepoDescription"), "blank.png", AccessRestrictionType.NONE);
-		Permission publicPermission = new Permission(getString("gb.public"), getString("gb.publicRepoDescription"), "lock_go_16x16.png", AccessRestrictionType.PUSH);
-		Permission protectedPermission = new Permission(getString("gb.protected"), getString("gb.protectedRepoDescription"), "lock_pull_16x16.png", AccessRestrictionType.CLONE);
-		Permission privatePermission = new Permission(getString("gb.private"), getString("gb.privateRepoDescription"), "shield_16x16.png", AccessRestrictionType.VIEW);
+		Permission anonymousPermission = new Permission(getString("gb.anonymousPush"),
+				getString("gb.anonymousPushDescription"),
+				"blank.png",
+				AuthorizationControl.AUTHENTICATED,
+				AccessRestrictionType.NONE);
+
+		Permission authenticatedPermission = new Permission(getString("gb.pushRestrictedAuthenticated"),
+				getString("gb.pushRestrictedAuthenticatedDescription"),
+				"lock_go_16x16.png",
+				AuthorizationControl.AUTHENTICATED,
+				AccessRestrictionType.PUSH);
+
+		Permission publicPermission = new Permission(getString("gb.pushRestrictedNamed"),
+				getString("gb.pushRestrictedNamedDescription"),
+				"lock_go_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.PUSH);
+
+		Permission protectedPermission = new Permission(getString("gb.cloneRestricted"),
+				getString("gb.cloneRestrictedDescription"),
+				"lock_pull_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.CLONE);
+
+		Permission privatePermission = new Permission(getString("gb.private"),
+				getString("gb.privateRepoDescription"),
+				"shield_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.VIEW);
 
 		List permissions = new ArrayList();
 		if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
 			permissions.add(anonymousPermission);
 		}
+		permissions.add(authenticatedPermission);
 		permissions.add(publicPermission);
 		permissions.add(protectedPermission);
 		permissions.add(privatePermission);
@@ -248,10 +274,17 @@ public class NewRepositoryPage extends RootSubPage {
 		if (AccessRestrictionType.NONE == defaultRestriction) {
 			defaultRestriction = AccessRestrictionType.PUSH;
 		}
+		AuthorizationControl defaultControl = AuthorizationControl.fromName(
+				app().settings().getString(Keys.git.defaultAuthorizationControl, AuthorizationControl.NAMED.name()));
+
+		if (AuthorizationControl.AUTHENTICATED == defaultControl) {
+			defaultRestriction = AccessRestrictionType.PUSH;
+		}
 
 		Permission defaultPermission = publicPermission;
 		for (Permission permission : permissions) {
-			if (permission.type == defaultRestriction) {
+			if (permission.type == defaultRestriction
+					&& permission.control == defaultControl) {
 				defaultPermission = permission;
 			}
 		}
@@ -481,12 +514,14 @@ public class NewRepositoryPage extends RootSubPage {
 		final String name;
 		final String description;
 		final String image;
+		final AuthorizationControl control;
 		final AccessRestrictionType type;
 
-		Permission(String name, String description, String img, AccessRestrictionType type) {
+		Permission(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
 			this.name = name;
 			this.description = description;
 			this.image = img;
+			this.control = control;
 			this.type = type;
 		}
 	}
-- 
cgit v1.2.3


From 2c50880dbd5de292e37d2533fccfcb62f6be9f95 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 29 May 2014 21:47:56 -0400
Subject: Extract authorization/access selection panel to re-usable class

---
 .../gitblit/wicket/pages/NewRepositoryPage.html    |  13 +-
 .../gitblit/wicket/pages/NewRepositoryPage.java    | 101 +-----------
 .../wicket/panels/RepositoryPermissionPanel.html   |  25 +++
 .../wicket/panels/RepositoryPermissionPanel.java   | 171 +++++++++++++++++++++
 4 files changed, 205 insertions(+), 105 deletions(-)
 create mode 100644 src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
index e9f12027..c59f29c8 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
@@ -32,18 +32,7 @@
 		
 		
      
 		
-		
-			
      
-				
      
-					
-					 
-				
      
-				
      
-					
      
-					
-				
      
-			
      
-		      
+		
 		
 		
      
 		
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index a423ae62..cd0cef61 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -17,7 +17,6 @@ package com.gitblit.wicket.pages;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -27,16 +26,11 @@ import java.util.List;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
-import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.Radio;
-import org.apache.wicket.markup.html.form.RadioGroup;
 import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -67,15 +61,16 @@ import com.gitblit.utils.FileUtils;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.panels.RepositoryPermissionPanel;
 
 public class NewRepositoryPage extends RootSubPage {
 
 	private final RepositoryModel repositoryModel;
-	private RadioGroup permissionGroup;
 	private IModel addReadmeModel;
 	private Model gitignoreModel;
 	private IModel addGitflowModel;
 	private IModel addGitignoreModel;
+	private RepositoryPermissionPanel permissionPanel;
 
 	public NewRepositoryPage() {
 		// create constructor
@@ -148,9 +143,7 @@ public class NewRepositoryPage extends RootSubPage {
 					repositoryModel.name = fullName;
 					repositoryModel.projectPath = null;
 
-					Permission permission = permissionGroup.getModelObject();
-					repositoryModel.authorizationControl = permission.control;
-					repositoryModel.accessRestriction = permission.type;
+					permissionPanel.setPermission(repositoryModel);
 
 					repositoryModel.owners = new ArrayList();
 					repositoryModel.owners.add(GitBlitWebSession.get().getUsername());
@@ -229,46 +222,7 @@ public class NewRepositoryPage extends RootSubPage {
 		form.add(new TextField("name"));
 		form.add(new TextField("description"));
 
-		Permission anonymousPermission = new Permission(getString("gb.anonymousPush"),
-				getString("gb.anonymousPushDescription"),
-				"blank.png",
-				AuthorizationControl.AUTHENTICATED,
-				AccessRestrictionType.NONE);
-
-		Permission authenticatedPermission = new Permission(getString("gb.pushRestrictedAuthenticated"),
-				getString("gb.pushRestrictedAuthenticatedDescription"),
-				"lock_go_16x16.png",
-				AuthorizationControl.AUTHENTICATED,
-				AccessRestrictionType.PUSH);
-
-		Permission publicPermission = new Permission(getString("gb.pushRestrictedNamed"),
-				getString("gb.pushRestrictedNamedDescription"),
-				"lock_go_16x16.png",
-				AuthorizationControl.NAMED,
-				AccessRestrictionType.PUSH);
-
-		Permission protectedPermission = new Permission(getString("gb.cloneRestricted"),
-				getString("gb.cloneRestrictedDescription"),
-				"lock_pull_16x16.png",
-				AuthorizationControl.NAMED,
-				AccessRestrictionType.CLONE);
-
-		Permission privatePermission = new Permission(getString("gb.private"),
-				getString("gb.privateRepoDescription"),
-				"shield_16x16.png",
-				AuthorizationControl.NAMED,
-				AccessRestrictionType.VIEW);
-
-		List permissions = new ArrayList();
-		if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
-			permissions.add(anonymousPermission);
-		}
-		permissions.add(authenticatedPermission);
-		permissions.add(publicPermission);
-		permissions.add(protectedPermission);
-		permissions.add(privatePermission);
-
-		// determine default permission selection
+		// prepare the default access controls
 		AccessRestrictionType defaultRestriction = AccessRestrictionType.fromName(
 				app().settings().getString(Keys.git.defaultAccessRestriction, AccessRestrictionType.PUSH.name()));
 		if (AccessRestrictionType.NONE == defaultRestriction) {
@@ -281,31 +235,11 @@ public class NewRepositoryPage extends RootSubPage {
 			defaultRestriction = AccessRestrictionType.PUSH;
 		}
 
-		Permission defaultPermission = publicPermission;
-		for (Permission permission : permissions) {
-			if (permission.type == defaultRestriction
-					&& permission.control == defaultControl) {
-				defaultPermission = permission;
-			}
-		}
-
-		permissionGroup = new RadioGroup<>("permissionsGroup", new Model(defaultPermission));
-		form.add(permissionGroup);
+		repositoryModel.authorizationControl = defaultControl;
+		repositoryModel.accessRestriction = defaultRestriction;
 
-		ListView permissionsList = new ListView("permissions", permissions) {
-
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			protected void populateItem(ListItem item) {
-				Permission p = item.getModelObject();
-				item.add(new Radio("radio", item.getModel()));
-				item.add(WicketUtils.newImage("image",  p.image));
-				item.add(new Label("name", p.name));
-				item.add(new Label("description", p.description));
-			}
-		};
-		permissionGroup.add(permissionsList);
+		permissionPanel = new RepositoryPermissionPanel("permissionPanel", repositoryModel);
+		form.add(permissionPanel);
 
 		//
 		// initial commit options
@@ -506,23 +440,4 @@ public class NewRepositoryPage extends RootSubPage {
 		}
 		return success;
 	}
-
-	private static class Permission implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-
-		final String name;
-		final String description;
-		final String image;
-		final AuthorizationControl control;
-		final AccessRestrictionType type;
-
-		Permission(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
-			this.name = name;
-			this.description = description;
-			this.image = img;
-			this.control = control;
-			this.type = type;
-		}
-	}
 }
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
new file mode 100644
index 00000000..6a4d5cef
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
@@ -0,0 +1,25 @@
+
+ 
+
+
+
+
+	
+			
      
+				
      
+					
+					 
+				
      
+				
      
+					
      
+					
+				
      
+			
      
+		      
+	
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
new file mode 100644
index 00000000..7c416b1b
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2014 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.panels;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Radio;
+import org.apache.wicket.markup.html.form.RadioGroup;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.Model;
+
+import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.wicket.WicketUtils;
+
+/**
+ * A radio group panel of the 5 available authorization/access restriction combinations.
+ *
+ * @author James Moger
+ *
+ */
+public class RepositoryPermissionPanel extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	private final RepositoryModel repository;
+
+	private RadioGroup permissionGroup;
+
+	public RepositoryPermissionPanel(String wicketId, RepositoryModel repository) {
+		super(wicketId);
+		this.repository = repository;
+	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+
+		Permission anonymousPermission = new Permission(getString("gb.anonymousPush"),
+				getString("gb.anonymousPushDescription"),
+				"blank.png",
+				AuthorizationControl.AUTHENTICATED,
+				AccessRestrictionType.NONE);
+
+		Permission authenticatedPermission = new Permission(getString("gb.pushRestrictedAuthenticated"),
+				getString("gb.pushRestrictedAuthenticatedDescription"),
+				"lock_go_16x16.png",
+				AuthorizationControl.AUTHENTICATED,
+				AccessRestrictionType.PUSH);
+
+		Permission publicPermission = new Permission(getString("gb.pushRestrictedNamed"),
+				getString("gb.pushRestrictedNamedDescription"),
+				"lock_go_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.PUSH);
+
+		Permission protectedPermission = new Permission(getString("gb.cloneRestricted"),
+				getString("gb.cloneRestrictedDescription"),
+				"lock_pull_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.CLONE);
+
+		Permission privatePermission = new Permission(getString("gb.private"),
+				getString("gb.privateRepoDescription"),
+				"shield_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.VIEW);
+
+		List permissions = new ArrayList();
+		if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
+			permissions.add(anonymousPermission);
+		}
+		permissions.add(authenticatedPermission);
+		permissions.add(publicPermission);
+		permissions.add(protectedPermission);
+		permissions.add(privatePermission);
+
+		AccessRestrictionType defaultRestriction = repository.accessRestriction;
+		if (defaultRestriction == null) {
+			defaultRestriction = AccessRestrictionType.fromName(app().settings().getString(Keys.git.defaultAccessRestriction,
+					AccessRestrictionType.PUSH.name()));
+		}
+
+		AuthorizationControl defaultControl = repository.authorizationControl;
+		if (defaultControl == null) {
+			defaultControl = AuthorizationControl.fromName(app().settings().getString(Keys.git.defaultAuthorizationControl,
+					AuthorizationControl.NAMED.name()));
+		}
+
+		Permission defaultPermission = publicPermission;
+		for (Permission permission : permissions) {
+			if (permission.type == defaultRestriction && permission.control == defaultControl) {
+				defaultPermission = permission;
+			}
+		}
+
+		permissionGroup = new RadioGroup<>("permissionsGroup", new Model(defaultPermission));
+		ListView permissionsList = new ListView("permissions", permissions) {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void populateItem(ListItem item) {
+				Permission p = item.getModelObject();
+				item.add(new Radio("radio", item.getModel()));
+				item.add(WicketUtils.newImage("image",  p.image));
+				item.add(new Label("name", p.name));
+				item.add(new Label("description", p.description));
+			}
+		};
+		permissionGroup.add(permissionsList);
+
+		setOutputMarkupId(true);
+
+		add(permissionGroup);
+	}
+
+	public void setPermission(RepositoryModel repository) {
+		Permission permission = permissionGroup.getModelObject();
+		repository.authorizationControl = permission.control;
+		repository.accessRestriction = permission.type;
+	}
+
+	@Override
+	protected boolean getStatelessHint() {
+		return false;
+	}
+
+	private static class Permission implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		final String name;
+		final String description;
+		final String image;
+		final AuthorizationControl control;
+		final AccessRestrictionType type;
+
+		Permission(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
+			this.name = name;
+			this.description = description;
+			this.image = img;
+			this.control = control;
+			this.type = type;
+		}
+
+		@Override
+		public String toString() {
+			return name;
+		}
+	}
+}
-- 
cgit v1.2.3


From a3456e22504a0a054312989fd52a21e4d193baf7 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 29 May 2014 22:29:51 -0400
Subject: Extract repository name panel for re-use

---
 .../com/gitblit/wicket/GitBlitWebApp.properties    |   1 +
 .../gitblit/wicket/pages/NewRepositoryPage.html    |  17 +--
 .../gitblit/wicket/pages/NewRepositoryPage.java    |  79 ++----------
 .../gitblit/wicket/panels/RepositoryNamePanel.html |  27 ++++
 .../gitblit/wicket/panels/RepositoryNamePanel.java | 139 +++++++++++++++++++++
 .../wicket/panels/RepositoryPermissionPanel.java   |   2 +-
 6 files changed, 179 insertions(+), 86 deletions(-)
 create mode 100644 src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 3fd5a3ac..d90158d4 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -685,6 +685,7 @@ gb.closedMilestones = closed milestones
 gb.administration = administration
 gb.plugins = plugins
 gb.extensions = extensions
+gb.pleaseSelectProject = Please select the project!
 gb.anonymousPush = Anonymous Pushes
 gb.anonymousPushDescription = Anyone can see, clone, and push to this repository.
 gb.pushRestrictedAuthenticated = Restrict Pushes (Authenticated)
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
index c59f29c8..05f56012 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
@@ -10,20 +10,7 @@
 
      
 	
      
 
-		
-			
-				
-					
-					
-					
-				
-				
-					
-					
-					
-				
-			
-		
      /  
      
+		
      
 		
 		
      
 			
      
@@ -32,7 +19,7 @@
 		
 		
      
 		
-		
+		
      
 		
 		
      
 		
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index cd0cef61..e2e5d4bc 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -18,7 +18,6 @@ package com.gitblit.wicket.pages;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,6 +60,7 @@ import com.gitblit.utils.FileUtils;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.panels.RepositoryNamePanel;
 import com.gitblit.wicket.panels.RepositoryPermissionPanel;
 
 public class NewRepositoryPage extends RootSubPage {
@@ -71,6 +71,7 @@ public class NewRepositoryPage extends RootSubPage {
 	private IModel addGitflowModel;
 	private IModel addGitignoreModel;
 	private RepositoryPermissionPanel permissionPanel;
+	private RepositoryNamePanel namePanel;
 
 	public NewRepositoryPage() {
 		// create constructor
@@ -104,46 +105,11 @@ public class NewRepositoryPage extends RootSubPage {
 
 			@Override
 			protected void onSubmit() {
-
-				// confirm a repository name was entered
-				if (StringUtils.isEmpty(repositoryModel.name)) {
-					error(getString("gb.pleaseSetRepositoryName"));
-					return;
-				}
-
-				String project = repositoryModel.projectPath;
-				String fullName = (project + "/" + repositoryModel.name).trim();
-				fullName = fullName.replace('\\', '/');
-				fullName = fullName.replace("//", "/");
-				if (fullName.charAt(0) == '/') {
-					fullName = fullName.substring(1);
-				}
-				if (fullName.endsWith("/")) {
-					fullName = fullName.substring(0, fullName.length() - 1);
-				}
-
 				try {
-					if (fullName.contains("../")) {
-						error(getString("gb.illegalRelativeSlash"));
+					if (!namePanel.updateModel(repositoryModel)) {
 						return;
 					}
-					if (fullName.contains("/../")) {
-						error(getString("gb.illegalRelativeSlash"));
-						return;
-					}
-
-					// confirm valid characters in repository name
-					Character c = StringUtils.findInvalidCharacter(fullName);
-					if (c != null) {
-						error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),
-								c));
-						return;
-					}
-
-					repositoryModel.name = fullName;
-					repositoryModel.projectPath = null;
-
-					permissionPanel.setPermission(repositoryModel);
+					permissionPanel.updateModel(repositoryModel);
 
 					repositoryModel.owners = new ArrayList();
 					repositoryModel.owners.add(GitBlitWebSession.get().getUsername());
@@ -179,47 +145,20 @@ public class NewRepositoryPage extends RootSubPage {
 
 				} catch (GitBlitException e) {
 					error(e.getMessage());
-
-					// restore project and name fields on error condition
-					repositoryModel.projectPath = StringUtils.getFirstPathElement(fullName);
-					if (!StringUtils.isEmpty(repositoryModel.projectPath)) {
-						repositoryModel.name = fullName.substring(repositoryModel.projectPath.length() + 1);
-					}
+					namePanel.resetModel(repositoryModel);
 					return;
 				}
 				setRedirect(true);
-				setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(fullName));
+				setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));
 			}
 		};
 
-		GitBlitWebSession session = GitBlitWebSession.get();
-		UserModel user = session.getUser();
-
-		// build project list for repository destination
-		String defaultProject = null;
-		List projects = new ArrayList();
-
-		if (user.canAdmin()) {
-			String main = app().settings().getString(Keys.web.repositoryRootGroupName, "main");
-			projects.add(main);
-			defaultProject = main;
-		}
-
-		if (user.canCreate()) {
-			projects.add(user.getPersonalPath());
-			if (defaultProject == null) {
-				// only prefer personal namespace if default is not already set
-				defaultProject = user.getPersonalPath();
-			}
-		}
-
-		repositoryModel.projectPath = defaultProject;
-
 		// do not let the browser pre-populate these fields
 		form.add(new SimpleAttributeModifier("autocomplete", "off"));
 
-		form.add(new DropDownChoice("projectPath", projects));
-		form.add(new TextField("name"));
+		namePanel = new RepositoryNamePanel("namePanel", repositoryModel);
+		form.add(namePanel);
+
 		form.add(new TextField("description"));
 
 		// prepare the default access controls
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
new file mode 100644
index 00000000..f3a0738e
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
@@ -0,0 +1,27 @@
+
+ 
+
+
+
+
+	
+		
+			
+				
+				
+				
+			
+			
+				
+				
+				
+			
+		
+	
      /  
      
+			
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
new file mode 100644
index 00000000..7b20adec
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2014 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.panels;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.TextField;
+
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.UserModel;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.GitBlitWebSession;
+
+/**
+ * A radio group panel of the 5 available authorization/access restriction combinations.
+ *
+ * @author James Moger
+ *
+ */
+public class RepositoryNamePanel extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	private final RepositoryModel repository;
+
+	private String fullName;
+
+	public RepositoryNamePanel(String wicketId, RepositoryModel repository) {
+		super(wicketId);
+		this.repository = repository;
+	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+
+		GitBlitWebSession session = GitBlitWebSession.get();
+		UserModel user = session.getUser();
+
+		// build project list for repository destination
+		String defaultProject = null;
+		List projects = new ArrayList();
+
+		if (user.canAdmin()) {
+			projects.add("/");
+			defaultProject = "/";
+		}
+
+		if (user.canCreate()) {
+			String p =  user.getPersonalPath() + "/";
+			projects.add(p);
+			if (defaultProject == null) {
+				// only prefer personal namespace if default is not already set
+				defaultProject = p;
+			}
+		}
+
+		repository.projectPath = defaultProject;
+
+		add(new DropDownChoice("projectPath", projects));
+		add(new TextField("name"));
+	}
+
+	public boolean updateModel(RepositoryModel repositoryModel) {
+		// confirm a project was selected
+		if (StringUtils.isEmpty(repositoryModel.projectPath)) {
+			error(getString("gb.pleaseSelectProject"));
+			return false;
+		}
+
+		// confirm a repository name was entered
+		if (StringUtils.isEmpty(repositoryModel.name)) {
+			error(getString("gb.pleaseSetRepositoryName"));
+			return false;
+		}
+
+		String project = repositoryModel.projectPath;
+
+		fullName = (project + repositoryModel.name).trim();
+		fullName = fullName.replace('\\', '/');
+		fullName = fullName.replace("//", "/");
+		if (fullName.charAt(0) == '/') {
+			fullName = fullName.substring(1);
+		}
+		if (fullName.endsWith("/")) {
+			fullName = fullName.substring(0, fullName.length() - 1);
+		}
+
+		if (fullName.contains("../")) {
+			error(getString("gb.illegalRelativeSlash"));
+			return false;
+		}
+		if (fullName.contains("/../")) {
+			error(getString("gb.illegalRelativeSlash"));
+			return false;
+		}
+
+		// confirm valid characters in repository name
+		Character c = StringUtils.findInvalidCharacter(fullName);
+		if (c != null) {
+			error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"), c));
+			return false;
+		}
+
+		repositoryModel.name = fullName;
+		repositoryModel.projectPath = null;
+
+		return true;
+	}
+
+	public void resetModel(RepositoryModel repositoryModel) {
+		// restore project and name fields on error condition
+		repositoryModel.projectPath = StringUtils.getFirstPathElement(fullName) + "/";
+		if (repositoryModel.projectPath.length() > 1) {
+			repositoryModel.name = fullName.substring(repositoryModel.projectPath.length());
+		}
+	}
+
+	@Override
+	protected boolean getStatelessHint() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
index 7c416b1b..ed3f1fed 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
@@ -134,7 +134,7 @@ public class RepositoryPermissionPanel extends BasePanel {
 		add(permissionGroup);
 	}
 
-	public void setPermission(RepositoryModel repository) {
+	public void updateModel(RepositoryModel repository) {
 		Permission permission = permissionGroup.getModelObject();
 		repository.authorizationControl = permission.control;
 		repository.accessRestriction = permission.type;
-- 
cgit v1.2.3


From 5779988cf3a1d737322b2b6a1d568da8713509e7 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Fri, 30 May 2014 10:05:06 -0400
Subject: Use RepositoryNamePanel in EditRepositoryPage, rename
 AccessPolicyPanel

---
 .../com/gitblit/wicket/GitBlitWebApp.properties    |  22 +--
 .../gitblit/wicket/pages/EditRepositoryPage.html   |   4 +-
 .../gitblit/wicket/pages/EditRepositoryPage.java   |  63 ++------
 .../gitblit/wicket/pages/NewRepositoryPage.html    |   5 -
 .../gitblit/wicket/pages/NewRepositoryPage.java    |   9 +-
 .../gitblit/wicket/panels/AccessPolicyPanel.html   |  28 ++++
 .../gitblit/wicket/panels/AccessPolicyPanel.java   | 171 +++++++++++++++++++++
 .../gitblit/wicket/panels/RepositoryNamePanel.html |   7 +-
 .../gitblit/wicket/panels/RepositoryNamePanel.java |  83 +++++++---
 .../wicket/panels/RepositoryPermissionPanel.html   |  25 ---
 .../wicket/panels/RepositoryPermissionPanel.java   | 171 ---------------------
 11 files changed, 290 insertions(+), 298 deletions(-)
 create mode 100644 src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
 delete mode 100644 src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
 delete mode 100644 src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index d90158d4..d2d1454e 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -686,16 +686,18 @@ gb.administration = administration
 gb.plugins = plugins
 gb.extensions = extensions
 gb.pleaseSelectProject = Please select the project!
-gb.anonymousPush = Anonymous Pushes
-gb.anonymousPushDescription = Anyone can see, clone, and push to this repository.
-gb.pushRestrictedAuthenticated = Restrict Pushes (Authenticated)
-gb.pushRestrictedAuthenticatedDescription = Anyone can see and clone this repository. All authenticated users can push.
-gb.pushRestrictedNamed = Restrict Pushes (Named)
-gb.pushRestrictedNamedDescription = Anyone can see and clone this repository. You choose who can push.
-gb.cloneRestricted = Restrict Clones & Pushes
-gb.cloneRestrictedDescription = Anyone can see this repository. You choose who can clone and push.
-gb.private = Private
-gb.privateRepoDescription = You choose who can see, clone, and push to this repository.
+gb.accessPolicy = Access Policy
+gb.accessPolicyDescription = Choose an access policy to control visibility, cloning, and pushing to this repository.
+gb.anonymousPolicy = Anonymous View, Clone, & Push
+gb.anonymousPolicyDescription = Anyone can see, clone, and push to this repository.
+gb.authenticatedPushPolicy = Restrict Push (Authenticated)
+gb.authenticatedPushPolicyDescription = Anyone can see and clone this repository. All authenticated users have RW+ push permission.
+gb.namedPushPolicy = Restrict Push (Named)
+gb.namedPushPolicyDescription = Anyone can see and clone this repository. You choose who can push.
+gb.clonePolicy = Restrict Clone & Push
+gb.clonePolicyDescription = Anyone can see this repository. You choose who can clone and push.
+gb.viewPolicy  = Restrict View, Clone, & Push
+gb.viewPolicyDescription = You choose who can see, clone, and push to this repository.
 gb.initialCommit = Initial Commit
 gb.initialCommitDescription = This will allow you to git clone this repository immediately. Skip this step if you have already run git init locally.
 gb.initWithReadme = Include a README
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index b7a1976f..ccb60a5c 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -24,10 +24,10 @@
 
 		
 		
      
+		
      
+		
 		
-				
-				
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index c18cd514..4759fd0d 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -72,11 +72,14 @@ import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
 import com.gitblit.wicket.panels.BulletListPanel;
 import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
+import com.gitblit.wicket.panels.RepositoryNamePanel;
 
 public class EditRepositoryPage extends RootSubPage {
 
 	private final boolean isCreate;
 
+	RepositoryNamePanel namePanel;
+
 	private boolean isAdmin;
 
 	RepositoryModel repositoryModel;
@@ -263,60 +266,9 @@ public class EditRepositoryPage extends RootSubPage {
 			@Override
 			protected void onSubmit() {
 				try {
-					// confirm a repository name was entered
-					if (repositoryModel.name == null && StringUtils.isEmpty(repositoryModel.name)) {
-						error(getString("gb.pleaseSetRepositoryName"));
-						return;
-					}
-
-					// ensure name is trimmed
-					repositoryModel.name = repositoryModel.name.trim();
-
-					// 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(getString("gb.illegalLeadingSlash"));
-						return;
-					}
-					if (repositoryModel.name.startsWith("../")) {
-						error(getString("gb.illegalRelativeSlash"));
-						return;
-					}
-					if (repositoryModel.name.contains("/../")) {
-						error(getString("gb.illegalRelativeSlash"));
+					if (!namePanel.updateModel(repositoryModel)) {
 						return;
 					}
-					if (repositoryModel.name.endsWith("/")) {
-						repositoryModel.name = repositoryModel.name.substring(0, repositoryModel.name.length() - 1);
-					}
-
-					// confirm valid characters in repository name
-					Character c = StringUtils.findInvalidCharacter(repositoryModel.name);
-					if (c != null) {
-						error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),
-								c));
-						return;
-					}
-
-					if (user.canCreate() && !user.canAdmin() && allowEditName) {
-						// ensure repository name begins with the user's path
-						if (!repositoryModel.name.startsWith(user.getPersonalPath())) {
-							error(MessageFormat.format(getString("gb.illegalPersonalRepositoryLocation"),
-									user.getPersonalPath()));
-							return;
-						}
-
-						if (repositoryModel.name.equals(user.getPersonalPath())) {
-							// reset path prefix and show error
-							repositoryModel.name = user.getPersonalPath() + "/";
-							error(getString("gb.pleaseSetRepositoryName"));
-							return;
-						}
-					}
 
 					// confirm access restriction selection
 					if (repositoryModel.accessRestriction == null) {
@@ -426,6 +378,7 @@ public class EditRepositoryPage extends RootSubPage {
 					}
 				} catch (GitBlitException e) {
 					error(e.getMessage());
+					namePanel.resetModel(repositoryModel);
 					return;
 				}
 				setRedirect(false);
@@ -437,8 +390,10 @@ public class EditRepositoryPage extends RootSubPage {
 		form.add(new SimpleAttributeModifier("autocomplete", "off"));
 
 		// field names reflective match RepositoryModel fields
-		form.add(new TextField("name").setEnabled(allowEditName));
-		form.add(new TextField("description"));
+		namePanel = new RepositoryNamePanel("namePanel", repositoryModel);
+		namePanel.setEditable(allowEditName);
+		form.add(namePanel);
+
 		form.add(ownersPalette);
 		form.add(new CheckBox("allowForks").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));
 		DropDownChoice accessRestriction = new DropDownChoice("accessRestriction",
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
index 05f56012..8e4e74ac 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
@@ -12,11 +12,6 @@
 
 		
      
 		
-		
      
-			
      
-			
-		
      
-		
 		
      
 		
 		
      
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index e2e5d4bc..0adb1ddd 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -61,7 +60,7 @@ import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.RepositoryNamePanel;
-import com.gitblit.wicket.panels.RepositoryPermissionPanel;
+import com.gitblit.wicket.panels.AccessPolicyPanel;
 
 public class NewRepositoryPage extends RootSubPage {
 
@@ -70,7 +69,7 @@ public class NewRepositoryPage extends RootSubPage {
 	private Model gitignoreModel;
 	private IModel addGitflowModel;
 	private IModel addGitignoreModel;
-	private RepositoryPermissionPanel permissionPanel;
+	private AccessPolicyPanel permissionPanel;
 	private RepositoryNamePanel namePanel;
 
 	public NewRepositoryPage() {
@@ -159,8 +158,6 @@ public class NewRepositoryPage extends RootSubPage {
 		namePanel = new RepositoryNamePanel("namePanel", repositoryModel);
 		form.add(namePanel);
 
-		form.add(new TextField("description"));
-
 		// prepare the default access controls
 		AccessRestrictionType defaultRestriction = AccessRestrictionType.fromName(
 				app().settings().getString(Keys.git.defaultAccessRestriction, AccessRestrictionType.PUSH.name()));
@@ -177,7 +174,7 @@ public class NewRepositoryPage extends RootSubPage {
 		repositoryModel.authorizationControl = defaultControl;
 		repositoryModel.accessRestriction = defaultRestriction;
 
-		permissionPanel = new RepositoryPermissionPanel("permissionPanel", repositoryModel);
+		permissionPanel = new AccessPolicyPanel("permissionPanel", repositoryModel);
 		form.add(permissionPanel);
 
 		//
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
new file mode 100644
index 00000000..38fa7f6a
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
@@ -0,0 +1,28 @@
+
+ 
+
+
+
+
+	
      
+	
      
+		
+	
+			
      
+				
      
+					
+					 
+				
      
+				
      
+					
      
+					
+				
      
+			
      
+		      
+	
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
new file mode 100644
index 00000000..a115e251
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2014 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.panels;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Radio;
+import org.apache.wicket.markup.html.form.RadioGroup;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.Model;
+
+import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.wicket.WicketUtils;
+
+/**
+ * A radio group panel of the 5 available authorization/access restriction combinations.
+ *
+ * @author James Moger
+ *
+ */
+public class AccessPolicyPanel extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	private final RepositoryModel repository;
+
+	private RadioGroup policiesGroup;
+
+	public AccessPolicyPanel(String wicketId, RepositoryModel repository) {
+		super(wicketId);
+		this.repository = repository;
+	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+
+		AccessPolicy anonymousPolicy = new AccessPolicy(getString("gb.anonymousPolicy"),
+				getString("gb.anonymousPolicyDescription"),
+				"blank.png",
+				AuthorizationControl.AUTHENTICATED,
+				AccessRestrictionType.NONE);
+
+		AccessPolicy authenticatedPushPolicy = new AccessPolicy(getString("gb.authenticatedPushPolicy"),
+				getString("gb.authenticatedPushPolicyDescription"),
+				"lock_go_16x16.png",
+				AuthorizationControl.AUTHENTICATED,
+				AccessRestrictionType.PUSH);
+
+		AccessPolicy namedPushPolicy = new AccessPolicy(getString("gb.namedPushPolicy"),
+				getString("gb.namedPushPolicyDescription"),
+				"lock_go_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.PUSH);
+
+		AccessPolicy clonePolicy = new AccessPolicy(getString("gb.clonePolicy"),
+				getString("gb.clonePolicyDescription"),
+				"lock_pull_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.CLONE);
+
+		AccessPolicy viewPolicy = new AccessPolicy(getString("gb.viewPolicy"),
+				getString("gb.viewPolicyDescription"),
+				"shield_16x16.png",
+				AuthorizationControl.NAMED,
+				AccessRestrictionType.VIEW);
+
+		List policies = new ArrayList();
+		if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
+			policies.add(anonymousPolicy);
+		}
+		policies.add(authenticatedPushPolicy);
+		policies.add(namedPushPolicy);
+		policies.add(clonePolicy);
+		policies.add(viewPolicy);
+
+		AccessRestrictionType defaultRestriction = repository.accessRestriction;
+		if (defaultRestriction == null) {
+			defaultRestriction = AccessRestrictionType.fromName(app().settings().getString(Keys.git.defaultAccessRestriction,
+					AccessRestrictionType.PUSH.name()));
+		}
+
+		AuthorizationControl defaultControl = repository.authorizationControl;
+		if (defaultControl == null) {
+			defaultControl = AuthorizationControl.fromName(app().settings().getString(Keys.git.defaultAuthorizationControl,
+					AuthorizationControl.NAMED.name()));
+		}
+
+		AccessPolicy defaultPolicy = namedPushPolicy;
+		for (AccessPolicy policy : policies) {
+			if (policy.type == defaultRestriction && policy.control == defaultControl) {
+				defaultPolicy = policy;
+			}
+		}
+
+		policiesGroup = new RadioGroup<>("policiesGroup", new Model(defaultPolicy));
+		ListView policiesList = new ListView("policies", policies) {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void populateItem(ListItem item) {
+				AccessPolicy p = item.getModelObject();
+				item.add(new Radio("radio", item.getModel()));
+				item.add(WicketUtils.newImage("image",  p.image));
+				item.add(new Label("name", p.name));
+				item.add(new Label("description", p.description));
+			}
+		};
+		policiesGroup.add(policiesList);
+
+		setOutputMarkupId(true);
+
+		add(policiesGroup);
+	}
+
+	public void updateModel(RepositoryModel repository) {
+		AccessPolicy policy = policiesGroup.getModelObject();
+		repository.authorizationControl = policy.control;
+		repository.accessRestriction = policy.type;
+	}
+
+	@Override
+	protected boolean getStatelessHint() {
+		return false;
+	}
+
+	private static class AccessPolicy implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		final String name;
+		final String description;
+		final String image;
+		final AuthorizationControl control;
+		final AccessRestrictionType type;
+
+		AccessPolicy(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
+			this.name = name;
+			this.description = description;
+			this.image = img;
+			this.control = control;
+			this.type = type;
+		}
+
+		@Override
+		public String toString() {
+			return name;
+		}
+	}
+}
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
index f3a0738e..3c651620 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
@@ -11,16 +11,19 @@
 		      
-				
-				
      
 			
        
      
 				
      
 				
      
 				
      
 			
      
 				
 				
 			
      
 			
      
 				/
 				  
 			
      
 		      
 	
      
+	
+	
      
+		
      
+		
+	
      
 			
 
 
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
index 7b20adec..358ff59b 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
@@ -17,18 +17,20 @@ package com.gitblit.wicket.panels;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.TextField;
 
+import com.gitblit.models.ProjectModel;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 
 /**
- * A radio group panel of the 5 available authorization/access restriction combinations.
+ * A panel for naming a repository, specifying it's project, and entering a description.
  *
  * @author James Moger
  *
@@ -37,44 +39,79 @@ public class RepositoryNamePanel extends BasePanel {
 
 	private static final long serialVersionUID = 1L;
 
-	private final RepositoryModel repository;
-
 	private String fullName;
 
+	private DropDownChoice projectChoice;
+
+	private TextField nameField;
+
 	public RepositoryNamePanel(String wicketId, RepositoryModel repository) {
 		super(wicketId);
-		this.repository = repository;
-	}
-
-	@Override
-	protected void onInitialize() {
-		super.onInitialize();
 
 		GitBlitWebSession session = GitBlitWebSession.get();
 		UserModel user = session.getUser();
 
-		// build project list for repository destination
+		// build project set for repository destination
 		String defaultProject = null;
-		List projects = new ArrayList();
+		Set projectNames = new TreeSet();
+
+		// add the registered/known projects
+		for (ProjectModel project : app().projects().getProjectModels(user, false)) {
+			// TODO issue-351: user.canAdmin(project)
+			if (user.canAdmin()) {
+				if (project.isRoot) {
+					projectNames.add("/");
+				} else {
+					projectNames.add(project.name + "/");
+				}
+			}
+		}
 
-		if (user.canAdmin()) {
-			projects.add("/");
-			defaultProject = "/";
+		// add the user's personal project namespace
+		if (user.canAdmin() || user.canCreate()) {
+			projectNames.add(user.getPersonalPath() + "/");
 		}
 
-		if (user.canCreate()) {
-			String p =  user.getPersonalPath() + "/";
-			projects.add(p);
-			if (defaultProject == null) {
-				// only prefer personal namespace if default is not already set
-				defaultProject = p;
+		if (!StringUtils.isEmpty(repository.name)) {
+			// editing a repository name
+			// set the defaultProject to the current repository project
+			defaultProject = repository.projectPath;
+			if (StringUtils.isEmpty(defaultProject)) {
+				defaultProject = "/";
+			} else {
+				defaultProject += "/";
+			}
+
+			projectNames.add(defaultProject);
+		}
+
+		// if default project is not already set, set preference based on the user permissions
+		if (defaultProject == null) {
+			if (user.canAdmin()) {
+				defaultProject = "/";
+			} else if (user.canCreate()) {
+				defaultProject = user.getPersonalPath() + "/";
 			}
 		}
 
+		// update the model which is reflectively mapped to the Wicket fields by name
 		repository.projectPath = defaultProject;
+		if (repository.projectPath.length() > 1 && !StringUtils.isEmpty(repository.name)) {
+			repository.name = repository.name.substring(repository.projectPath.length());
+		}
+		projectChoice = new DropDownChoice("projectPath", new ArrayList(projectNames));
+		nameField = new TextField("name");
+
+		// only enable project selection if we actually have multiple choices
+		add(projectChoice.setEnabled(projectNames.size() > 1));
+		add(nameField);
+		add(new TextField("description"));
+	}
 
-		add(new DropDownChoice("projectPath", projects));
-		add(new TextField("name"));
+	public void setEditable(boolean editable) {
+		// only enable project selection if we actually have multiple choices
+		projectChoice.setEnabled(projectChoice.getChoices().size() > 1 && editable);
+		nameField.setEnabled(editable);
 	}
 
 	public boolean updateModel(RepositoryModel repositoryModel) {
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
deleted file mode 100644
index 6a4d5cef..00000000
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
- 
-
-
-
-
-	
-			
      
-				
      
-					
-					 
-				
      
-				
      
-					
      
-					
-				
      
-			
      
-		      
-	
-      
-
-
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
deleted file mode 100644
index ed3f1fed..00000000
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2014 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.panels;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Radio;
-import org.apache.wicket.markup.html.form.RadioGroup;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.Model;
-
-import com.gitblit.Constants.AccessRestrictionType;
-import com.gitblit.Constants.AuthorizationControl;
-import com.gitblit.Keys;
-import com.gitblit.models.RepositoryModel;
-import com.gitblit.wicket.WicketUtils;
-
-/**
- * A radio group panel of the 5 available authorization/access restriction combinations.
- *
- * @author James Moger
- *
- */
-public class RepositoryPermissionPanel extends BasePanel {
-
-	private static final long serialVersionUID = 1L;
-
-	private final RepositoryModel repository;
-
-	private RadioGroup permissionGroup;
-
-	public RepositoryPermissionPanel(String wicketId, RepositoryModel repository) {
-		super(wicketId);
-		this.repository = repository;
-	}
-
-	@Override
-	protected void onInitialize() {
-		super.onInitialize();
-
-		Permission anonymousPermission = new Permission(getString("gb.anonymousPush"),
-				getString("gb.anonymousPushDescription"),
-				"blank.png",
-				AuthorizationControl.AUTHENTICATED,
-				AccessRestrictionType.NONE);
-
-		Permission authenticatedPermission = new Permission(getString("gb.pushRestrictedAuthenticated"),
-				getString("gb.pushRestrictedAuthenticatedDescription"),
-				"lock_go_16x16.png",
-				AuthorizationControl.AUTHENTICATED,
-				AccessRestrictionType.PUSH);
-
-		Permission publicPermission = new Permission(getString("gb.pushRestrictedNamed"),
-				getString("gb.pushRestrictedNamedDescription"),
-				"lock_go_16x16.png",
-				AuthorizationControl.NAMED,
-				AccessRestrictionType.PUSH);
-
-		Permission protectedPermission = new Permission(getString("gb.cloneRestricted"),
-				getString("gb.cloneRestrictedDescription"),
-				"lock_pull_16x16.png",
-				AuthorizationControl.NAMED,
-				AccessRestrictionType.CLONE);
-
-		Permission privatePermission = new Permission(getString("gb.private"),
-				getString("gb.privateRepoDescription"),
-				"shield_16x16.png",
-				AuthorizationControl.NAMED,
-				AccessRestrictionType.VIEW);
-
-		List permissions = new ArrayList();
-		if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
-			permissions.add(anonymousPermission);
-		}
-		permissions.add(authenticatedPermission);
-		permissions.add(publicPermission);
-		permissions.add(protectedPermission);
-		permissions.add(privatePermission);
-
-		AccessRestrictionType defaultRestriction = repository.accessRestriction;
-		if (defaultRestriction == null) {
-			defaultRestriction = AccessRestrictionType.fromName(app().settings().getString(Keys.git.defaultAccessRestriction,
-					AccessRestrictionType.PUSH.name()));
-		}
-
-		AuthorizationControl defaultControl = repository.authorizationControl;
-		if (defaultControl == null) {
-			defaultControl = AuthorizationControl.fromName(app().settings().getString(Keys.git.defaultAuthorizationControl,
-					AuthorizationControl.NAMED.name()));
-		}
-
-		Permission defaultPermission = publicPermission;
-		for (Permission permission : permissions) {
-			if (permission.type == defaultRestriction && permission.control == defaultControl) {
-				defaultPermission = permission;
-			}
-		}
-
-		permissionGroup = new RadioGroup<>("permissionsGroup", new Model(defaultPermission));
-		ListView permissionsList = new ListView("permissions", permissions) {
-
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			protected void populateItem(ListItem item) {
-				Permission p = item.getModelObject();
-				item.add(new Radio("radio", item.getModel()));
-				item.add(WicketUtils.newImage("image",  p.image));
-				item.add(new Label("name", p.name));
-				item.add(new Label("description", p.description));
-			}
-		};
-		permissionGroup.add(permissionsList);
-
-		setOutputMarkupId(true);
-
-		add(permissionGroup);
-	}
-
-	public void updateModel(RepositoryModel repository) {
-		Permission permission = permissionGroup.getModelObject();
-		repository.authorizationControl = permission.control;
-		repository.accessRestriction = permission.type;
-	}
-
-	@Override
-	protected boolean getStatelessHint() {
-		return false;
-	}
-
-	private static class Permission implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-
-		final String name;
-		final String description;
-		final String image;
-		final AuthorizationControl control;
-		final AccessRestrictionType type;
-
-		Permission(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
-			this.name = name;
-			this.description = description;
-			this.image = img;
-			this.control = control;
-			this.type = type;
-		}
-
-		@Override
-		public String toString() {
-			return name;
-		}
-	}
-}
-- 
cgit v1.2.3


From 6a437ec4a6853bdd15f7c33f7fbafdd247a3790c Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Sat, 31 May 2014 10:23:56 -0400
Subject: Use AccessPolicyPanel in EditRepositoryPage

---
 .../com/gitblit/wicket/GitBlitWebApp.properties    |  4 +-
 .../gitblit/wicket/pages/EditRepositoryPage.html   |  4 +-
 .../gitblit/wicket/pages/EditRepositoryPage.java   | 91 +++-------------------
 .../gitblit/wicket/pages/NewRepositoryPage.html    |  6 +-
 .../gitblit/wicket/pages/NewRepositoryPage.java    | 10 +--
 .../gitblit/wicket/panels/AccessPolicyPanel.java   | 17 +++-
 6 files changed, 33 insertions(+), 99 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index d2d1454e..13abcc06 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -687,7 +687,7 @@ gb.plugins = plugins
 gb.extensions = extensions
 gb.pleaseSelectProject = Please select the project!
 gb.accessPolicy = Access Policy
-gb.accessPolicyDescription = Choose an access policy to control visibility, cloning, and pushing to this repository.
+gb.accessPolicyDescription = Choose an access policy to control repository visibility and git permissions.
 gb.anonymousPolicy = Anonymous View, Clone, & Push
 gb.anonymousPolicyDescription = Anyone can see, clone, and push to this repository.
 gb.authenticatedPushPolicy = Restrict Push (Authenticated)
@@ -704,5 +704,3 @@ gb.initWithReadme = Include a README
 gb.initWithReadmeDescription = This will generate a simple README document for your repository.
 gb.initWithGitignore = Include a .gitignore file
 gb.initWithGitignoreDescription = This will insert a config file that instructs your Git clients to ignore files or directories that match defined patterns.
-gb.initWithGitflow = Include a .gitflow file
-gb.initWithGitflowDescription = This will generate a config file which guides Git clients in setting up Gitflow branches.
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index ccb60a5c..ab448038 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -58,9 +58,7 @@
 				
 					 
 					
      
-					  
 					
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index 4759fd0d..e86bd1ee 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -29,7 +29,6 @@ import java.util.Set;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.extensions.markup.html.form.palette.Palette;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -40,7 +39,6 @@ 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;
-import org.apache.wicket.markup.html.form.RadioChoice;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -69,6 +67,7 @@ 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.AccessPolicyPanel;
 import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
 import com.gitblit.wicket.panels.BulletListPanel;
 import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
@@ -80,6 +79,8 @@ public class EditRepositoryPage extends RootSubPage {
 
 	RepositoryNamePanel namePanel;
 
+	AccessPolicyPanel accessPolicyPanel;
+
 	private boolean isAdmin;
 
 	RepositoryModel repositoryModel;
@@ -396,9 +397,6 @@ public class EditRepositoryPage extends RootSubPage {
 
 		form.add(ownersPalette);
 		form.add(new CheckBox("allowForks").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));
-		DropDownChoice accessRestriction = new DropDownChoice("accessRestriction",
-				AccessRestrictionType.choices(app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)), new AccessRestrictionRenderer());
-		form.add(accessRestriction);
 		form.add(new CheckBox("isFrozen"));
 		// TODO enable origin definition
 		form.add(new TextField("origin").setEnabled(false/* isCreate */));
@@ -456,11 +454,6 @@ public class EditRepositoryPage extends RootSubPage {
 		form.add(new TextField("mailingLists", mailingLists));
 		form.add(indexedBranchesPalette);
 
-		List acList = Arrays.asList(AuthorizationControl.values());
-		final RadioChoice authorizationControl = new RadioChoice(
-				"authorizationControl", acList, new AuthorizationControlRenderer());
-		form.add(authorizationControl);
-
 		final CheckBox verifyCommitter = new CheckBox("verifyCommitter");
 		verifyCommitter.setOutputMarkupId(true);
 		form.add(verifyCommitter);
@@ -484,12 +477,10 @@ public class EditRepositoryPage extends RootSubPage {
 			// anonymous everything, disable all controls
 			usersPalette.setEnabled(false);
 			teamsPalette.setEnabled(false);
-			authorizationControl.setEnabled(false);
 			verifyCommitter.setEnabled(false);
 		} else {
 			// authenticated something
 			// enable authorization controls
-			authorizationControl.setEnabled(true);
 			verifyCommitter.setEnabled(true);
 
 			boolean allowFineGrainedControls = repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);
@@ -497,15 +488,15 @@ public class EditRepositoryPage extends RootSubPage {
 			teamsPalette.setEnabled(allowFineGrainedControls);
 		}
 
-		accessRestriction.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+		AjaxFormChoiceComponentUpdatingBehavior callback = new AjaxFormChoiceComponentUpdatingBehavior() {
 
 			private static final long serialVersionUID = 1L;
 
 			@Override
 			protected void onUpdate(AjaxRequestTarget target) {
-				// enable/disable permissions panel based on access restriction
+				accessPolicyPanel.updateModel(repositoryModel);
+
 				boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);
-				authorizationControl.setEnabled(allowAuthorizationControl);
 				verifyCommitter.setEnabled(allowAuthorizationControl);
 
 				boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);
@@ -516,36 +507,14 @@ public class EditRepositoryPage extends RootSubPage {
 					repositoryModel.authorizationControl = AuthorizationControl.NAMED;
 				}
 
-				target.addComponent(authorizationControl);
 				target.addComponent(verifyCommitter);
 				target.addComponent(usersPalette);
 				target.addComponent(teamsPalette);
 			}
-		});
-
-		authorizationControl.add(new AjaxFormChoiceComponentUpdatingBehavior() {
-
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			protected void onUpdate(AjaxRequestTarget target) {
-				// enable/disable permissions panel based on access restriction
-				boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);
-				authorizationControl.setEnabled(allowAuthorizationControl);
-
-				boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);
-				usersPalette.setEnabled(allowFineGrainedControls);
-				teamsPalette.setEnabled(allowFineGrainedControls);
+		};
 
-				if (allowFineGrainedControls) {
-					repositoryModel.authorizationControl = AuthorizationControl.NAMED;
-				}
-
-				target.addComponent(authorizationControl);
-				target.addComponent(usersPalette);
-				target.addComponent(teamsPalette);
-			}
-		});
+		accessPolicyPanel = new AccessPolicyPanel("accessPolicyPanel", repositoryModel, callback);
+		form.add(accessPolicyPanel);
 
 		List renderers = Arrays.asList(CommitMessageRenderer.values());
 		DropDownChoice messageRendererChoice = new DropDownChoice("commitMessageRenderer", renderers);
@@ -656,27 +625,6 @@ public class EditRepositoryPage extends RootSubPage {
 		}
 	}
 
-	private class AccessRestrictionRenderer implements IChoiceRenderer {
-
-		private static final long serialVersionUID = 1L;
-
-		private final Map map;
-
-		public AccessRestrictionRenderer() {
-			map = getAccessRestrictions();
-		}
-
-		@Override
-		public String getDisplayValue(AccessRestrictionType type) {
-			return map.get(type);
-		}
-
-		@Override
-		public String getIdValue(AccessRestrictionType type, int index) {
-			return Integer.toString(index);
-		}
-	}
-
 	private class FederationTypeRenderer implements IChoiceRenderer {
 
 		private static final long serialVersionUID = 1L;
@@ -698,27 +646,6 @@ public class EditRepositoryPage extends RootSubPage {
 		}
 	}
 
-	private class AuthorizationControlRenderer implements IChoiceRenderer {
-
-		private static final long serialVersionUID = 1L;
-
-		private final Map map;
-
-		public AuthorizationControlRenderer() {
-			map = getAuthorizationControls();
-		}
-
-		@Override
-		public String getDisplayValue(AuthorizationControl type) {
-			return map.get(type);
-		}
-
-		@Override
-		public String getIdValue(AuthorizationControl type, int index) {
-			return Integer.toString(index);
-		}
-	}
-
 	private class GCPeriodRenderer implements IChoiceRenderer {
 
 		private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
index 8e4e74ac..df55381a 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
@@ -14,7 +14,7 @@
 		
 		
      
 		
-		
      
+		
      
 		
 		
      
 		
@@ -39,8 +39,8 @@
 				
 			
      
 			
      
-				
-				
      
+				Include a .gitflow file
+				
      This will generate a config file which guides Git clients in setting up Gitflow branches.
      
 			
      
 		
      
 		
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index 0adb1ddd..d5ae3440 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -59,8 +59,8 @@ import com.gitblit.utils.FileUtils;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.panels.RepositoryNamePanel;
 import com.gitblit.wicket.panels.AccessPolicyPanel;
+import com.gitblit.wicket.panels.RepositoryNamePanel;
 
 public class NewRepositoryPage extends RootSubPage {
 
@@ -69,7 +69,7 @@ public class NewRepositoryPage extends RootSubPage {
 	private Model gitignoreModel;
 	private IModel addGitflowModel;
 	private IModel addGitignoreModel;
-	private AccessPolicyPanel permissionPanel;
+	private AccessPolicyPanel accessPolicyPanel;
 	private RepositoryNamePanel namePanel;
 
 	public NewRepositoryPage() {
@@ -108,7 +108,7 @@ public class NewRepositoryPage extends RootSubPage {
 					if (!namePanel.updateModel(repositoryModel)) {
 						return;
 					}
-					permissionPanel.updateModel(repositoryModel);
+					accessPolicyPanel.updateModel(repositoryModel);
 
 					repositoryModel.owners = new ArrayList();
 					repositoryModel.owners.add(GitBlitWebSession.get().getUsername());
@@ -174,8 +174,8 @@ public class NewRepositoryPage extends RootSubPage {
 		repositoryModel.authorizationControl = defaultControl;
 		repositoryModel.accessRestriction = defaultRestriction;
 
-		permissionPanel = new AccessPolicyPanel("permissionPanel", repositoryModel);
-		form.add(permissionPanel);
+		accessPolicyPanel = new AccessPolicyPanel("accessPolicyPanel", repositoryModel);
+		form.add(accessPolicyPanel);
 
 		//
 		// initial commit options
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
index a115e251..057b96f4 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -19,6 +19,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Radio;
 import org.apache.wicket.markup.html.form.RadioGroup;
@@ -44,11 +45,18 @@ public class AccessPolicyPanel extends BasePanel {
 
 	private final RepositoryModel repository;
 
+	private final AjaxFormChoiceComponentUpdatingBehavior callback;
+
 	private RadioGroup policiesGroup;
 
 	public AccessPolicyPanel(String wicketId, RepositoryModel repository) {
+		this(wicketId, repository, null);
+	}
+
+	public AccessPolicyPanel(String wicketId, RepositoryModel repository, AjaxFormChoiceComponentUpdatingBehavior callback) {
 		super(wicketId);
 		this.repository = repository;
+		this.callback = callback;
 	}
 
 	@Override
@@ -128,10 +136,13 @@ public class AccessPolicyPanel extends BasePanel {
 			}
 		};
 		policiesGroup.add(policiesList);
+		if (callback != null) {
+			policiesGroup.add(callback);
+			policiesGroup.setOutputMarkupId(true);
+		}
+		add(policiesGroup);
 
 		setOutputMarkupId(true);
-
-		add(policiesGroup);
 	}
 
 	public void updateModel(RepositoryModel repository) {
@@ -145,7 +156,7 @@ public class AccessPolicyPanel extends BasePanel {
 		return false;
 	}
 
-	private static class AccessPolicy implements Serializable {
+	public static class AccessPolicy implements Serializable {
 
 		private static final long serialVersionUID = 1L;
 
-- 
cgit v1.2.3


From 85b5d72949ead641ba697543324ff5d236e23fd1 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Tue, 3 Jun 2014 00:16:38 -0400
Subject: Overhaul EditRepositoryPage for layout and usability

---
 .../com/gitblit/wicket/GitBlitWebApp.properties    |  24 +-
 .../gitblit/wicket/pages/EditRepositoryPage.html   | 242 ++++++++++++-----
 .../gitblit/wicket/pages/EditRepositoryPage.java   | 288 ++++++++++++++++-----
 .../gitblit/wicket/panels/AccessPolicyPanel.html   |  35 ++-
 .../gitblit/wicket/panels/AccessPolicyPanel.java   |  20 ++
 .../gitblit/wicket/panels/RepositoryNamePanel.html |   2 +-
 6 files changed, 470 insertions(+), 141 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 13abcc06..bd5d89e0 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -133,7 +133,7 @@ gb.sendProposal = propose
 gb.status = status
 gb.origin = origin
 gb.headRef = default branch (HEAD)
-gb.headRefDescription = change the ref that HEAD links to. e.g. refs/heads/master
+gb.headRefDescription = The default branch that will be cloned and displayed on the Summary page.
 gb.federationStrategy = federation strategy
 gb.federationRegistration = federation registration
 gb.federationResults = federation pull results
@@ -223,8 +223,8 @@ gb.queryResults = results {0} - {1} ({2} hits)
 gb.noHits = no hits
 gb.authored = authored
 gb.committed = committed
-gb.indexedBranches = indexed branches
-gb.indexedBranchesDescription = select the branches to include in your Lucene index
+gb.indexedBranches = Indexed Branches
+gb.indexedBranchesDescription = Select the branches to be indexed by Lucene
 gb.noIndexedRepositoriesWarning = none of your repositories are configured for Lucene indexing
 gb.undefinedQueryWarning = query is undefined!
 gb.noSelectedRepositoriesWarning = please select one or more repositories!
@@ -704,3 +704,21 @@ gb.initWithReadme = Include a README
 gb.initWithReadmeDescription = This will generate a simple README document for your repository.
 gb.initWithGitignore = Include a .gitignore file
 gb.initWithGitignoreDescription = This will insert a config file that instructs your Git clients to ignore files or directories that match defined patterns.
+gb.receive = receive
+gb.permissions = permissions
+gb.ownersDescription = Owners can manage all repository settings but they are not allowed to rename a repository unless it is their personal repository.
+gb.userPermissionsDescription = You can specify individual user permissions. These settings will override team or regex permissions.
+gb.teamPermissionsDescription = You can specify individual team permissions. These settings will override regex permissions.
+gb.ticketSettings = Ticket Settings
+gb.receiveSettings = Receive Settings
+gb.receiveSettingsDescription = The receive settings control pushes to the repository.
+gb.preReceiveDescription = Pre-receive hooks are executed after commits are received but BEFORE the refs are updated.
      This is the appropriate hook for rejecting a push.
      
+gb.postReceiveDescription = Post-receive hooks are executed after commits are received but AFTER the refs are updated.
      This is the appropriate hook for notifications, build triggers, etc.
      
+gb.federationStrategyDescription = Control if and how to federate this repository with another Gitblit.
+gb.federationSetsDescription = This repository will be included in the selected federation sets.
+gb.miscellaneous = miscellaneous
+gb.originDescription = The url from which this repository was cloned.
+gb.gc = GC 
+gb.garbageCollection = Garbage Collection
+gb.garbageCollectionDescription = The garbage collector will pack loose objects pushed from clients and will remove unreferenced objects from the repository.
+gb.commitMessageRendererDescription = Commit messages can be displayed as plaintext or as rendered markup.
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index ab448038..b5f9528f 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -9,14 +9,17 @@
 	
      
 
      
 
      
-
      
+
      
 	
 	
        
 		
        • 
-		
        • 
+		
        • 
+		
        • 
+		
        • 
 		
        • 
 		
        • 
-		
        • 
+		
        • 
+		
        • 
 	
      
 
 	
@@ -24,97 +27,200 @@
 
 		
 		
      
-		
      
+
+			
      
+		
+			
      
+		
+			
      
 		
-		
-			
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-			
-		
        
      
 		
      
 
 		
 		
      
+		
+			
      
+			
      
+			
      
+			
+			
      
+
+			
      
+			
      
+			
      
+			
+			
      
+
+			
      
+			
      
+			
      
+			
+		
      
+
+		
+		
      
+			
      
+			
      
+					
+			
      
+			
+			
      
+			
      
+			
      
+			
+			
      
+			
+			
      
+			
      
+			
 			
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
+					
+						
+						
+					
      
 				
       
      
 				      
 			
      
-		
      
 
-		
-		
      
+			
      
+			
+			
      
+			
      
+			
 			
-					
-					
+					
+						
+						
+					
      
 				
      
 				      
 			
      
+
+			
      
+				
      
+				
+				
      
+				
      
+				
+					
+						
+					
+				
      
+			
      
+			
+		
      
+
+				
+		
      
+
+			
      
+			
      
+				
+			
      
+		
+			
      
+			
      
+			
      
+			
      
+		
+		
      
+				
+		
+		
      
+			
      
+			
      
+					
+			
      
+			
+			
      
+
+			
      
+			
+			
      
+			
      
+
+			
      
 		
      
 
 		
 		
 
-		
-		
      
-			
-				
-					
-					
-					
      
-						
      
-						
-					
-				
-			
        
      
+		
+		
      
+
+			
      
+			
      
+		
+			
      
+			
      
 		
      
-	
      
-
      
-
      
-
      
+		
+		
+		
      
 
-
      
-
      
-	
            
      
+			
      
+			
      
+
+			
      
+			
+			
      
+			
      
+			
      
+			
      
+			
      
+			
      
+			
      
+		
+		
      
+		
+		
            
      
+		
+		
      
+	
      
 
      
 
      
 
 	
 
+
+
+	
      
+		
      
+			
+		
      
+		
+	
      
+      
+
+
+	
      
+		
      
+			
+		
      
+		
+		
+	
      
+      
+
 
 
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index e86bd1ee..16dac895 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -43,9 +43,11 @@ import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.util.CollectionModel;
 import org.apache.wicket.model.util.ListModel;
 import org.eclipse.jgit.lib.Repository;
@@ -200,7 +202,7 @@ public class EditRepositoryPage extends RootSubPage {
 			}
 		}
 		final Palette ownersPalette = new Palette("owners", new ListModel(owners), new CollectionModel(
-		      persons), new ChoiceRenderer(null, "userId"), 12, true);
+		      persons), new ChoiceRenderer(null, "userId"), 12, false);
 
 		// indexed local branches palette
 		List allLocalBranches = new ArrayList();
@@ -387,21 +389,7 @@ public class EditRepositoryPage extends RootSubPage {
 			}
 		};
 
-		// do not let the browser pre-populate these fields
-		form.add(new SimpleAttributeModifier("autocomplete", "off"));
-
-		// field names reflective match RepositoryModel fields
-		namePanel = new RepositoryNamePanel("namePanel", repositoryModel);
-		namePanel.setEditable(allowEditName);
-		form.add(namePanel);
-
-		form.add(ownersPalette);
-		form.add(new CheckBox("allowForks").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));
-		form.add(new CheckBox("isFrozen"));
-		// TODO enable origin definition
-		form.add(new TextField("origin").setEnabled(false/* isCreate */));
-
-		// allow relinking HEAD to a branch or tag other than master on edit repository
+		// Determine available refs & branches
 		List availableRefs = new ArrayList();
 		List availableBranches = new ArrayList();
 		if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {
@@ -414,53 +402,79 @@ public class EditRepositoryPage extends RootSubPage {
 				}
 			}
 		}
-		form.add(new DropDownChoice("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));
 
-		boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);
-		int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);
-		if (repositoryModel.gcPeriod == 0) {
-			repositoryModel.gcPeriod = defaultGcPeriod;
-		}
-		List gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );
-		form.add(new DropDownChoice("gcPeriod", gcPeriods, new GCPeriodRenderer()).setEnabled(gcEnabled));
-		form.add(new TextField("gcThreshold").setEnabled(gcEnabled));
+		// do not let the browser pre-populate these fields
+		form.add(new SimpleAttributeModifier("autocomplete", "off"));
 
-		// federation strategies - remove ORIGIN choice if this repository has
-		// no origin.
-		List federationStrategies = new ArrayList(
-				Arrays.asList(FederationStrategy.values()));
-		if (StringUtils.isEmpty(repositoryModel.origin)) {
-			federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);
-		}
-		form.add(new DropDownChoice("federationStrategy", federationStrategies,
-				new FederationTypeRenderer()));
-		form.add(new CheckBox("acceptNewPatchsets"));
-		form.add(new CheckBox("acceptNewTickets"));
-		form.add(new CheckBox("requireApproval"));
-		form.add(new DropDownChoice("mergeTo", availableBranches).setEnabled(availableBranches.size() > 0));
-		form.add(new CheckBox("useIncrementalPushTags"));
-		form.add(new CheckBox("showRemoteBranches"));
-		form.add(new CheckBox("skipSizeCalculation"));
-		form.add(new CheckBox("skipSummaryMetrics"));
-		List maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500);
-		form.add(new DropDownChoice("maxActivityCommits", maxActivityCommits, new MaxActivityCommitsRenderer()));
 
-		metricAuthorExclusions = new Model(ArrayUtils.isEmpty(repositoryModel.metricAuthorExclusions) ? ""
-				: StringUtils.flattenStrings(repositoryModel.metricAuthorExclusions, " "));
-		form.add(new TextField("metricAuthorExclusions", metricAuthorExclusions));
+		//
+		//
+		// GENERAL
+		//
+		namePanel = new RepositoryNamePanel("namePanel", repositoryModel);
+		namePanel.setEditable(allowEditName);
+		form.add(namePanel);
 
-		mailingLists = new Model(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""
-				: StringUtils.flattenStrings(repositoryModel.mailingLists, " "));
-		form.add(new TextField("mailingLists", mailingLists));
-		form.add(indexedBranchesPalette);
+		// XXX AccessPolicyPanel is defined later.
+
+		form.add(newChoice("head",
+				getString("gb.headRef"),
+				getString("gb.headRefDescription"),
+				new PropertyModel(repositoryModel, "HEAD"),
+				availableRefs));
 
-		final CheckBox verifyCommitter = new CheckBox("verifyCommitter");
-		verifyCommitter.setOutputMarkupId(true);
-		form.add(verifyCommitter);
 
+		//
+		// PERMISSIONS
+		//
+		form.add(ownersPalette);
 		form.add(usersPalette);
 		form.add(teamsPalette);
-		form.add(federationSetsPalette);
+
+		//
+		// TICKETS
+		//
+		form.add(newCheckbox("acceptNewPatchsets",
+				getString("gb.acceptNewPatchsets"),
+				getString("gb.acceptNewPatchsetsDescription"),
+				new PropertyModel(repositoryModel, "acceptNewPatchsets")));
+
+		form.add(newCheckbox("acceptNewTickets",
+				getString("gb.acceptNewTickets"),
+				getString("gb.acceptNewTicketsDescription"),
+				new PropertyModel(repositoryModel, "acceptNewPatchsets")));
+
+		form.add(newCheckbox("requireApproval",
+				getString("gb.requireApproval"),
+				getString("gb.requireApprovalDescription"),
+				new PropertyModel(repositoryModel, "requireApproval")));
+
+		form.add(newChoice("mergeTo",
+				getString("gb.mergeTo"),
+				getString("gb.mergeToDescription"),
+				new PropertyModel(repositoryModel, "mergeTo"),
+				availableBranches));
+
+		//
+		// RECEIVE
+		//
+		form.add(newCheckbox("isFrozen",
+				getString("gb.isFrozen"),
+				getString("gb.isFrozenDescription"),
+				new PropertyModel(repositoryModel, "isFrozen")));
+
+		form.add(newCheckbox("incrementalPushTags",
+				getString("gb.enableIncrementalPushTags"),
+				getString("gb.useIncrementalPushTagsDescription"),
+				new PropertyModel(repositoryModel, "useIncrementalPushTags")));
+
+		final CheckBox verifyCommitter = new CheckBox("checkbox", new PropertyModel(repositoryModel, "verifyCommitter"));
+		verifyCommitter.setOutputMarkupId(true);
+		form.add(newCheckbox("verifyCommitter",
+				getString("gb.verifyCommitter"),
+				getString("gb.verifyCommitterDescription"),
+				verifyCommitter));
+
 		form.add(preReceivePalette);
 		form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), app().repositories()
 				.getPreReceiveScriptsInherited(repositoryModel)));
@@ -472,6 +486,116 @@ public class EditRepositoryPage extends RootSubPage {
 		customFieldsSection.add(customFieldsListView);
 		form.add(customFieldsSection.setVisible(!app().settings().getString(Keys.groovy.customFields, "").isEmpty()));
 
+		//
+		// FEDERATION
+		//
+		List federationStrategies = new ArrayList(
+				Arrays.asList(FederationStrategy.values()));
+		// federation strategies - remove ORIGIN choice if this repository has no origin.
+		if (StringUtils.isEmpty(repositoryModel.origin)) {
+			federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);
+		}
+
+		form.add(newChoice("federationStrategy",
+				getString("gb.federationStrategy"),
+				getString("gb.federationStrategyDescription"),
+				new DropDownChoice(
+						"choice",
+						new PropertyModel(repositoryModel, "federationStrategy"),
+						federationStrategies,
+						new FederationTypeRenderer())));
+
+		form.add(federationSetsPalette);
+
+		//
+		// SEARCH
+		//
+		form.add(indexedBranchesPalette);
+
+		//
+		// GARBAGE COLLECTION
+		//
+		boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);
+		int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);
+		if (repositoryModel.gcPeriod == 0) {
+			repositoryModel.gcPeriod = defaultGcPeriod;
+		}
+		List gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );
+		form.add(newChoice("gcPeriod",
+				getString("gb.gcPeriod"),
+				getString("gb.gcPeriodDescription"),
+				new DropDownChoice("choice",
+						new PropertyModel(repositoryModel, "gcPeriod"),
+						gcPeriods,
+						new GCPeriodRenderer())).setEnabled(gcEnabled));
+
+		form.add(newTextfield("gcThreshold",
+				getString("gb.gcThreshold"),
+				getString("gb.gcThresholdDescription"),
+				"span1",
+				new PropertyModel(repositoryModel, "gcThreshold")).setEnabled(gcEnabled));
+
+		//
+		// MISCELLANEOUS
+		//
+
+		form.add(newTextfield("origin",
+				getString("gb.origin"),
+				getString("gb.originDescription"),
+				"span6",
+				new PropertyModel(repositoryModel, "origin")).setEnabled(false));
+
+		form.add(newCheckbox("showRemoteBranches",
+				getString("gb.showRemoteBranches"),
+				getString("gb.showRemoteBranchesDescription"),
+				new PropertyModel(repositoryModel, "showRemoteBranches")));
+
+		form.add(newCheckbox("skipSizeCalculation",
+				getString("gb.skipSizeCalculation"),
+				getString("gb.skipSizeCalculationDescription"),
+				new PropertyModel(repositoryModel, "skipSizeCalculation")));
+
+		form.add(newCheckbox("skipSummaryMetrics",
+				getString("gb.skipSummaryMetrics"),
+				getString("gb.skipSummaryMetricsDescription"),
+				new PropertyModel(repositoryModel, "skipSummaryMetrics")));
+
+		List maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500);
+		form.add(newChoice("maxActivityCommits",
+				getString("gb.maxActivityCommits"),
+				getString("gb.maxActivityCommitsDescription"),
+				new DropDownChoice("choice",
+						new PropertyModel(repositoryModel, "maxActivityCommits"),
+						maxActivityCommits,
+						new MaxActivityCommitsRenderer())));
+
+		List renderers = Arrays.asList(CommitMessageRenderer.values());
+		form.add(newChoice("commitMessageRenderer",
+				getString("gb.commitMessageRenderer"),
+				getString("gb.commitMessageRendererDescription"),
+				new DropDownChoice("choice",
+						new PropertyModel(repositoryModel, "commitMessageRenderer"),
+						renderers)));
+
+		metricAuthorExclusions = new Model(ArrayUtils.isEmpty(repositoryModel.metricAuthorExclusions) ? ""
+				: StringUtils.flattenStrings(repositoryModel.metricAuthorExclusions, " "));
+
+		form.add(newTextfield("metricAuthorExclusions",
+				getString("gb.metricAuthorExclusions"),
+				getString("gb.metricAuthorExclusions"),
+				"span6",
+				metricAuthorExclusions));
+
+		mailingLists = new Model(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""
+				: StringUtils.flattenStrings(repositoryModel.mailingLists, " "));
+
+		form.add(newTextfield("mailingLists",
+				getString("gb.mailingLists"),
+				getString("gb.mailingLists"),
+				"span6",
+				mailingLists));
+
+
 		// initial enable/disable of permission controls
 		if (repositoryModel.accessRestriction.equals(AccessRestrictionType.NONE)) {
 			// anonymous everything, disable all controls
@@ -488,6 +612,9 @@ public class EditRepositoryPage extends RootSubPage {
 			teamsPalette.setEnabled(allowFineGrainedControls);
 		}
 
+		//
+		// ACCESS POLICY PANEL (GENERAL)
+		//
 		AjaxFormChoiceComponentUpdatingBehavior callback = new AjaxFormChoiceComponentUpdatingBehavior() {
 
 			private static final long serialVersionUID = 1L;
@@ -516,10 +643,10 @@ public class EditRepositoryPage extends RootSubPage {
 		accessPolicyPanel = new AccessPolicyPanel("accessPolicyPanel", repositoryModel, callback);
 		form.add(accessPolicyPanel);
 
-		List renderers = Arrays.asList(CommitMessageRenderer.values());
-		DropDownChoice messageRendererChoice = new DropDownChoice("commitMessageRenderer", renderers);
-		form.add(messageRendererChoice);
 
+		//
+		// FORM CONTROLS
+		//
 		form.add(new Button("save"));
 		Button cancel = new Button("cancel") {
 			private static final long serialVersionUID = 1L;
@@ -625,6 +752,51 @@ public class EditRepositoryPage extends RootSubPage {
 		}
 	}
 
+	private Fragment newCheckbox(String wicketId, String title, String description, IModel model) {
+		Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
+		fragment.add(new Label("name", title));
+		fragment.add(new Label("description", description));
+		fragment.add(new CheckBox("checkbox", model));
+		return fragment;
+	}
+
+	private Fragment newCheckbox(String wicketId, String title, String description, CheckBox checkbox) {
+		Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
+		fragment.add(new Label("name", title));
+		fragment.add(new Label("description", description));
+		fragment.add(checkbox);
+		return fragment;
+	}
+
+	private  Fragment newChoice(String wicketId, String title, String description, IModel model, List choices) {
+		Fragment fragment = new Fragment(wicketId, "choiceOption", this);
+		fragment.add(new Label("name", title));
+		fragment.add(new Label("description", description));
+		fragment.add(new DropDownChoice<>("choice", model, choices).setEnabled(choices.size() > 0));
+		return fragment;
+	}
+
+	private  Fragment newChoice(String wicketId, String title, String description, DropDownChoice choice) {
+		Fragment fragment = new Fragment(wicketId, "choiceOption", this);
+		fragment.add(new Label("name", title));
+		fragment.add(new Label("description", description));
+		fragment.add(choice.setEnabled(choice.getChoices().size() > 0));
+		return fragment;
+	}
+
+	private Fragment newTextfield(String wicketId, String title, String description, String css, IModel model) {
+		Fragment fragment = new Fragment(wicketId, "textfieldOption", this);
+		fragment.add(new Label("name", title));
+		fragment.add(new Label("description", description));
+		TextField tf = new TextField("text", model);
+		if (!StringUtils.isEmpty(css)) {
+			WicketUtils.setCssClass(tf, css);
+		}
+		fragment.add(tf);
+		return fragment;
+	}
+
+
 	private class FederationTypeRenderer implements IChoiceRenderer {
 
 		private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
index 38fa7f6a..965c4d51 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
@@ -10,19 +10,32 @@
 	
      
 	
      
 		
-	
-			
      
-				
      
-					
-					 
-				
      
-				
      
-					
      
-					
-				
      
+	
      
+		
      
+			
      
+				
+				 
 			
      
-		
+			
      
+				
      
+				
+			
      
+		
      
+	
      
+	
+	
      
 	
+	
      
+	
+
+	
      
+		
      
+			
+		
      
+		
+	
      
+      
+
 
 
 
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
index 057b96f4..7aa801f4 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -21,10 +21,13 @@ import java.util.List;
 
 import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.Radio;
 import org.apache.wicket.markup.html.form.RadioGroup;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
 import com.gitblit.Constants.AccessRestrictionType;
@@ -49,6 +52,8 @@ public class AccessPolicyPanel extends BasePanel {
 
 	private RadioGroup policiesGroup;
 
+	private IModel allowForks;
+
 	public AccessPolicyPanel(String wicketId, RepositoryModel repository) {
 		this(wicketId, repository, null);
 	}
@@ -142,13 +147,28 @@ public class AccessPolicyPanel extends BasePanel {
 		}
 		add(policiesGroup);
 
+		allowForks = Model.of(true);
+		add(newCheckbox("allowForks",
+				getString("gb.allowForks"),
+				getString("gb.allowForksDescription"),
+				allowForks).setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));
+
 		setOutputMarkupId(true);
 	}
 
+	private Fragment newCheckbox(String wicketId, String title, String description, IModel model) {
+		Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
+		fragment.add(new Label("name", title));
+		fragment.add(new Label("description", description));
+		fragment.add(new CheckBox("checkbox", model));
+		return fragment;
+	}
+
 	public void updateModel(RepositoryModel repository) {
 		AccessPolicy policy = policiesGroup.getModelObject();
 		repository.authorizationControl = policy.control;
 		repository.accessRestriction = policy.type;
+		repository.allowForks = allowForks.getObject();
 	}
 
 	@Override
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
index 3c651620..6fb6e45c 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
@@ -15,7 +15,7 @@
 			
 			
 				  
+				  
 			
 		
 	
-- 
cgit v1.2.3


From 2cf367f1970133303c872e969861be6147196fef Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Tue, 3 Jun 2014 09:13:58 -0400
Subject: Extract re-usable checkbox, choice, and text option panels

---
 .../gitblit/wicket/pages/EditRepositoryPage.html   | 33 --------
 .../gitblit/wicket/pages/EditRepositoryPage.java   | 90 ++++++----------------
 .../gitblit/wicket/panels/AccessPolicyPanel.html   |  9 ---
 .../gitblit/wicket/panels/AccessPolicyPanel.java   | 12 +--
 .../com/gitblit/wicket/panels/CheckboxOption.html  | 17 ++++
 .../com/gitblit/wicket/panels/CheckboxOption.java  | 53 +++++++++++++
 .../com/gitblit/wicket/panels/ChoiceOption.html    | 19 +++++
 .../com/gitblit/wicket/panels/ChoiceOption.java    | 51 ++++++++++++
 .../wicket/panels/RegistrantPermissionsPanel.html  |  2 +-
 .../java/com/gitblit/wicket/panels/TextOption.html | 20 +++++
 .../java/com/gitblit/wicket/panels/TextOption.java | 53 +++++++++++++
 11 files changed, 239 insertions(+), 120 deletions(-)
 create mode 100644 src/main/java/com/gitblit/wicket/panels/CheckboxOption.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
 create mode 100644 src/main/java/com/gitblit/wicket/panels/ChoiceOption.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
 create mode 100644 src/main/java/com/gitblit/wicket/panels/TextOption.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/TextOption.java

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index b5f9528f..1e683b4f 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -189,38 +189,5 @@
 	
 
 
-
-	
      
-		
      
-			
-		
      
-		
-	
      
-      
-
-
-	
      
-		
      
-			
-		
      
-		
-		
-	
      
-      
-
 
 
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index 16dac895..f891595c 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -43,7 +43,6 @@ import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -72,8 +71,11 @@ import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.AccessPolicyPanel;
 import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
 import com.gitblit.wicket.panels.BulletListPanel;
+import com.gitblit.wicket.panels.CheckboxOption;
+import com.gitblit.wicket.panels.ChoiceOption;
 import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
 import com.gitblit.wicket.panels.RepositoryNamePanel;
+import com.gitblit.wicket.panels.TextOption;
 
 public class EditRepositoryPage extends RootSubPage {
 
@@ -417,7 +419,7 @@ public class EditRepositoryPage extends RootSubPage {
 
 		// XXX AccessPolicyPanel is defined later.
 
-		form.add(newChoice("head",
+		form.add(new ChoiceOption("head",
 				getString("gb.headRef"),
 				getString("gb.headRefDescription"),
 				new PropertyModel(repositoryModel, "HEAD"),
@@ -434,22 +436,22 @@ public class EditRepositoryPage extends RootSubPage {
 		//
 		// TICKETS
 		//
-		form.add(newCheckbox("acceptNewPatchsets",
+		form.add(new CheckboxOption("acceptNewPatchsets",
 				getString("gb.acceptNewPatchsets"),
 				getString("gb.acceptNewPatchsetsDescription"),
 				new PropertyModel(repositoryModel, "acceptNewPatchsets")));
 
-		form.add(newCheckbox("acceptNewTickets",
+		form.add(new CheckboxOption("acceptNewTickets",
 				getString("gb.acceptNewTickets"),
 				getString("gb.acceptNewTicketsDescription"),
 				new PropertyModel(repositoryModel, "acceptNewPatchsets")));
 
-		form.add(newCheckbox("requireApproval",
+		form.add(new CheckboxOption("requireApproval",
 				getString("gb.requireApproval"),
 				getString("gb.requireApprovalDescription"),
 				new PropertyModel(repositoryModel, "requireApproval")));
 
-		form.add(newChoice("mergeTo",
+		form.add(new ChoiceOption("mergeTo",
 				getString("gb.mergeTo"),
 				getString("gb.mergeToDescription"),
 				new PropertyModel(repositoryModel, "mergeTo"),
@@ -458,22 +460,22 @@ public class EditRepositoryPage extends RootSubPage {
 		//
 		// RECEIVE
 		//
-		form.add(newCheckbox("isFrozen",
+		form.add(new CheckboxOption("isFrozen",
 				getString("gb.isFrozen"),
 				getString("gb.isFrozenDescription"),
 				new PropertyModel(repositoryModel, "isFrozen")));
 
-		form.add(newCheckbox("incrementalPushTags",
+		form.add(new CheckboxOption("incrementalPushTags",
 				getString("gb.enableIncrementalPushTags"),
 				getString("gb.useIncrementalPushTagsDescription"),
 				new PropertyModel(repositoryModel, "useIncrementalPushTags")));
 
 		final CheckBox verifyCommitter = new CheckBox("checkbox", new PropertyModel(repositoryModel, "verifyCommitter"));
 		verifyCommitter.setOutputMarkupId(true);
-		form.add(newCheckbox("verifyCommitter",
+		form.add(new CheckboxOption("verifyCommitter",
 				getString("gb.verifyCommitter"),
-				getString("gb.verifyCommitterDescription"),
-				verifyCommitter));
+				getString("gb.verifyCommitterDescription") + "
      " + getString("gb.verifyCommitterNote"),
+				verifyCommitter).setIsHtmlDescription(true));
 
 		form.add(preReceivePalette);
 		form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), app().repositories()
@@ -496,7 +498,7 @@ public class EditRepositoryPage extends RootSubPage {
 			federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);
 		}
 
-		form.add(newChoice("federationStrategy",
+		form.add(new ChoiceOption("federationStrategy",
 				getString("gb.federationStrategy"),
 				getString("gb.federationStrategyDescription"),
 				new DropDownChoice(
@@ -521,7 +523,7 @@ public class EditRepositoryPage extends RootSubPage {
 			repositoryModel.gcPeriod = defaultGcPeriod;
 		}
 		List gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );
-		form.add(newChoice("gcPeriod",
+		form.add(new ChoiceOption("gcPeriod",
 				getString("gb.gcPeriod"),
 				getString("gb.gcPeriodDescription"),
 				new DropDownChoice("choice",
@@ -529,7 +531,7 @@ public class EditRepositoryPage extends RootSubPage {
 						gcPeriods,
 						new GCPeriodRenderer())).setEnabled(gcEnabled));
 
-		form.add(newTextfield("gcThreshold",
+		form.add(new TextOption("gcThreshold",
 				getString("gb.gcThreshold"),
 				getString("gb.gcThresholdDescription"),
 				"span1",
@@ -539,29 +541,29 @@ public class EditRepositoryPage extends RootSubPage {
 		// MISCELLANEOUS
 		//
 
-		form.add(newTextfield("origin",
+		form.add(new TextOption("origin",
 				getString("gb.origin"),
 				getString("gb.originDescription"),
 				"span6",
 				new PropertyModel(repositoryModel, "origin")).setEnabled(false));
 
-		form.add(newCheckbox("showRemoteBranches",
+		form.add(new CheckboxOption("showRemoteBranches",
 				getString("gb.showRemoteBranches"),
 				getString("gb.showRemoteBranchesDescription"),
 				new PropertyModel(repositoryModel, "showRemoteBranches")));
 
-		form.add(newCheckbox("skipSizeCalculation",
+		form.add(new CheckboxOption("skipSizeCalculation",
 				getString("gb.skipSizeCalculation"),
 				getString("gb.skipSizeCalculationDescription"),
 				new PropertyModel(repositoryModel, "skipSizeCalculation")));
 
-		form.add(newCheckbox("skipSummaryMetrics",
+		form.add(new CheckboxOption("skipSummaryMetrics",
 				getString("gb.skipSummaryMetrics"),
 				getString("gb.skipSummaryMetricsDescription"),
 				new PropertyModel(repositoryModel, "skipSummaryMetrics")));
 
 		List maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500);
-		form.add(newChoice("maxActivityCommits",
+		form.add(new ChoiceOption("maxActivityCommits",
 				getString("gb.maxActivityCommits"),
 				getString("gb.maxActivityCommitsDescription"),
 				new DropDownChoice("choice",
@@ -570,7 +572,7 @@ public class EditRepositoryPage extends RootSubPage {
 						new MaxActivityCommitsRenderer())));
 
 		List renderers = Arrays.asList(CommitMessageRenderer.values());
-		form.add(newChoice("commitMessageRenderer",
+		form.add(new ChoiceOption("commitMessageRenderer",
 				getString("gb.commitMessageRenderer"),
 				getString("gb.commitMessageRendererDescription"),
 				new DropDownChoice("choice",
@@ -580,7 +582,7 @@ public class EditRepositoryPage extends RootSubPage {
 		metricAuthorExclusions = new Model(ArrayUtils.isEmpty(repositoryModel.metricAuthorExclusions) ? ""
 				: StringUtils.flattenStrings(repositoryModel.metricAuthorExclusions, " "));
 
-		form.add(newTextfield("metricAuthorExclusions",
+		form.add(new TextOption("metricAuthorExclusions",
 				getString("gb.metricAuthorExclusions"),
 				getString("gb.metricAuthorExclusions"),
 				"span6",
@@ -589,7 +591,7 @@ public class EditRepositoryPage extends RootSubPage {
 		mailingLists = new Model(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""
 				: StringUtils.flattenStrings(repositoryModel.mailingLists, " "));
 
-		form.add(newTextfield("mailingLists",
+		form.add(new TextOption("mailingLists",
 				getString("gb.mailingLists"),
 				getString("gb.mailingLists"),
 				"span6",
@@ -752,50 +754,6 @@ public class EditRepositoryPage extends RootSubPage {
 		}
 	}
 
-	private Fragment newCheckbox(String wicketId, String title, String description, IModel model) {
-		Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
-		fragment.add(new Label("name", title));
-		fragment.add(new Label("description", description));
-		fragment.add(new CheckBox("checkbox", model));
-		return fragment;
-	}
-
-	private Fragment newCheckbox(String wicketId, String title, String description, CheckBox checkbox) {
-		Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
-		fragment.add(new Label("name", title));
-		fragment.add(new Label("description", description));
-		fragment.add(checkbox);
-		return fragment;
-	}
-
-	private  Fragment newChoice(String wicketId, String title, String description, IModel model, List choices) {
-		Fragment fragment = new Fragment(wicketId, "choiceOption", this);
-		fragment.add(new Label("name", title));
-		fragment.add(new Label("description", description));
-		fragment.add(new DropDownChoice<>("choice", model, choices).setEnabled(choices.size() > 0));
-		return fragment;
-	}
-
-	private  Fragment newChoice(String wicketId, String title, String description, DropDownChoice choice) {
-		Fragment fragment = new Fragment(wicketId, "choiceOption", this);
-		fragment.add(new Label("name", title));
-		fragment.add(new Label("description", description));
-		fragment.add(choice.setEnabled(choice.getChoices().size() > 0));
-		return fragment;
-	}
-
-	private Fragment newTextfield(String wicketId, String title, String description, String css, IModel model) {
-		Fragment fragment = new Fragment(wicketId, "textfieldOption", this);
-		fragment.add(new Label("name", title));
-		fragment.add(new Label("description", description));
-		TextField tf = new TextField("text", model);
-		if (!StringUtils.isEmpty(css)) {
-			WicketUtils.setCssClass(tf, css);
-		}
-		fragment.add(tf);
-		return fragment;
-	}
-
 
 	private class FederationTypeRenderer implements IChoiceRenderer {
 
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
index 965c4d51..d3c29ba7 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
@@ -27,15 +27,6 @@
 	
 	
      
 	
-
-	
      
-		
      
-			
-		
      
-		
-	
      
-      
-
 
 
 
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
index 7aa801f4..4f234263 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -21,12 +21,10 @@ import java.util.List;
 
 import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.Radio;
 import org.apache.wicket.markup.html.form.RadioGroup;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
@@ -148,7 +146,7 @@ public class AccessPolicyPanel extends BasePanel {
 		add(policiesGroup);
 
 		allowForks = Model.of(true);
-		add(newCheckbox("allowForks",
+		add(new CheckboxOption("allowForks",
 				getString("gb.allowForks"),
 				getString("gb.allowForksDescription"),
 				allowForks).setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));
@@ -156,14 +154,6 @@ public class AccessPolicyPanel extends BasePanel {
 		setOutputMarkupId(true);
 	}
 
-	private Fragment newCheckbox(String wicketId, String title, String description, IModel model) {
-		Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
-		fragment.add(new Label("name", title));
-		fragment.add(new Label("description", description));
-		fragment.add(new CheckBox("checkbox", model));
-		return fragment;
-	}
-
 	public void updateModel(RepositoryModel repository) {
 		AccessPolicy policy = policiesGroup.getModelObject();
 		repository.authorizationControl = policy.control;
diff --git a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.html b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.html
new file mode 100644
index 00000000..6684fe92
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.html
@@ -0,0 +1,17 @@
+
+ 
+
+
+
+	
      
+		
      
+			
+		
      
+		
+	
      
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
new file mode 100644
index 00000000..086d8ef2
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 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.panels;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.model.IModel;
+
+/**
+ * A re-usable checkbox option panel.
+ *
+ * [x] title
+ *     description
+ *
+ * @author James Moger
+ *
+ */
+public class CheckboxOption extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	public CheckboxOption(String wicketId, String title, String description, IModel model) {
+		super(wicketId);
+		add(new Label("name", title));
+		add(new Label("description", description));
+		add(new CheckBox("checkbox", model));
+	}
+
+	public CheckboxOption(String wicketId, String title, String description, CheckBox checkbox) {
+		super(wicketId);
+		add(new Label("name", title));
+		add(new Label("description", description));
+		add(checkbox.setMarkupId("checkbox"));
+	}
+
+	public CheckboxOption setIsHtmlDescription(boolean val) {
+		((Label) get("description")).setEscapeModelStrings(!val);
+		return this;
+	}
+}
diff --git a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html
new file mode 100644
index 00000000..8c34c819
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html
@@ -0,0 +1,19 @@
+
+ 
+
+
+
+	
      
+		
      
+			
+		
      
+		
      
 	
      
diff --git a/src/main/java/com/gitblit/wicket/panels/TextOption.html b/src/main/java/com/gitblit/wicket/panels/TextOption.html
new file mode 100644
index 00000000..ff2da78e
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/TextOption.html
@@ -0,0 +1,20 @@
+
+ 
+
+
+
+	
      
+		
      
+			
+		
      
+		
+		
+	
      
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/TextOption.java b/src/main/java/com/gitblit/wicket/panels/TextOption.java
new file mode 100644
index 00000000..dcd465fb
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/TextOption.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 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.panels;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.WicketUtils;
+
+/**
+ * A re-usable textfield option panel.
+ *
+ * title
+ *     description
+ *     [textfield]
+ *
+ * @author James Moger
+ *
+ */
+public class TextOption extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	public TextOption(String wicketId, String title, String description, IModel model) {
+		this(wicketId, title, description, null, model);
+	}
+
+	public TextOption(String wicketId, String title, String description, String css, IModel model) {
+		super(wicketId);
+		add(new Label("name", title));
+		add(new Label("description", description));
+		TextField tf = new TextField("text", model);
+		if (!StringUtils.isEmpty(css)) {
+			WicketUtils.setCssClass(tf, css);
+		}
+		add(tf);
+	}
+}
-- 
cgit v1.2.3


From 7b8654dec60d378059bd9d765abcfd597b80ab5f Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Tue, 3 Jun 2014 09:21:57 -0400
Subject: Use alignment from option panels un AccessPolicyPanel

---
 src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
index d3c29ba7..a2d76b7e 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
@@ -12,14 +12,10 @@
 		
 	
      
 		
      
-			
      
-				
-				 
-			
      
-			
      
-				
      
-				
+			
      
+				
 			
      
+			
 		
      
 	
      
 	
-- 
cgit v1.2.3


From 6cc8ec025ad26f1451f0947fa4ad79bb2f9c292a Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Tue, 3 Jun 2014 09:24:39 -0400
Subject: Hide empty option descriptions

---
 src/main/java/com/gitblit/wicket/panels/CheckboxOption.java | 5 +++--
 src/main/java/com/gitblit/wicket/panels/ChoiceOption.java   | 5 +++--
 src/main/java/com/gitblit/wicket/panels/TextOption.java     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
index 086d8ef2..08eeaa24 100644
--- a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
+++ b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
@@ -18,6 +18,7 @@ package com.gitblit.wicket.panels;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.model.IModel;
+import org.parboiled.common.StringUtils;
 
 /**
  * A re-usable checkbox option panel.
@@ -35,14 +36,14 @@ public class CheckboxOption extends BasePanel {
 	public CheckboxOption(String wicketId, String title, String description, IModel model) {
 		super(wicketId);
 		add(new Label("name", title));
-		add(new Label("description", description));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
 		add(new CheckBox("checkbox", model));
 	}
 
 	public CheckboxOption(String wicketId, String title, String description, CheckBox checkbox) {
 		super(wicketId);
 		add(new Label("name", title));
-		add(new Label("description", description));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
 		add(checkbox.setMarkupId("checkbox"));
 	}
 
diff --git a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
index cc084a7b..9c25b70a 100644
--- a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
+++ b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
@@ -20,6 +20,7 @@ import java.util.List;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.model.IModel;
+import org.parboiled.common.StringUtils;
 
 /**
  * A re-usable choice option panel.
@@ -38,14 +39,14 @@ public class ChoiceOption extends BasePanel {
 	public ChoiceOption(String wicketId, String title, String description, IModel model, List choices) {
 		super(wicketId);
 		add(new Label("name", title));
-		add(new Label("description", description));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
 		add(new DropDownChoice<>("choice", model, choices).setEnabled(choices.size() > 0));
 	}
 
 	public ChoiceOption(String wicketId, String title, String description, DropDownChoice choice) {
 		super(wicketId);
 		add(new Label("name", title));
-		add(new Label("description", description));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
 		add(choice.setMarkupId("choice").setEnabled(choice.getChoices().size() > 0));
 	}
 }
diff --git a/src/main/java/com/gitblit/wicket/panels/TextOption.java b/src/main/java/com/gitblit/wicket/panels/TextOption.java
index dcd465fb..22370f3c 100644
--- a/src/main/java/com/gitblit/wicket/panels/TextOption.java
+++ b/src/main/java/com/gitblit/wicket/panels/TextOption.java
@@ -43,7 +43,7 @@ public class TextOption extends BasePanel {
 	public TextOption(String wicketId, String title, String description, String css, IModel model) {
 		super(wicketId);
 		add(new Label("name", title));
-		add(new Label("description", description));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
 		TextField tf = new TextField("text", model);
 		if (!StringUtils.isEmpty(css)) {
 			WicketUtils.setCssClass(tf, css);
-- 
cgit v1.2.3


From ba516f6c6aaabf7935ef42292f446bf375bf542b Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Tue, 3 Jun 2014 09:56:50 -0400
Subject: Extract re-usable conditional choice option panel

---
 .../gitblit/wicket/pages/NewRepositoryPage.html    | 36 ++--------
 .../gitblit/wicket/pages/NewRepositoryPage.java    | 44 ++++++------
 .../wicket/panels/ConditionalChoiceOption.html     | 19 ++++++
 .../wicket/panels/ConditionalChoiceOption.java     | 78 ++++++++++++++++++++++
 4 files changed, 120 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/com/gitblit/wicket/panels/ConditionalChoiceOption.html
 create mode 100644 src/main/java/com/gitblit/wicket/panels/ConditionalChoiceOption.java

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
index df55381a..115b8c10 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html
@@ -19,41 +19,13 @@
 		
      
 		
 		
      
-		
      
-			
      
-		
      
+		
      
 		
-		
      
-			
      
-				
-			
      
-			
      
-				
      
-				
      
-			
      
-		
      
+		
      
 		
-		
      
-			
-			
      
-				
-			
      
-			
      
-				Include a .gitflow file
-				
      This will generate a config file which guides Git clients in setting up Gitflow branches.
      
-			
      
-		
      
+		
      
 		
-		
      
-			
      
-				
-			
      
-			
      
-				
      
-				
      
-				
       
+		
      
+		
      
+		
      
+		
+	
      
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/BooleanOption.java b/src/main/java/com/gitblit/wicket/panels/BooleanOption.java
new file mode 100644
index 00000000..4a9299ce
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/BooleanOption.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 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.panels;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.model.IModel;
+import org.parboiled.common.StringUtils;
+
+/**
+ * A re-usable checkbox option panel.
+ *
+ * [x] title
+ *     description
+ *
+ * @author James Moger
+ *
+ */
+public class BooleanOption extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	public BooleanOption(String wicketId, String title, String description, IModel model) {
+		super(wicketId);
+		add(new Label("name", title));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
+		add(new CheckBox("checkbox", model));
+	}
+
+	public BooleanOption(String wicketId, String title, String description, CheckBox checkbox) {
+		super(wicketId);
+		add(new Label("name", title));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
+		add(checkbox.setMarkupId("checkbox"));
+	}
+
+	public BooleanOption setIsHtmlDescription(boolean val) {
+		((Label) get("description")).setEscapeModelStrings(!val);
+		return this;
+	}
+}
diff --git a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.html b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.html
deleted file mode 100644
index 6684fe92..00000000
--- a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
- 
-
-
-
-	
      
-		
      
-			
-		
      
-		
-	
      
-      
-
-
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java b/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
deleted file mode 100644
index 08eeaa24..00000000
--- a/src/main/java/com/gitblit/wicket/panels/CheckboxOption.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2014 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.panels;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.model.IModel;
-import org.parboiled.common.StringUtils;
-
-/**
- * A re-usable checkbox option panel.
- *
- * [x] title
- *     description
- *
- * @author James Moger
- *
- */
-public class CheckboxOption extends BasePanel {
-
-	private static final long serialVersionUID = 1L;
-
-	public CheckboxOption(String wicketId, String title, String description, IModel model) {
-		super(wicketId);
-		add(new Label("name", title));
-		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
-		add(new CheckBox("checkbox", model));
-	}
-
-	public CheckboxOption(String wicketId, String title, String description, CheckBox checkbox) {
-		super(wicketId);
-		add(new Label("name", title));
-		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
-		add(checkbox.setMarkupId("checkbox"));
-	}
-
-	public CheckboxOption setIsHtmlDescription(boolean val) {
-		((Label) get("description")).setEscapeModelStrings(!val);
-		return this;
-	}
-}
diff --git a/src/main/java/com/gitblit/wicket/panels/ConditionalChoiceOption.html b/src/main/java/com/gitblit/wicket/panels/ConditionalChoiceOption.html
deleted file mode 100644
index fb360d12..00000000
--- a/src/main/java/com/gitblit/wicket/panels/ConditionalChoiceOption.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
- 
-
-
-
-	
      
-		
      
-			
-		
      
-		
 		
 	
      
-- 
cgit v1.2.3


From c9921bd3b0b7bf90b6e5e2a52141c3fdf0f31f89 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Wed, 4 Jun 2014 17:04:17 -0400
Subject: Revise the user profile page and add a preferences form

---
 .../com/gitblit/wicket/GitBlitWebApp.properties    |   9 +-
 .../java/com/gitblit/wicket/pages/UserPage.html    |  51 ++++---
 .../java/com/gitblit/wicket/pages/UserPage.java    | 153 +++++++++++++++++++--
 .../gitblit/wicket/panels/AccessPolicyPanel.html   |   2 +-
 .../gitblit/wicket/panels/BooleanChoiceOption.html |   2 +-
 .../com/gitblit/wicket/panels/BooleanOption.html   |   2 +-
 .../com/gitblit/wicket/panels/ChoiceOption.html    |   2 +-
 .../java/com/gitblit/wicket/panels/TextOption.html |   2 +-
 8 files changed, 185 insertions(+), 38 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index d6fd57e9..81171799 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -722,4 +722,11 @@ gb.originDescription = The url from which this repository was cloned.
 gb.gc = GC 
 gb.garbageCollection = Garbage Collection
 gb.garbageCollectionDescription = The garbage collector will pack loose objects pushed from clients and will remove unreferenced objects from the repository.
-gb.commitMessageRendererDescription = Commit messages can be displayed as plaintext or as rendered markup.
\ No newline at end of file
+gb.commitMessageRendererDescription = Commit messages can be displayed as plaintext or as rendered markup.
+gb.preferences = preferences
+gb.accountPreferences = Account Preferences
+gb.accountPreferencesDescription = Specify your account preferences
+gb.languagePreference = Language Preference
+gb.languagePreferenceDescription = Select your preferred translation for the Gitblit UI
+gb.displayNameDescription = The preferred name for display
+gb.emailAddressDescription = The primary email address for receiving notifications
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.html b/src/main/java/com/gitblit/wicket/pages/UserPage.html
index 7aaded7a..09267873 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
@@ -7,27 +7,19 @@
 
 
 
      
-	
      
-		
      
-			
      
-			
      
-				
      
-				
       
      
-				
      
-			
      
+	
      
+		
      
+			
      
 		
      
-		
-		
      
-			
      
-				
-					
-					
-				
-			
      
-			
      
+	
      
+	
+	
      	
+		
      
+			
      
 				
 				
        
 					
        • 
+					
        
 				
      
 	
 				
@@ -41,11 +33,36 @@
 							
 						
 					
      
+					
+					
+					
      
+					
 				
      
 			
      
 		
      
 	
      
 
      
+
+
+	
      • 
+      
+
+
+	
      
+		
      
+		
      
+		
      
+		
+		
      
+			
      
+			
      
+			
      	
+			
+			
      
+		
      	
+	
      
+      
+
 
 
 
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 29b49b33..baad4a06 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -15,19 +15,27 @@
  */
 package com.gitblit.wicket.pages;
 
+import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.wicket.PageParameters;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.form.Form;
+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.ListDataProvider;
-import org.eclipse.jgit.lib.PersonIdent;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
+import com.gitblit.GitBlitException;
 import com.gitblit.Keys;
 import com.gitblit.models.Menu.ParameterMenuItem;
 import com.gitblit.models.NavLink;
@@ -40,9 +48,10 @@ import com.gitblit.wicket.GitBlitWebApp;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.GitblitRedirectException;
 import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.panels.GravatarImage;
-import com.gitblit.wicket.panels.LinkPanel;
+import com.gitblit.wicket.panels.ChoiceOption;
 import com.gitblit.wicket.panels.ProjectRepositoryPanel;
+import com.gitblit.wicket.panels.TextOption;
+import com.gitblit.wicket.panels.UserTitlePanel;
 
 public class UserPage extends RootPage {
 
@@ -83,21 +92,18 @@ public class UserPage extends RootPage {
 			user = new UserModel(userName);
 		}
 
-		add(new Label("userDisplayName", user.getDisplayName()));
-		add(new Label("userUsername", user.username));
-		LinkPanel email = new LinkPanel("userEmail", null, user.emailAddress, "mailto:#");
-		email.setRenderBodyOnly(true);
-		add(email.setVisible(app().settings().getBoolean(Keys.web.showEmailAddresses, true) && !StringUtils.isEmpty(user.emailAddress)));
 
-		PersonIdent person = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
-		add(new GravatarImage("gravatar", person, 210));
+		add(new UserTitlePanel("userTitlePanel", user, user.username));
 
 		UserModel sessionUser = GitBlitWebSession.get().getUser();
-		if (sessionUser != null && user.canCreate() && sessionUser.equals(user)) {
-			// user can create personal repositories
-			add(new BookmarkablePageLink("newRepository", app().getNewRepositoryPage()));
+		boolean isMyProfile = sessionUser != null && sessionUser.equals(user);
+
+		if (isMyProfile) {
+			addPreferences(user);
 		} else {
-			add(new Label("newRepository").setVisible(false));
+			// visiting user
+			add(new Label("preferencesLink").setVisible(false));
+			add(new Label("preferencesTab").setVisible(false));
 		}
 
 		List repositories = getRepositories(params);
@@ -145,4 +151,121 @@ public class UserPage extends RootPage {
 
 		navLinks.add(menu);
 	}
+
+	private void addPreferences(UserModel user) {
+		// add preferences
+		Form prefs = new Form("prefsForm");
+
+		List languages = Arrays.asList(
+				new Language("English","en"),
+				new Language("Español", "es"),
+				new Language("Français", "fr"),
+				new Language("日本語", "ja"),
+				new Language("한국말", "ko"),
+				new Language("Nederlands", "nl"),
+				new Language("Norsk", "no"),
+				new Language("Język Polski", "pl"),
+				new Language("Português", "pt_BR"),
+				new Language("中文", "zh_CN"));
+
+		String lc = user.getPreferences().locale;
+		if (StringUtils.isEmpty(lc)) {
+			// user has not specified language preference
+			// try server default preference
+			lc = app().settings().getString(Keys.web.forceDefaultLocale, null);
+			if (StringUtils.isEmpty(lc)) {
+				// server default language is not configured
+				// try browser preference
+				Locale sessionLocale = GitBlitWebSession.get().getLocale();
+				if (sessionLocale != null) {
+					lc = sessionLocale.getLanguage() + "_" + sessionLocale.getCountry();
+				}
+			}
+		}
+		Language preferredLanguage = null;
+		if (!StringUtils.isEmpty(lc)) {
+			for (Language language : languages) {
+				if (language.code.equals(lc)) {
+					// language_COUNTRY match
+					preferredLanguage = language;
+				} else if (preferredLanguage != null && lc.startsWith(language.code)) {
+					// language match, but not COUNTRY match
+					preferredLanguage = language;
+				}
+			}
+		}
+
+		final IModel displayName = Model.of(user.getDisplayName());
+		final IModel emailAddress = Model.of(user.emailAddress == null ? "" : user.emailAddress);
+		final IModel language = Model.of(preferredLanguage);
+
+		prefs.add(new TextOption("displayName",
+				getString("gb.displayName"),
+				getString("gb.displayNameDescription"),
+				displayName).setVisible(app().authentication().supportsDisplayNameChanges(user)));
+
+		prefs.add(new TextOption("emailAddress",
+				getString("gb.emailAddress"),
+				getString("gb.emailAddressDescription"),
+				emailAddress).setVisible(app().authentication().supportsEmailAddressChanges(user)));
+
+		prefs.add(new ChoiceOption("language",
+				getString("gb.languagePreference"),
+				getString("gb.languagePreferenceDescription"),
+				language,
+				languages));
+
+		prefs.add(new AjaxButton("save") {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void onSubmit(AjaxRequestTarget target, Form form) {
+
+				UserModel user = GitBlitWebSession.get().getUser();
+
+				user.displayName = displayName.getObject();
+				user.emailAddress = emailAddress.getObject();
+
+				Language lang = language.getObject();
+				if (lang != null) {
+					user.getPreferences().locale = lang.code;
+				}
+
+				try {
+					app().gitblit().reviseUser(user.username, user);
+
+					setRedirect(true);
+					setResponsePage(UserPage.class, WicketUtils.newUsernameParameter(user.username));
+				} catch (GitBlitException e) {
+					// logger.error("Failed to update user " + user.username, e);
+					// error(getString("gb.failedToUpdateUser"), false);
+				}
+			}
+		});
+
+		// add the preferences tab
+		add(new Fragment("preferencesLink", "preferencesLinkFragment", this).setRenderBodyOnly(true));
+		Fragment fragment = new Fragment("preferencesTab", "preferencesTabFragment", this);
+		fragment.add(prefs);
+		add(fragment.setRenderBodyOnly(true));
+	}
+
+	private class Language implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		final String name;
+		final String code;
+
+		public Language(String name, String code) {
+			this.name = name;
+			this.code = code;
+		}
+
+		@Override
+		public String toString() {
+			return name + " (" + code +")";
+		}
+	}
 }
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
index 87a02068..07050192 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
@@ -13,7 +13,7 @@
 	
      
 		
      
 			
      
-				
+				
 			
      
 			
 		
      
diff --git a/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.html b/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.html
index fb360d12..b1ced8da 100644
--- a/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.html
+++ b/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.html
@@ -8,7 +8,7 @@
 
 	
      
 		
      
-			
+			
 		
      
 		
      
 		
 	
      
diff --git a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html
index 8c34c819..e9e48874 100644
--- a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html
+++ b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.html
@@ -7,7 +7,7 @@
 
 
 	
      
-		
      
+		
      
 			
 		
      
 		
      
@@ -47,6 +51,10 @@
 	
      • 
 
 
+
+	
      • 
+      
+
 
 	
      
 		
      
@@ -63,6 +71,12 @@
 	
      
       
 
+
+	
      
+		
      		
+	
      
+      
+
 
 
 
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index baad4a06..4a955c7c 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -50,6 +50,7 @@ import com.gitblit.wicket.GitblitRedirectException;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.ChoiceOption;
 import com.gitblit.wicket.panels.ProjectRepositoryPanel;
+import com.gitblit.wicket.panels.SshKeysPanel;
 import com.gitblit.wicket.panels.TextOption;
 import com.gitblit.wicket.panels.UserTitlePanel;
 
@@ -100,10 +101,22 @@ public class UserPage extends RootPage {
 
 		if (isMyProfile) {
 			addPreferences(user);
+
+			if (app().gitblit().isServingSSH()) {
+				// show the SSH key management tab
+				addSshKeys(user);
+			} else {
+				// SSH daemon is disabled, hide keys tab
+				add(new Label("sshKeysLink").setVisible(false));
+				add(new Label("sshKeysTab").setVisible(false));
+			}
 		} else {
 			// visiting user
 			add(new Label("preferencesLink").setVisible(false));
 			add(new Label("preferencesTab").setVisible(false));
+
+			add(new Label("sshKeysLink").setVisible(false));
+			add(new Label("sshKeysTab").setVisible(false));
 		}
 
 		List repositories = getRepositories(params);
@@ -251,6 +264,15 @@ public class UserPage extends RootPage {
 		add(fragment.setRenderBodyOnly(true));
 	}
 
+	private void addSshKeys(final UserModel user) {
+		Fragment keysTab = new Fragment("sshKeysTab", "sshKeysTabFragment", this);
+		keysTab.add(new SshKeysPanel("sshKeysPanel", user, getClass(), getPageParameters()));
+
+		// add the SSH keys tab
+		add(new Fragment("sshKeysLink", "sshKeysLinkFragment", this).setRenderBodyOnly(true));
+		add(keysTab.setRenderBodyOnly(true));
+	}
+
 	private class Language implements Serializable {
 
 		private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.html b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.html
new file mode 100644
index 00000000..d67b704a
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.html
@@ -0,0 +1,46 @@
+
+ 
+
+
+
+	
      
+	
      
+	
      
+		
+	
      
+		
      
+			
+		
      
+		
      
+			
      
+			
      
+		
      
+		
+		
      
+			
      
+			
      
+		
      
+		
+		
      
+			
+		
      
+		
+		
      
+	
      
+	
+	
      
+		
      
+			
      
+			
      
+			
      
+			
      
+		
+			
      
+		
      
+	
      
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
new file mode 100644
index 00000000..03cb93ca
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2014 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.panels;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.gitblit.Constants.AccessPermission;
+import com.gitblit.models.UserModel;
+import com.gitblit.transport.ssh.SshKey;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.GitBlitWebSession;
+
+
+/**
+ * A panel that enumerates and manages SSH public keys.
+ *
+ * @author James Moger
+ *
+ */
+public class SshKeysPanel extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	private final UserModel user;
+
+	private final Class pageClass;
+
+	private final PageParameters params;
+
+	public SshKeysPanel(String wicketId, UserModel user, Class pageClass, PageParameters params) {
+		super(wicketId);
+
+		this.user = user;
+		this.pageClass = pageClass;
+		this.params = params;
+	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+		List keys = app().keys().getKeys(user.username);
+
+		final ListDataProvider dp = new ListDataProvider(keys);
+		DataView keysView = new DataView("keys", dp) {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public void populateItem(final Item item) {
+				final SshKey key = item.getModelObject();
+				item.add(new Label("comment", key.getComment()));
+				item.add(new Label("fingerprint", key.getFingerprint()));
+				item.add(new Label("permission", key.getPermission().toString()));
+				item.add(new Label("algorithm", key.getAlgorithm()));
+
+				Link delete = new Link("delete") {
+
+					private static final long serialVersionUID = 1L;
+
+					@Override
+					public void onClick() {
+						if (app().keys().removeKey(user.username, key)) {
+							setRedirect(true);
+							setResponsePage(pageClass, params);
+						}
+					}
+				};
+				item.add(delete);
+			}
+		};
+		add(keysView);
+
+		Form addKeyForm = new Form("addKeyForm");
+
+		final IModel keyData = Model.of("");
+		addKeyForm.add(new TextAreaOption("addKeyData",
+				getString("gb.key"),
+				null,
+				"span5",
+				keyData));
+
+		final IModel keyPermission = Model.of(AccessPermission.PUSH);
+		addKeyForm.add(new ChoiceOption("addKeyPermission",
+				getString("gb.permission"),
+				getString("gb.sshKeyPermissionDescription"),
+				keyPermission,
+				Arrays.asList(AccessPermission.SSHPERMISSIONS)));
+
+		final IModel keyComment = Model.of("");
+		addKeyForm.add(new TextOption("addKeyComment",
+				getString("gb.comment"),
+				getString("gb.sshKeyCommentDescription"),
+				"span5",
+				keyComment));
+
+		addKeyForm.add(new AjaxButton("addKeyButton") {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void onSubmit(AjaxRequestTarget target, Form form) {
+
+				UserModel user = GitBlitWebSession.get().getUser();
+				String data = keyData.getObject();
+				if (StringUtils.isEmpty(data)) {
+					// do not submit empty key
+					return;
+				}
+
+				SshKey key = new SshKey(data);
+				try {
+					key.getPublicKey();
+				} catch (Exception e) {
+					// failed to parse the key
+					return;
+				}
+
+				AccessPermission permission = keyPermission.getObject();
+				key.setPermission(permission);
+
+				String comment  = keyComment.getObject();
+				if (!StringUtils.isEmpty(comment)) {
+					key.setComment(comment);
+				}
+
+				if (app().keys().addKey(user.username, key)) {
+					setRedirect(true);
+					setResponsePage(pageClass, params);
+				}
+			}
+		});
+
+		add(addKeyForm);
+	}
+}
diff --git a/src/main/java/com/gitblit/wicket/panels/TextAreaOption.html b/src/main/java/com/gitblit/wicket/panels/TextAreaOption.html
new file mode 100644
index 00000000..bb7dc7c6
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/TextAreaOption.html
@@ -0,0 +1,20 @@
+
+ 
+
+
+
+	
      
+		
      
+			
+		
      
+		
+		
+	
      
+      
+
+
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/TextAreaOption.java b/src/main/java/com/gitblit/wicket/panels/TextAreaOption.java
new file mode 100644
index 00000000..d2c74a06
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/panels/TextAreaOption.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 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.panels;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.IModel;
+
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.WicketUtils;
+
+/**
+ * A re-usable textarea option panel.
+ *
+ * title
+ *     description
+ *     [text
+ *           area]
+ *
+ * @author James Moger
+ *
+ */
+public class TextAreaOption extends BasePanel {
+
+	private static final long serialVersionUID = 1L;
+
+	public TextAreaOption(String wicketId, String title, String description, IModel model) {
+		this(wicketId, title, description, null, model);
+	}
+
+	public TextAreaOption(String wicketId, String title, String description, String css, IModel model) {
+		super(wicketId);
+		add(new Label("name", title));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
+		TextArea tf = new TextArea("text", model);
+		if (!StringUtils.isEmpty(css)) {
+			WicketUtils.setCssClass(tf, css);
+		}
+		add(tf);
+	}
+}
diff --git a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
index 6e56a873..54be539f 100644
--- a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
+++ b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
@@ -81,6 +81,21 @@ public class MockRuntimeManager implements IRuntimeManager {
 		return true;
 	}
 
+	@Override
+	public boolean isServingHTTP() {
+		return true;
+	}
+
+	@Override
+	public boolean isServingGIT() {
+		return true;
+	}
+
+	@Override
+	public boolean isServingSSH() {
+		return true;
+	}
+
 	@Override
 	public boolean isDebugMode() {
 		return true;
-- 
cgit v1.2.3


From 6537deb8b76b7a4725c40a174a7c440385f88e51 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 5 Jun 2014 10:20:59 -0400
Subject: Revise language/locale preference handling

---
 src/main/java/com/gitblit/ConfigUserService.java   |  9 +++++---
 .../java/com/gitblit/models/UserPreferences.java   |  6 ++++-
 .../com/gitblit/wicket/GitBlitWebApp.properties    |  2 +-
 .../java/com/gitblit/wicket/pages/UserPage.java    | 26 ++++++++++++++--------
 4 files changed, 29 insertions(+), 14 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index 9b4dd7f1..b5dfde3b 100644
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -707,8 +707,9 @@ public class ConfigUserService implements IUserService {
 				config.setBoolean(USER, model.username, DISABLED, true);
 			}
 			if (model.getPreferences() != null) {
-				if (!StringUtils.isEmpty(model.getPreferences().locale)) {
-					config.setString(USER, model.username, LOCALE, model.getPreferences().locale);
+				if (model.getPreferences().getLocale() != null) {
+					String val = model.getPreferences().getLocale().getLanguage() + "_" + model.getPreferences().getLocale().getCountry();
+					config.setString(USER, model.username, LOCALE, val);
 				}
 			}
 
@@ -880,11 +881,13 @@ public class ConfigUserService implements IUserService {
 					user.stateProvince = config.getString(USER, username, STATEPROVINCE);
 					user.countryCode = config.getString(USER, username, COUNTRYCODE);
 					user.cookie = config.getString(USER, username, COOKIE);
-					user.getPreferences().locale = config.getString(USER, username, LOCALE);
 					if (StringUtils.isEmpty(user.cookie) && !StringUtils.isEmpty(user.password)) {
 						user.cookie = StringUtils.getSHA1(user.username + user.password);
 					}
 
+					// preferences
+					user.getPreferences().setLocale(config.getString(USER, username, LOCALE));
+
 					// user roles
 					Set roles = new HashSet(Arrays.asList(config.getStringList(
 							USER, username, ROLE)));
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index 44e44933..61db353c 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -37,7 +37,7 @@ public class UserPreferences implements Serializable {
 
 	public final String username;
 
-	public String locale;
+	private String locale;
 
 	private final Map repositoryPreferences = new TreeMap();
 
@@ -58,6 +58,10 @@ public class UserPreferences implements Serializable {
 		return new Locale(locale);
 	}
 
+	public void setLocale(String locale) {
+		this.locale = locale;
+	}
+
 	public UserRepositoryPreferences getRepositoryPreferences(String repositoryName) {
 		String key = repositoryName.toLowerCase();
 		if (!repositoryPreferences.containsKey(key)) {
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 7dc0f9b6..90d30f29 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -727,7 +727,7 @@ gb.preferences = preferences
 gb.accountPreferences = Account Preferences
 gb.accountPreferencesDescription = Specify your account preferences
 gb.languagePreference = Language Preference
-gb.languagePreferenceDescription = Select your preferred translation for the Gitblit UI
+gb.languagePreferenceDescription = Select your preferred translation for Gitblit
 gb.displayNameDescription = The preferred name for display
 gb.emailAddressDescription = The primary email address for receiving notifications
 gb.sshKeys = SSH Keys
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 4a955c7c..94048963 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -181,28 +181,36 @@ public class UserPage extends RootPage {
 				new Language("Português", "pt_BR"),
 				new Language("中文", "zh_CN"));
 
-		String lc = user.getPreferences().locale;
-		if (StringUtils.isEmpty(lc)) {
+		Locale locale = user.getPreferences().getLocale();
+		if (locale == null) {
 			// user has not specified language preference
 			// try server default preference
-			lc = app().settings().getString(Keys.web.forceDefaultLocale, null);
+			String lc = app().settings().getString(Keys.web.forceDefaultLocale, null);
 			if (StringUtils.isEmpty(lc)) {
 				// server default language is not configured
 				// try browser preference
 				Locale sessionLocale = GitBlitWebSession.get().getLocale();
 				if (sessionLocale != null) {
-					lc = sessionLocale.getLanguage() + "_" + sessionLocale.getCountry();
+					locale = sessionLocale;
 				}
+			} else {
+
 			}
 		}
+
 		Language preferredLanguage = null;
-		if (!StringUtils.isEmpty(lc)) {
+		if (locale != null) {
+			String localeCode = locale.getLanguage();
+			if (!StringUtils.isEmpty(locale.getCountry())) {
+				localeCode += "_" + locale.getCountry();
+			}
+
 			for (Language language : languages) {
-				if (language.code.equals(lc)) {
+				if (language.code.equals(localeCode)) {
 					// language_COUNTRY match
 					preferredLanguage = language;
-				} else if (preferredLanguage != null && lc.startsWith(language.code)) {
-					// language match, but not COUNTRY match
+				} else if (preferredLanguage != null && language.code.startsWith(locale.getLanguage())) {
+					// language match
 					preferredLanguage = language;
 				}
 			}
@@ -242,7 +250,7 @@ public class UserPage extends RootPage {
 
 				Language lang = language.getObject();
 				if (lang != null) {
-					user.getPreferences().locale = lang.code;
+					user.getPreferences().setLocale(lang.code);
 				}
 
 				try {
-- 
cgit v1.2.3


From 74221eb302e782ef23777d5c3f0a649ceb321c1e Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 5 Jun 2014 10:23:58 -0400
Subject: Add method to INotificationManager to return email service status

---
 src/main/java/com/gitblit/FederationClient.java             | 5 +++++
 src/main/java/com/gitblit/manager/GitblitManager.java       | 5 +++++
 src/main/java/com/gitblit/manager/INotificationManager.java | 8 ++++++++
 src/main/java/com/gitblit/manager/NotificationManager.java  | 5 +++++
 4 files changed, 23 insertions(+)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java
index c3dcd9da..cd06c3cb 100644
--- a/src/main/java/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -165,6 +165,11 @@ public class FederationClient {
 			return this;
 		}
 
+		@Override
+		public boolean isSendingMail() {
+			return false;
+		}
+
 		@Override
 		public void sendMailToAdministrators(String subject, String message) {
 		}
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index ef2433dd..98ad33e7 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -660,6 +660,11 @@ public class GitblitManager implements IGitblit {
 	 * NOTIFICATION MANAGER
 	 */
 
+	@Override
+	public boolean isSendingMail() {
+		return notificationManager.isSendingMail();
+	}
+
 	@Override
 	public void sendMailToAdministrators(String subject, String message) {
 		notificationManager.sendMailToAdministrators(subject, message);
diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java
index 231cf43a..64fc01e8 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -21,6 +21,14 @@ import com.gitblit.models.Mailing;
 
 public interface INotificationManager extends IManager {
 
+	/**
+	 * Returns true if the email service is configured and ready to send notifications.
+	 *
+	 * @return true if the email service is operational
+	 * @since 1.6.0
+	 */
+	boolean isSendingMail();
+
 	/**
 	 * Notify the administrators by email.
 	 *
diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java
index ba63cfc1..69a611bb 100644
--- a/src/main/java/com/gitblit/manager/NotificationManager.java
+++ b/src/main/java/com/gitblit/manager/NotificationManager.java
@@ -71,6 +71,11 @@ public class NotificationManager implements INotificationManager {
 		return this;
 	}
 
+	@Override
+	public boolean isSendingMail() {
+		return mailService.isReady();
+	}
+
 	/**
 	 * Notify the administrators by email.
 	 *
-- 
cgit v1.2.3


From afbaebde11093fae8b420aaaf71dcd56d8c0f9fd Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 5 Jun 2014 10:24:39 -0400
Subject: Add "email me on my ticket changes" preference

---
 src/main/java/com/gitblit/ConfigUserService.java          |  4 ++++
 src/main/java/com/gitblit/models/UserPreferences.java     | 13 +++++++++++++
 src/main/java/com/gitblit/tickets/TicketNotifier.java     | 11 +++++++++--
 src/main/java/com/gitblit/wicket/GitBlitWebApp.properties |  2 ++
 src/main/java/com/gitblit/wicket/pages/UserPage.html      |  3 ++-
 src/main/java/com/gitblit/wicket/pages/UserPage.java      |  9 +++++++++
 6 files changed, 39 insertions(+), 3 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index b5dfde3b..9759eff7 100644
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -96,6 +96,8 @@ public class ConfigUserService implements IUserService {
 
 	private static final String LOCALE = "locale";
 
+	private static final String EMAILONMYTICKETCHANGES = "emailMeOnMyTicketChanges";
+
 	private static final String ACCOUNTTYPE = "accountType";
 
 	private static final String DISABLED = "disabled";
@@ -711,6 +713,7 @@ public class ConfigUserService implements IUserService {
 					String val = model.getPreferences().getLocale().getLanguage() + "_" + model.getPreferences().getLocale().getCountry();
 					config.setString(USER, model.username, LOCALE, val);
 				}
+				config.setBoolean(USER, model.username, EMAILONMYTICKETCHANGES, model.getPreferences().isEmailMeOnMyTicketChanges());
 			}
 
 			// user roles
@@ -887,6 +890,7 @@ public class ConfigUserService implements IUserService {
 
 					// preferences
 					user.getPreferences().setLocale(config.getString(USER, username, LOCALE));
+					user.getPreferences().setEmailMeOnMyTicketChanges(config.getBoolean(USER, username, EMAILONMYTICKETCHANGES, true));
 
 					// user roles
 					Set roles = new HashSet(Arrays.asList(config.getStringList(
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index 61db353c..c95b0da5 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -39,6 +39,8 @@ public class UserPreferences implements Serializable {
 
 	private String locale;
 
+	private Boolean emailMeOnMyTicketChanges;
+
 	private final Map repositoryPreferences = new TreeMap();
 
 	public UserPreferences(String username) {
@@ -100,4 +102,15 @@ public class UserPreferences implements Serializable {
 		Collections.sort(list);
 		return list;
 	}
+
+	public boolean isEmailMeOnMyTicketChanges() {
+		if (emailMeOnMyTicketChanges == null) {
+			return true;
+		}
+		return emailMeOnMyTicketChanges;
+	}
+
+	public void setEmailMeOnMyTicketChanges(boolean value) {
+		this.emailMeOnMyTicketChanges = value;
+	}
 }
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 9a5e4e1d..07371b1b 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -545,7 +545,6 @@ public class TicketNotifier {
 				}
 			}
 		}
-		mailing.setRecipients(toAddresses);
 
 		//
 		// CC recipients
@@ -554,7 +553,7 @@ public class TicketNotifier {
 
 		// repository owners
 		if (!ArrayUtils.isEmpty(repository.owners)) {
-			tos.addAll(repository.owners);
+			ccs.addAll(repository.owners);
 		}
 
 		// cc users mentioned in last comment
@@ -595,6 +594,14 @@ public class TicketNotifier {
 		}
 		ccAddresses.addAll(settings.getStrings(Keys.mail.mailingLists));
 
+		// respect the author's email preference
+		UserModel lastAuthor = userManager.getUserModel(lastChange.author);
+		if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
+			toAddresses.remove(lastAuthor.emailAddress);
+			ccAddresses.remove(lastAuthor.emailAddress);
+		}
+
+		mailing.setRecipients(toAddresses);
 		mailing.setCCs(ccAddresses);
 	}
 
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 90d30f29..c80d45ce 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -728,6 +728,8 @@ gb.accountPreferences = Account Preferences
 gb.accountPreferencesDescription = Specify your account preferences
 gb.languagePreference = Language Preference
 gb.languagePreferenceDescription = Select your preferred translation for Gitblit
+gb.emailMeOnMyTicketChanges = Email me on my ticket changes
+gb.emailMeOnMyTicketChangesDescription  = Send me an email notification for changes that I make to a ticket
 gb.displayNameDescription = The preferred name for display
 gb.emailAddressDescription = The primary email address for receiving notifications
 gb.sshKeys = SSH Keys
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.html b/src/main/java/com/gitblit/wicket/pages/UserPage.html
index d71cb2b5..017fcb1f 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
@@ -64,7 +64,8 @@
 		
      
 			
      
 			
      
-			
      	
+			
      
+			
      
 			
 			
      
 		
      	
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 94048963..505f55d9 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -48,6 +48,7 @@ import com.gitblit.wicket.GitBlitWebApp;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.GitblitRedirectException;
 import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.panels.BooleanOption;
 import com.gitblit.wicket.panels.ChoiceOption;
 import com.gitblit.wicket.panels.ProjectRepositoryPanel;
 import com.gitblit.wicket.panels.SshKeysPanel;
@@ -219,6 +220,7 @@ public class UserPage extends RootPage {
 		final IModel displayName = Model.of(user.getDisplayName());
 		final IModel emailAddress = Model.of(user.emailAddress == null ? "" : user.emailAddress);
 		final IModel language = Model.of(preferredLanguage);
+		final IModel emailMeOnMyTicketChanges = Model.of(user.getPreferences().isEmailMeOnMyTicketChanges());
 
 		prefs.add(new TextOption("displayName",
 				getString("gb.displayName"),
@@ -236,6 +238,11 @@ public class UserPage extends RootPage {
 				language,
 				languages));
 
+		prefs.add(new BooleanOption("emailMeOnMyTicketChanges",
+				getString("gb.emailMeOnMyTicketChanges"),
+				getString("gb.emailMeOnMyTicketChangesDescription"),
+				emailMeOnMyTicketChanges).setVisible(app().notifier().isSendingMail()));
+
 		prefs.add(new AjaxButton("save") {
 
 			private static final long serialVersionUID = 1L;
@@ -253,6 +260,8 @@ public class UserPage extends RootPage {
 					user.getPreferences().setLocale(lang.code);
 				}
 
+				user.getPreferences().setEmailMeOnMyTicketChanges(emailMeOnMyTicketChanges.getObject());
+
 				try {
 					app().gitblit().reviseUser(user.username, user);
 
-- 
cgit v1.2.3


From b0658eedf4bc1590cd5003d17d9c71dd47b3c70c Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 5 Jun 2014 11:22:44 -0400
Subject: Use AJAX to manage the SSH keys panel

---
 .../java/com/gitblit/wicket/pages/UserPage.java    |  2 +-
 .../com/gitblit/wicket/panels/SshKeysPanel.java    | 46 +++++++++++++---------
 2 files changed, 28 insertions(+), 20 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 505f55d9..00a36272 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -283,7 +283,7 @@ public class UserPage extends RootPage {
 
 	private void addSshKeys(final UserModel user) {
 		Fragment keysTab = new Fragment("sshKeysTab", "sshKeysTabFragment", this);
-		keysTab.add(new SshKeysPanel("sshKeysPanel", user, getClass(), getPageParameters()));
+		keysTab.add(new SshKeysPanel("sshKeysPanel", user));
 
 		// add the SSH keys tab
 		add(new Fragment("sshKeysLink", "sshKeysLinkFragment", this).setRenderBodyOnly(true));
diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
index 03cb93ca..15ebd67b 100644
--- a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
@@ -15,16 +15,15 @@
  */
 package com.gitblit.wicket.panels;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.wicket.PageParameters;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -39,7 +38,7 @@ import com.gitblit.wicket.GitBlitWebSession;
 
 
 /**
- * A panel that enumerates and manages SSH public keys.
+ * A panel that enumerates and manages SSH public keys using AJAX.
  *
  * @author James Moger
  *
@@ -50,25 +49,21 @@ public class SshKeysPanel extends BasePanel {
 
 	private final UserModel user;
 
-	private final Class pageClass;
-
-	private final PageParameters params;
-
-	public SshKeysPanel(String wicketId, UserModel user, Class pageClass, PageParameters params) {
+	public SshKeysPanel(String wicketId, UserModel user) {
 		super(wicketId);
 
 		this.user = user;
-		this.pageClass = pageClass;
-		this.params = params;
 	}
 
 	@Override
 	protected void onInitialize() {
 		super.onInitialize();
-		List keys = app().keys().getKeys(user.username);
 
+		setOutputMarkupId(true);
+
+		final List keys = new ArrayList(app().keys().getKeys(user.username));
 		final ListDataProvider dp = new ListDataProvider(keys);
-		DataView keysView = new DataView("keys", dp) {
+		final DataView keysView = new DataView("keys", dp) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -79,15 +74,19 @@ public class SshKeysPanel extends BasePanel {
 				item.add(new Label("permission", key.getPermission().toString()));
 				item.add(new Label("algorithm", key.getAlgorithm()));
 
-				Link delete = new Link("delete") {
+				AjaxLink delete = new AjaxLink("delete") {
 
 					private static final long serialVersionUID = 1L;
 
 					@Override
-					public void onClick() {
+					public void onClick(AjaxRequestTarget target) {
 						if (app().keys().removeKey(user.username, key)) {
-							setRedirect(true);
-							setResponsePage(pageClass, params);
+							// reset the keys list
+							keys.clear();
+							keys.addAll(app().keys().getKeys(user.username));
+
+							// update the panel
+							target.addComponent(SshKeysPanel.this);
 						}
 					}
 				};
@@ -150,8 +149,17 @@ public class SshKeysPanel extends BasePanel {
 				}
 
 				if (app().keys().addKey(user.username, key)) {
-					setRedirect(true);
-					setResponsePage(pageClass, params);
+					// reset add key fields
+					keyData.setObject("");
+					keyPermission.setObject(AccessPermission.PUSH);
+					keyComment.setObject("");
+
+					// reset the keys list
+					keys.clear();
+					keys.addAll(app().keys().getKeys(user.username));
+
+					// update the panel
+					target.addComponent(SshKeysPanel.this);
 				}
 			}
 		});
-- 
cgit v1.2.3


From bfce9f59fca542d7b96b88d67494336b0c50b045 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 5 Jun 2014 12:19:07 -0400
Subject: Add setting to control inclusion of personal repositories in the main
 list

---
 releases.moxie                                              |  3 +++
 src/main/distrib/data/gitblit.properties                    |  5 +++++
 .../java/com/gitblit/wicket/pages/RepositoriesPage.java     | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/releases.moxie b/releases.moxie
index c7299a7e..fc139b77 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -29,6 +29,7 @@ r24: {
     - Overhaul the EmptyRepositoryPage (ticket-73)
     - Overhauled the edit repository page (ticket-76)
     - Process bugtraq links in the ticket description and comments (ticket-78)
+    - Exclude personal repositories from the repositories list, by default (issue-419, ticket-95)
     additions:
     - Add My Tickets page (issue-215, ticket-15)
     - Added CRUD functionality for Ticket Milestones (ticket-17)
@@ -55,8 +56,10 @@ r24: {
     - Marcus Hunger
     - Matthias Cullmann
     - Emmeran Seehuber
+    - Sascha Vogt
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
+    - { name: 'web.includePersonalRepositories', defaultValue: 'false' }
     - { name: 'mail.starttls', defaultValue: 'false' }
     - { name: 'execution.defaultThreadPoolSize', defaultValue: '1' }
     - { name: 'git.gitignoreFolder', defaultValue: '${baseFolder}/gitignore' }
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index d5623cd5..65fe41e5 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -782,6 +782,11 @@ web.allowCookieAuthentication = true
 # SINCE 1.6.0
 web.allowDeletingNonEmptyRepositories = true
 
+# Setting to include personal repositories in the main repositories list.
+#
+# SINCE 1.6.0
+web.includePersonalRepositories = false
+
 # Config file for storing project metadata
 #
 # SINCE 1.2.0
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
index a0b15a83..660b4ed1 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.wicket.Component;
@@ -30,8 +31,8 @@ import org.eclipse.jgit.lib.Constants;
 
 import com.gitblit.Keys;
 import com.gitblit.models.Menu.ParameterMenuItem;
-import com.gitblit.models.NavLink.DropDownPageMenuNavLink;
 import com.gitblit.models.NavLink;
+import com.gitblit.models.NavLink.DropDownPageMenuNavLink;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.utils.MarkdownUtils;
 import com.gitblit.utils.StringUtils;
@@ -79,7 +80,17 @@ public class RepositoriesPage extends RootPage {
 				.setEscapeModelStrings(false).setVisible(message.length() > 0);
 		add(repositoriesMessage);
 
+		// conditionally include personal repositories in this page
 		List repositories = getRepositories(params);
+		if (!app().settings().getBoolean(Keys.web.includePersonalRepositories, true)) {
+			Iterator itr = repositories.iterator();
+			while (itr.hasNext()) {
+				RepositoryModel rm = itr.next();
+				if (rm.isPersonalRepository()) {
+					itr.remove();
+				}
+			}
+		}
 
 		RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", showAdmin,
 				true, repositories, true, getAccessRestrictions());
-- 
cgit v1.2.3


From 1b04d7730f56a08c935974504b2d849d01870c02 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Thu, 5 Jun 2014 14:14:54 -0400
Subject: Add clone transport user preference

---
 releases.moxie                                      |  1 +
 src/main/java/com/gitblit/ConfigUserService.java    |  9 +++++++++
 src/main/java/com/gitblit/GitBlit.java              | 19 +++++++++++++++++++
 .../java/com/gitblit/models/UserPreferences.java    | 11 +++++++++++
 .../com/gitblit/wicket/GitBlitWebApp.properties     |  4 +++-
 .../java/com/gitblit/wicket/pages/UserPage.html     |  1 +
 .../java/com/gitblit/wicket/pages/UserPage.java     | 21 +++++++++++++++++++++
 7 files changed, 65 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/releases.moxie b/releases.moxie
index fc139b77..c1e11d98 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -43,6 +43,7 @@ r24: {
     - Simplified repository creation, offer simple README generation, and insertion of a pre-defined .gitignore file (ticket-76)
     - Added an extension point for monitoring onStartup and onShutdown (ticket-79)
     - Tag server-side merges when incremental push tags are enabled (issue-432, ticket-85)
+    - Add a user preference for the clone transport (ticket-90)
     - Add setting to control default thread pool size for miscellaneous background tasks (ticket-92)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index 9759eff7..0c5b2a58 100644
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
 
 import com.gitblit.Constants.AccessPermission;
 import com.gitblit.Constants.AccountType;
+import com.gitblit.Constants.Transport;
 import com.gitblit.manager.IRuntimeManager;
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
@@ -98,6 +99,8 @@ public class ConfigUserService implements IUserService {
 
 	private static final String EMAILONMYTICKETCHANGES = "emailMeOnMyTicketChanges";
 
+	private static final String TRANSPORT = "transport";
+
 	private static final String ACCOUNTTYPE = "accountType";
 
 	private static final String DISABLED = "disabled";
@@ -713,7 +716,12 @@ public class ConfigUserService implements IUserService {
 					String val = model.getPreferences().getLocale().getLanguage() + "_" + model.getPreferences().getLocale().getCountry();
 					config.setString(USER, model.username, LOCALE, val);
 				}
+
 				config.setBoolean(USER, model.username, EMAILONMYTICKETCHANGES, model.getPreferences().isEmailMeOnMyTicketChanges());
+
+				if (model.getPreferences().getTransport() != null) {
+					config.setString(USER, model.username, TRANSPORT, model.getPreferences().getTransport().name());
+				}
 			}
 
 			// user roles
@@ -891,6 +899,7 @@ public class ConfigUserService implements IUserService {
 					// preferences
 					user.getPreferences().setLocale(config.getString(USER, username, LOCALE));
 					user.getPreferences().setEmailMeOnMyTicketChanges(config.getBoolean(USER, username, EMAILONMYTICKETCHANGES, true));
+					user.getPreferences().setTransport(Transport.fromString(config.getString(USER, username, TRANSPORT)));
 
 					// user roles
 					Set roles = new HashSet(Arrays.asList(config.getStringList(
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 81793850..f9d9be9f 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -264,6 +265,24 @@ public class GitBlit extends GitblitManager {
 			}
 		});
 
+		// consider the user's transport preference
+		RepositoryUrl preferredUrl = null;
+		Transport preferredTransport = user.getPreferences().getTransport();
+		if (preferredTransport != null) {
+			Iterator itr = list.iterator();
+			while (itr.hasNext()) {
+				RepositoryUrl url = itr.next();
+				if (url.transport.equals(preferredTransport)) {
+					itr.remove();
+					preferredUrl = url;
+					break;
+				}
+			}
+		}
+		if (preferredUrl != null) {
+			list.add(0, preferredUrl);
+		}
+
 		return list;
 	}
 
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index c95b0da5..90c034fc 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -23,6 +23,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.gitblit.Constants.Transport;
 import com.gitblit.utils.StringUtils;
 
 /**
@@ -41,6 +42,8 @@ public class UserPreferences implements Serializable {
 
 	private Boolean emailMeOnMyTicketChanges;
 
+	private Transport transport;
+
 	private final Map repositoryPreferences = new TreeMap();
 
 	public UserPreferences(String username) {
@@ -113,4 +116,12 @@ public class UserPreferences implements Serializable {
 	public void setEmailMeOnMyTicketChanges(boolean value) {
 		this.emailMeOnMyTicketChanges = value;
 	}
+
+	public Transport getTransport() {
+		return transport;
+	}
+
+	public void setTransport(Transport transport) {
+		this.transport = transport;
+	}
 }
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index c80d45ce..eb92e2d2 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -739,4 +739,6 @@ gb.key = Key
 gb.comment = Comment
 gb.sshKeyCommentDescription = Enter an optional comment. If blank, the comment will be extracted from the key data.
 gb.permission = Permission
-gb.sshKeyPermissionDescription = Specify the access permission for the SSH key
\ No newline at end of file
+gb.sshKeyPermissionDescription = Specify the access permission for the SSH key
+gb.transportPreference = Transport Preference
+gb.transportPreferenceDescription = Set the transport that you prefer to use for cloning
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.html b/src/main/java/com/gitblit/wicket/pages/UserPage.html
index 017fcb1f..8dccfee7 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
@@ -66,6 +66,7 @@
 			
      
 			
      
 			
      
+			
      
 			
 			
      
 			
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 00a36272..306eea65 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -35,6 +35,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
+import com.gitblit.Constants.Transport;
 import com.gitblit.GitBlitException;
 import com.gitblit.Keys;
 import com.gitblit.models.Menu.ParameterMenuItem;
@@ -221,6 +222,7 @@ public class UserPage extends RootPage {
 		final IModel emailAddress = Model.of(user.emailAddress == null ? "" : user.emailAddress);
 		final IModel language = Model.of(preferredLanguage);
 		final IModel emailMeOnMyTicketChanges = Model.of(user.getPreferences().isEmailMeOnMyTicketChanges());
+		final IModel transport = Model.of(user.getPreferences().getTransport());
 
 		prefs.add(new TextOption("displayName",
 				getString("gb.displayName"),
@@ -243,6 +245,24 @@ public class UserPage extends RootPage {
 				getString("gb.emailMeOnMyTicketChangesDescription"),
 				emailMeOnMyTicketChanges).setVisible(app().notifier().isSendingMail()));
 
+		List availableTransports = new ArrayList<>();
+		if (app().gitblit().isServingSSH()) {
+			availableTransports.add(Transport.SSH);
+		}
+		if (app().gitblit().isServingHTTP()) {
+			availableTransports.add(Transport.HTTPS);
+			availableTransports.add(Transport.HTTP);
+		}
+		if (app().gitblit().isServingGIT()) {
+			availableTransports.add(Transport.GIT);
+		}
+
+		prefs.add(new ChoiceOption("transport",
+				getString("gb.transportPreference"),
+				getString("gb.transportPreferenceDescription"),
+				transport,
+				availableTransports));
+
 		prefs.add(new AjaxButton("save") {
 
 			private static final long serialVersionUID = 1L;
@@ -261,6 +281,7 @@ public class UserPage extends RootPage {
 				}
 
 				user.getPreferences().setEmailMeOnMyTicketChanges(emailMeOnMyTicketChanges.getObject());
+				user.getPreferences().setTransport(transport.getObject());
 
 				try {
 					app().gitblit().reviseUser(user.username, user);
-- 
cgit v1.2.3


From f9e51c9454c89a8587bb122183c7658b94606d42 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Mon, 9 Jun 2014 09:10:13 -0400
Subject: Use separate project and name field models in the RepositoryNamePanel

---
 .../gitblit/wicket/pages/EditRepositoryPage.java   |  3 +-
 .../gitblit/wicket/pages/NewRepositoryPage.java    |  3 +-
 .../gitblit/wicket/panels/RepositoryNamePanel.java | 73 ++++++++++------------
 3 files changed, 36 insertions(+), 43 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index a0e6e7ba..a1c37385 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -70,8 +70,8 @@ import com.gitblit.wicket.StringChoiceRenderer;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.AccessPolicyPanel;
 import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
-import com.gitblit.wicket.panels.BulletListPanel;
 import com.gitblit.wicket.panels.BooleanOption;
+import com.gitblit.wicket.panels.BulletListPanel;
 import com.gitblit.wicket.panels.ChoiceOption;
 import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
 import com.gitblit.wicket.panels.RepositoryNamePanel;
@@ -383,7 +383,6 @@ public class EditRepositoryPage extends RootSubPage {
 					}
 				} catch (GitBlitException e) {
 					error(e.getMessage());
-					namePanel.resetModel(repositoryModel);
 					return;
 				}
 				setRedirect(false);
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index b8752e33..46877168 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -56,8 +56,8 @@ import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.AccessPolicyPanel;
-import com.gitblit.wicket.panels.BooleanOption;
 import com.gitblit.wicket.panels.BooleanChoiceOption;
+import com.gitblit.wicket.panels.BooleanOption;
 import com.gitblit.wicket.panels.RepositoryNamePanel;
 
 public class NewRepositoryPage extends RootSubPage {
@@ -142,7 +142,6 @@ public class NewRepositoryPage extends RootSubPage {
 
 				} catch (GitBlitException e) {
 					error(e.getMessage());
-					namePanel.resetModel(repositoryModel);
 					return;
 				}
 				setRedirect(true);
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
index 358ff59b..d3e493ed 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
@@ -22,6 +22,8 @@ import java.util.TreeSet;
 
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 import com.gitblit.models.ProjectModel;
 import com.gitblit.models.RepositoryModel;
@@ -41,7 +43,11 @@ public class RepositoryNamePanel extends BasePanel {
 
 	private String fullName;
 
-	private DropDownChoice projectChoice;
+	private final IModel projectPath;
+
+	private DropDownChoice pathChoice;
+
+	private final IModel repoName;
 
 	private TextField nameField;
 
@@ -52,84 +58,82 @@ public class RepositoryNamePanel extends BasePanel {
 		UserModel user = session.getUser();
 
 		// build project set for repository destination
-		String defaultProject = null;
-		Set projectNames = new TreeSet();
+		String defaultPath = null;
+		String defaultName = null;
+		Set pathNames = new TreeSet();
 
 		// add the registered/known projects
 		for (ProjectModel project : app().projects().getProjectModels(user, false)) {
 			// TODO issue-351: user.canAdmin(project)
 			if (user.canAdmin()) {
 				if (project.isRoot) {
-					projectNames.add("/");
+					pathNames.add("/");
 				} else {
-					projectNames.add(project.name + "/");
+					pathNames.add(project.name + "/");
 				}
 			}
 		}
 
 		// add the user's personal project namespace
 		if (user.canAdmin() || user.canCreate()) {
-			projectNames.add(user.getPersonalPath() + "/");
+			pathNames.add(user.getPersonalPath() + "/");
 		}
 
 		if (!StringUtils.isEmpty(repository.name)) {
 			// editing a repository name
 			// set the defaultProject to the current repository project
-			defaultProject = repository.projectPath;
-			if (StringUtils.isEmpty(defaultProject)) {
-				defaultProject = "/";
+			if (StringUtils.isEmpty(repository.projectPath)) {
+				defaultPath = "/";
 			} else {
-				defaultProject += "/";
+				defaultPath = repository.projectPath + "/";
 			}
-
-			projectNames.add(defaultProject);
+			defaultName = repository.name.substring(defaultPath.length());
+			pathNames.add(defaultPath);
 		}
 
 		// if default project is not already set, set preference based on the user permissions
-		if (defaultProject == null) {
+		if (defaultPath == null) {
 			if (user.canAdmin()) {
-				defaultProject = "/";
+				defaultPath = "/";
 			} else if (user.canCreate()) {
-				defaultProject = user.getPersonalPath() + "/";
+				defaultPath = user.getPersonalPath() + "/";
 			}
 		}
 
-		// update the model which is reflectively mapped to the Wicket fields by name
-		repository.projectPath = defaultProject;
-		if (repository.projectPath.length() > 1 && !StringUtils.isEmpty(repository.name)) {
-			repository.name = repository.name.substring(repository.projectPath.length());
-		}
-		projectChoice = new DropDownChoice("projectPath", new ArrayList(projectNames));
-		nameField = new TextField("name");
+		projectPath = Model.of(defaultPath);
+		pathChoice = new DropDownChoice("projectPath", projectPath, new ArrayList(pathNames));
+		repoName = Model.of(defaultName);
+		nameField = new TextField("name", repoName);
 
 		// only enable project selection if we actually have multiple choices
-		add(projectChoice.setEnabled(projectNames.size() > 1));
+		add(pathChoice.setEnabled(pathNames.size() > 1));
 		add(nameField);
 		add(new TextField("description"));
 	}
 
 	public void setEditable(boolean editable) {
 		// only enable project selection if we actually have multiple choices
-		projectChoice.setEnabled(projectChoice.getChoices().size() > 1 && editable);
+		pathChoice.setEnabled(pathChoice.getChoices().size() > 1 && editable);
 		nameField.setEnabled(editable);
 	}
 
 	public boolean updateModel(RepositoryModel repositoryModel) {
-		// confirm a project was selected
-		if (StringUtils.isEmpty(repositoryModel.projectPath)) {
+		// confirm a project path was selected
+		if (StringUtils.isEmpty(projectPath.getObject())) {
 			error(getString("gb.pleaseSelectProject"));
 			return false;
 		}
 
 		// confirm a repository name was entered
-		if (StringUtils.isEmpty(repositoryModel.name)) {
+		if (StringUtils.isEmpty(repoName.getObject())) {
 			error(getString("gb.pleaseSetRepositoryName"));
 			return false;
 		}
 
-		String project = repositoryModel.projectPath;
+		String project = projectPath.getObject();
+		String name = repoName.getObject();
 
-		fullName = (project + repositoryModel.name).trim();
+		fullName = (project + name).trim();
 		fullName = fullName.replace('\\', '/');
 		fullName = fullName.replace("//", "/");
 		if (fullName.charAt(0) == '/') {
@@ -156,21 +160,12 @@ public class RepositoryNamePanel extends BasePanel {
 		}
 
 		repositoryModel.name = fullName;
-		repositoryModel.projectPath = null;
 
 		return true;
 	}
 
-	public void resetModel(RepositoryModel repositoryModel) {
-		// restore project and name fields on error condition
-		repositoryModel.projectPath = StringUtils.getFirstPathElement(fullName) + "/";
-		if (repositoryModel.projectPath.length() > 1) {
-			repositoryModel.name = fullName.substring(repositoryModel.projectPath.length());
-		}
-	}
-
 	@Override
 	protected boolean getStatelessHint() {
 		return false;
 	}
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 7e6932b27785d8dd9309c9a4d7a5fa9824c6b9cf Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Mon, 9 Jun 2014 11:28:08 -0400
Subject: Fix locale preference storing

---
 src/main/java/com/gitblit/ConfigUserService.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index 0c5b2a58..d7d6c14f 100644
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -24,6 +24,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -712,8 +713,14 @@ public class ConfigUserService implements IUserService {
 				config.setBoolean(USER, model.username, DISABLED, true);
 			}
 			if (model.getPreferences() != null) {
-				if (model.getPreferences().getLocale() != null) {
-					String val = model.getPreferences().getLocale().getLanguage() + "_" + model.getPreferences().getLocale().getCountry();
+				Locale locale = model.getPreferences().getLocale();
+				if (locale != null) {
+					String val;
+					if (StringUtils.isEmpty(locale.getCountry())) {
+						val = locale.getLanguage();
+					} else {
+						val = locale.getLanguage() + "_" + locale.getCountry();
+					}
 					config.setString(USER, model.username, LOCALE, val);
 				}
 
-- 
cgit v1.2.3


From e0331746c1aee48a18ae2954770ca481d49eaf36 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Mon, 9 Jun 2014 11:33:42 -0400
Subject: Link to open tickets view for open milestones from ticket page

---
 src/main/java/com/gitblit/wicket/pages/TicketPage.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index f7e4ada5..f5f63d23 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -250,8 +250,12 @@ public class TicketPage extends RepositoryPage {
 		} else {
 			// link to milestone query
 			TicketMilestone milestone = app().tickets().getMilestone(repository, ticket.milestone);
-			PageParameters milestoneParameters = new PageParameters();
-			milestoneParameters.put("r", repositoryName);
+			PageParameters milestoneParameters;
+			if (milestone.isOpen()) {
+				milestoneParameters = WicketUtils.newOpenTicketsParameter(repositoryName);
+			} else {
+				milestoneParameters = WicketUtils.newRepositoryParameter(repositoryName);
+			}
 			milestoneParameters.put(Lucene.milestone.name(), ticket.milestone);
 			int progress = 0;
 			int open = 0;
-- 
cgit v1.2.3


From dcd6541d4e7a159e7478962121fbfd0782568af0 Mon Sep 17 00:00:00 2001
From: James Moger 
Date: Mon, 9 Jun 2014 12:36:09 -0400
Subject: Switch to basic ant copy filter for web.xml

---
 build.xml                     | 22 ++++++++++++++++++----
 src/main/java/WEB-INF/web.xml |  6 +-----
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'src/main/java')

diff --git a/build.xml b/build.xml
index be6f1dd2..035f1896 100644
--- a/build.xml
+++ b/build.xml
@@ -174,8 +174,19 @@
 			
 		
 
+		
+		
+
 		
 		
+		
+		
+			
+			
+				
+			
+		
+		
 		
 		
 			
@@ -240,10 +251,13 @@
 		
 		
 
-		
-		
-			
-		
+		
+		
+			
+			
+				
+			
+		
 
 		
 		
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 3a6c4490..13f612e4 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -30,12 +30,8 @@
 	
 	
 	
-	
-		Gitblit - @gb.version@
-	
+	Gitblit - @gb.version@
 
-	 
-