Create filestore directory on startup

James Moger

2015-11-19 e41e8f8c3bc9f5edab1d271464364f95620ece8c

 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -37,7 +37,6 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.RestartResponseException;

import org.apache.wicket.ajax.AjaxRequestTarget;

import org.apache.wicket.behavior.IBehavior;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.image.ContextImage;

@@ -89,10 +88,10 @@
import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.TicketsUI;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.BasePanel.JavascriptTextPrompt;

import com.gitblit.wicket.panels.CommentPanel;

import com.gitblit.wicket.panels.DiffStatPanel;

import com.gitblit.wicket.panels.GravatarImage;

import com.gitblit.wicket.panels.IconAjaxLink;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.ShockWaveComponent;

@@ -249,17 +248,24 @@
         add(new Label("milestone"));

      } else {

         // link to milestone query

         TicketMilestone milestone = app().tickets().getMilestone(repository, ticket.milestone);

         PageParameters milestoneParameters = new PageParameters();

         milestoneParameters.put("r", repositoryName);

         TicketMilestone tm = app().tickets().getMilestone(repository, ticket.milestone);

         if (tm == null) {

            tm = new TicketMilestone(ticket.milestone);

         }

         PageParameters milestoneParameters;

         if (tm.isOpen()) {

            milestoneParameters = WicketUtils.newOpenTicketsParameter(repositoryName);

         } else {

            milestoneParameters = WicketUtils.newRepositoryParameter(repositoryName);

         }

         milestoneParameters.put(Lucene.milestone.name(), ticket.milestone);

         int progress = 0;

         int open = 0;

         int closed = 0;

         if (milestone != null) {

            progress = milestone.getProgress();

            open = milestone.getOpenTickets();

            closed = milestone.getClosedTickets();

         if (tm != null) {

            progress = tm.getProgress();

            open = tm.getOpenTickets();

            closed = tm.getClosedTickets();

         }



         Fragment milestoneProgress = new Fragment("milestone", "milestoneProgressFragment", this);

@@ -280,7 +286,9 @@
         desc = getString("gb.noDescriptionGiven");

      } else {

         String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.body);

         desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);

         String html = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);

         String safeHtml = app().xssFilter().relaxed(html);

         desc = safeHtml;

      }

      add(new Label("ticketDescription", desc).setEscapeModelStrings(false));



@@ -304,7 +312,7 @@
               if (user == null) {

                  user = new UserModel(username);

               }

               item.add(new GravatarImage("participant", user.getDisplayName(),

               item.add(new AvatarImage("participant", user.getDisplayName(),

                     user.emailAddress, null, 25, true));

            }

         };

@@ -370,7 +378,7 @@
                        }

                        TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);

                        app().tickets().createNotifier().sendMailing(update);

                        setResponsePage(TicketsPage.class, getPageParameters());

                        redirectTo(TicketsPage.class, getPageParameters());

                     }

                  };

                  String css = TicketsUI.getStatusClass(item.getModel().getObject());

@@ -434,7 +442,7 @@
                        }

                        TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);

                        app().tickets().createNotifier().sendMailing(update);

                        setResponsePage(TicketsPage.class, getPageParameters());

                        redirectTo(TicketsPage.class, getPageParameters());

                     }

                  };

                  item.add(link);

@@ -479,7 +487,7 @@
                        }

                        TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);

                        app().tickets().createNotifier().sendMailing(update);

                        setResponsePage(TicketsPage.class, getPageParameters());

                        redirectTo(TicketsPage.class, getPageParameters());

                     }

                  };

                  item.add(link);

@@ -511,13 +519,20 @@
       * TICKET METADATA

       */

      add(new Label("ticketType", ticket.type.toString()));



      add(new Label("priority", ticket.priority.toString()));

      add(new Label("severity", ticket.severity.toString()));



      if (StringUtils.isEmpty(ticket.topic)) {

         add(new Label("ticketTopic").setVisible(false));

      } else {

         // process the topic using the bugtraq config to link things

         String topic = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.topic);

         add(new Label("ticketTopic", topic).setEscapeModelStrings(false));

         String safeTopic = app().xssFilter().relaxed(topic);

         add(new Label("ticketTopic", safeTopic).setEscapeModelStrings(false));

      }









      /*

@@ -551,7 +566,7 @@
                  change.vote(user.username);

               }

               app().tickets().updateTicket(repository, ticket.number, change);

               setResponsePage(TicketsPage.class, getPageParameters());

               redirectTo(TicketsPage.class, getPageParameters());

            }

         };

         add(link);

@@ -591,7 +606,7 @@
                  change.watch(user.username);

               }

               app().tickets().updateTicket(repository, ticket.number, change);

               setResponsePage(TicketsPage.class, getPageParameters());

               redirectTo(TicketsPage.class, getPageParameters());

            }

         };

         add(link);

@@ -677,15 +692,6 @@
                  Label status = new Label("statusChange", entry.getStatus().toString());

                  String css = TicketsUI.getLozengeClass(entry.getStatus(), false);

                  WicketUtils.setCssClass(status, css);

                  for (IBehavior b : status.getBehaviors()) {

                     if (b instanceof SimpleAttributeModifier) {

                        SimpleAttributeModifier sam = (SimpleAttributeModifier) b;

                        if ("class".equals(sam.getAttribute())) {

                           status.add(new SimpleAttributeModifier("class", "status-change " + sam.getValue()));

                           break;

                        }

                     }

                  }

                  frag.add(status);

                  addUserAttributions(frag, entry, avatarWidth);

                  addDateAttributions(frag, entry);

@@ -696,6 +702,7 @@
                   */

                  String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, entry.comment.text);

                  String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);

                  String safeComment = app().xssFilter().relaxed(comment);

                  Fragment frag = new Fragment("entry", "commentFragment", this);

                  Label commentIcon = new Label("commentIcon");

                  if (entry.comment.src == CommentSource.Email) {

@@ -704,7 +711,7 @@
                     WicketUtils.setCssClass(commentIcon, "iconic-comment-alt2-stroke");

                  }

                  frag.add(commentIcon);

                  frag.add(new Label("comment", comment).setEscapeModelStrings(false));

                  frag.add(new Label("comment", safeComment).setEscapeModelStrings(false));

                  addUserAttributions(frag, entry, avatarWidth);

                  addDateAttributions(frag, entry);

                  item.add(frag);

@@ -729,7 +736,7 @@
      } else {

         // permit user to comment

         Fragment newComment = new Fragment("newComment", "newCommentFragment", this);

         GravatarImage img = new GravatarImage("newCommentAvatar", user.username, user.emailAddress,

         AvatarImage img = new AvatarImage("newCommentAvatar", user.username, user.emailAddress,

               "gravatar-round", avatarWidth, true);

         newComment.add(img);

         CommentPanel commentPanel = new CommentPanel("commentPanel", user, ticket, null, TicketsPage.class);

@@ -745,7 +752,7 @@
      if (currentPatchset == null) {

         // no patchset available

         RepositoryUrl repoUrl = getRepositoryUrl(user, repository);

         boolean canPropose = repoUrl != null && repoUrl.permission.atLeast(AccessPermission.CLONE) && !UserModel.ANONYMOUS.equals(user);

         boolean canPropose = repoUrl != null && repoUrl.hasPermission() && repoUrl.permission.atLeast(AccessPermission.CLONE) && !UserModel.ANONYMOUS.equals(user);

         if (ticket.isOpen() && app().tickets().isAcceptingNewPatchsets(repository) && canPropose) {

            // ticket & repo will accept a proposal patchset

            // show the instructions for proposing a patchset

@@ -809,14 +816,14 @@
            public void populateItem(final Item<RevCommit> item) {

               RevCommit commit = item.getModelObject();

               PersonIdent author = commit.getAuthorIdent();

               item.add(new GravatarImage("authorAvatar", author.getName(), author.getEmailAddress(), null, 16, false));

               item.add(new AvatarImage("authorAvatar", author.getName(), author.getEmailAddress(), null, 16, false));

               item.add(new Label("author", commit.getAuthorIdent().getName()));

               item.add(new LinkPanel("commitId", null, getShortObjectId(commit.getName()),

                     CommitPage.class, WicketUtils.newObjectParameter(repositoryName, commit.getName()), true));

               item.add(new LinkPanel("diff", "link", getString("gb.diff"), CommitDiffPage.class,

                     WicketUtils.newObjectParameter(repositoryName, commit.getName()), true));

               item.add(new Label("title", StringUtils.trimString(commit.getShortMessage(), Constants.LEN_SHORTLOG_REFS)));

               item.add(WicketUtils.createDateLabel("commitDate", JGitUtils.getCommitDate(commit), GitBlitWebSession

               item.add(WicketUtils.createDateLabel("commitDate", JGitUtils.getAuthorDate(commit), GitBlitWebSession

                     .get().getTimezone(), getTimeUtils(), false));

               item.add(new DiffStatPanel("commitDiffStat", 0, 0, true));

            }

@@ -965,7 +972,8 @@
                  sb.append("</td></tr>");

               }

               sb.append("</tbody></table>");

               item.add(new Label("fields", sb.toString()).setEscapeModelStrings(false));

               String safeHtml = app().xssFilter().relaxed(sb.toString());

               item.add(new Label("fields", safeHtml).setEscapeModelStrings(false));

            } else {

               item.add(new Label("fields").setVisible(false));

            }

@@ -979,12 +987,12 @@
      UserModel commenter = app().users().getUserModel(entry.author);

      if (commenter == null) {

         // unknown user

         container.add(new GravatarImage("changeAvatar", entry.author,

         container.add(new AvatarImage("changeAvatar", entry.author,

               entry.author, null, avatarSize, false).setVisible(avatarSize > 0));

         container.add(new Label("changeAuthor", entry.author.toLowerCase()));

      } else {

         // known user

         container.add(new GravatarImage("changeAvatar", commenter.getDisplayName(),

         container.add(new AvatarImage("changeAvatar", commenter.getDisplayName(),

               commenter.emailAddress, avatarSize > 24 ? "gravatar-round" : null,

                     avatarSize, true).setVisible(avatarSize > 0));

         container.add(new LinkPanel("changeAuthor", null, commenter.getDisplayName(),

@@ -1295,7 +1303,7 @@
      }

      TicketModel updatedTicket = app().tickets().updateTicket(getRepositoryModel(), ticket.number, change);

      app().tickets().createNotifier().sendMailing(updatedTicket);

      setResponsePage(TicketsPage.class, getPageParameters());

      redirectTo(TicketsPage.class, getPageParameters());

   }



   protected <X extends MarkupContainer> X setNewTarget(X x) {

@@ -1406,8 +1414,8 @@
                        GitBlitWebSession.get().cacheErrorMessage(msg);

                        logger.error(msg);

                     }



                     setResponsePage(TicketsPage.class, getPageParameters());

							
                     redirectTo(TicketsPage.class, getPageParameters());

                  }

               };

               mergePanel.add(mergeButton);

@@ -1422,6 +1430,12 @@
            // patchset already merged

            Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);

            mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));

            return mergePanel;

         } else if (MergeStatus.MISSING_INTEGRATION_BRANCH == mergeStatus) {

            // target/integration branch is missing

            Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);

            mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));

            mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.missingIntegrationBranchMore"), ticket.mergeTo)));

            return mergePanel;

         } else {

            // patchset can not be cleanly merged

@@ -1501,7 +1515,7 @@
    */

   protected RepositoryUrl getRepositoryUrl(UserModel user, RepositoryModel repository) {

      HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();

      List<RepositoryUrl> urls = app().gitblit().getRepositoryUrls(req, user, repository);

      List<RepositoryUrl> urls = app().services().getRepositoryUrls(req, user, repository);

      if (ArrayUtils.isEmpty(urls)) {

         return null;

      }